diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 5262edf..b5d1257 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -8597,7 +8597,7 @@ action: - service: '{{ nextion.command.open_entity_settings_page }}' data: page: '{{ entity_domain }}' - page_label: '{{ last_click_button.name if last_click_button.name is string and last_click_button.name | length > 0 else state_attr(last_click_button.entity, "friendly_name") }}' + page_label: '{{ (last_click_button.name | replace("\\r", " ")) if last_click_button.name is string and last_click_button.name | length > 0 else state_attr(last_click_button.entity, "friendly_name") }}' page_icon: > {{ all_icons[last_click_button.icon.split(":")[1]] | default(last_click_button.icon if last_click_button.icon is defined and last_click_button.icon is string else nextion.icon.domain[entity_domain]) @@ -9079,7 +9079,7 @@ action: - service: '{{ nextion.command.open_entity_settings_page }}' data: page: '{{ button_domain }}' - page_label: '{{ button_context.name if button_context.name is string and button_context.name | length > 0 else state_attr(button_context.entity, "friendly_name") }}' + page_label: '{{ (button_context.name | replace("\\r", " ")) if button_context.name is string and button_context.name | length > 0 else state_attr(button_context.entity, "friendly_name") }}' page_icon: '{{ nextion.icon.domain[button_domain] }}' page_icon_color: -1 #No color set entity: '{{ button_context.entity }}' diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index e6b4303..75ea33d 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index b1ee215..eef85ae 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index 87bb839..2f43ecd 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -55,28 +55,28 @@ Page alarm Variable (string) lastclick Attributes - ID : 5 + ID : 4 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 6 + ID : 5 Scope : local Text : home Max. Text Size: 15 Variable (string) code_format Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 15 Variable (string) entity Attributes - ID : 32 + ID : 31 Scope : local Text : Max. Text Size: 100 @@ -93,7 +93,7 @@ Text page_label Text icon_state Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -103,7 +103,7 @@ Text icon_state Text bt_home_text Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled @@ -113,7 +113,7 @@ Text bt_home_text Text bt_away_text Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -123,7 +123,7 @@ Text bt_away_text Text bt_night_text Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -133,7 +133,7 @@ Text bt_night_text Text bt_vacat_text Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -143,7 +143,7 @@ Text bt_vacat_text Text bt_bypass_text Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -153,7 +153,7 @@ Text bt_bypass_text Text bt_disarm_text Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -163,7 +163,7 @@ Text bt_disarm_text Text bt_home_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -173,7 +173,7 @@ Text bt_home_icon Text bt_away_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -183,7 +183,7 @@ Text bt_away_icon Text bt_night_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -193,7 +193,7 @@ Text bt_night_icon Text bt_vacat_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -203,7 +203,7 @@ Text bt_vacat_icon Text bt_bypass_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -213,7 +213,7 @@ Text bt_bypass_icon Text bt_disarm_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -221,58 +221,51 @@ Text bt_disarm_icon Text : Max. Text Size : 10 -Picture alarm_exit - Attributes - ID : 2 - Scope : local - Dragging : 0 - Send Component ID: disabled - Picture bt_home_pic Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_away_pic Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_night_pic Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_vacat_pic Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_bypass_pic Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_disarm_pic Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID: disabled Hotspot alarm_back Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Send Component ID: disabled @@ -298,7 +291,7 @@ Hotspot alarm_back Hotspot bt_home Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID: disabled @@ -322,7 +315,7 @@ Hotspot bt_home Hotspot bt_away Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Send Component ID: disabled @@ -346,7 +339,7 @@ Hotspot bt_away Hotspot bt_night Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Send Component ID: disabled @@ -370,7 +363,7 @@ Hotspot bt_night Hotspot bt_vacat Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -394,7 +387,7 @@ Hotspot bt_vacat Hotspot bt_bypass Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -418,7 +411,7 @@ Hotspot bt_bypass Hotspot bt_disarm Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt index 291f9d9..e997046 100644 --- a/nspanel_eu_code/buttonpage01.txt +++ b/nspanel_eu_code/buttonpage01.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt index c614825..8f17faf 100644 --- a/nspanel_eu_code/buttonpage02.txt +++ b/nspanel_eu_code/buttonpage02.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt index 5b5988e..bad65c9 100644 --- a/nspanel_eu_code/buttonpage03.txt +++ b/nspanel_eu_code/buttonpage03.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt index fcf05d5..24c6110 100644 --- a/nspanel_eu_code/buttonpage04.txt +++ b/nspanel_eu_code/buttonpage04.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us.HMI b/nspanel_us.HMI index ad20e94..d9fad44 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 20b2e96..cd75ad2 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt index 87bb839..2f43ecd 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -55,28 +55,28 @@ Page alarm Variable (string) lastclick Attributes - ID : 5 + ID : 4 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 6 + ID : 5 Scope : local Text : home Max. Text Size: 15 Variable (string) code_format Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 15 Variable (string) entity Attributes - ID : 32 + ID : 31 Scope : local Text : Max. Text Size: 100 @@ -93,7 +93,7 @@ Text page_label Text icon_state Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -103,7 +103,7 @@ Text icon_state Text bt_home_text Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled @@ -113,7 +113,7 @@ Text bt_home_text Text bt_away_text Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -123,7 +123,7 @@ Text bt_away_text Text bt_night_text Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -133,7 +133,7 @@ Text bt_night_text Text bt_vacat_text Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -143,7 +143,7 @@ Text bt_vacat_text Text bt_bypass_text Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -153,7 +153,7 @@ Text bt_bypass_text Text bt_disarm_text Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -163,7 +163,7 @@ Text bt_disarm_text Text bt_home_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -173,7 +173,7 @@ Text bt_home_icon Text bt_away_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -183,7 +183,7 @@ Text bt_away_icon Text bt_night_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -193,7 +193,7 @@ Text bt_night_icon Text bt_vacat_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -203,7 +203,7 @@ Text bt_vacat_icon Text bt_bypass_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -213,7 +213,7 @@ Text bt_bypass_icon Text bt_disarm_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -221,58 +221,51 @@ Text bt_disarm_icon Text : Max. Text Size : 10 -Picture alarm_exit - Attributes - ID : 2 - Scope : local - Dragging : 0 - Send Component ID: disabled - Picture bt_home_pic Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_away_pic Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_night_pic Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_vacat_pic Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_bypass_pic Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_disarm_pic Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID: disabled Hotspot alarm_back Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Send Component ID: disabled @@ -298,7 +291,7 @@ Hotspot alarm_back Hotspot bt_home Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID: disabled @@ -322,7 +315,7 @@ Hotspot bt_home Hotspot bt_away Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Send Component ID: disabled @@ -346,7 +339,7 @@ Hotspot bt_away Hotspot bt_night Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Send Component ID: disabled @@ -370,7 +363,7 @@ Hotspot bt_night Hotspot bt_vacat Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -394,7 +387,7 @@ Hotspot bt_vacat Hotspot bt_bypass Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -418,7 +411,7 @@ Hotspot bt_bypass Hotspot bt_disarm Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt index 291f9d9..e997046 100644 --- a/nspanel_us_code/buttonpage01.txt +++ b/nspanel_us_code/buttonpage01.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt index c614825..8f17faf 100644 --- a/nspanel_us_code/buttonpage02.txt +++ b/nspanel_us_code/buttonpage02.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index 5b5988e..bad65c9 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt index fcf05d5..24c6110 100644 --- a/nspanel_us_code/buttonpage04.txt +++ b/nspanel_us_code/buttonpage04.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index a05331c..a193ab0 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index d1284a9..9663d1e 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt index 87bb839..2f43ecd 100644 --- a/nspanel_us_land_code/alarm.txt +++ b/nspanel_us_land_code/alarm.txt @@ -55,28 +55,28 @@ Page alarm Variable (string) lastclick Attributes - ID : 5 + ID : 4 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 6 + ID : 5 Scope : local Text : home Max. Text Size: 15 Variable (string) code_format Attributes - ID : 31 + ID : 30 Scope : local Text : Max. Text Size: 15 Variable (string) entity Attributes - ID : 32 + ID : 31 Scope : local Text : Max. Text Size: 100 @@ -93,7 +93,7 @@ Text page_label Text icon_state Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -103,7 +103,7 @@ Text icon_state Text bt_home_text Attributes - ID : 8 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled @@ -113,7 +113,7 @@ Text bt_home_text Text bt_away_text Attributes - ID : 10 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -123,7 +123,7 @@ Text bt_away_text Text bt_night_text Attributes - ID : 12 + ID : 11 Scope : local Dragging : 0 Send Component ID : disabled @@ -133,7 +133,7 @@ Text bt_night_text Text bt_vacat_text Attributes - ID : 14 + ID : 13 Scope : local Dragging : 0 Send Component ID : disabled @@ -143,7 +143,7 @@ Text bt_vacat_text Text bt_bypass_text Attributes - ID : 16 + ID : 15 Scope : local Dragging : 0 Send Component ID : disabled @@ -153,7 +153,7 @@ Text bt_bypass_text Text bt_disarm_text Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -163,7 +163,7 @@ Text bt_disarm_text Text bt_home_icon Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Send Component ID : disabled @@ -173,7 +173,7 @@ Text bt_home_icon Text bt_away_icon Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled @@ -183,7 +183,7 @@ Text bt_away_icon Text bt_night_icon Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Send Component ID : disabled @@ -193,7 +193,7 @@ Text bt_night_icon Text bt_vacat_icon Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled @@ -203,7 +203,7 @@ Text bt_vacat_icon Text bt_bypass_icon Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Send Component ID : disabled @@ -213,7 +213,7 @@ Text bt_bypass_icon Text bt_disarm_icon Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Send Component ID : disabled @@ -221,58 +221,51 @@ Text bt_disarm_icon Text : Max. Text Size : 10 -Picture alarm_exit - Attributes - ID : 2 - Scope : local - Dragging : 0 - Send Component ID: disabled - Picture bt_home_pic Attributes - ID : 7 + ID : 6 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_away_pic Attributes - ID : 9 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_night_pic Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_vacat_pic Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_bypass_pic Attributes - ID : 15 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled Picture bt_disarm_pic Attributes - ID : 17 + ID : 16 Scope : local Dragging : 0 Send Component ID: disabled Hotspot alarm_back Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Send Component ID: disabled @@ -298,7 +291,7 @@ Hotspot alarm_back Hotspot bt_home Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Send Component ID: disabled @@ -322,7 +315,7 @@ Hotspot bt_home Hotspot bt_away Attributes - ID : 26 + ID : 25 Scope : local Dragging : 0 Send Component ID: disabled @@ -346,7 +339,7 @@ Hotspot bt_away Hotspot bt_night Attributes - ID : 27 + ID : 26 Scope : local Dragging : 0 Send Component ID: disabled @@ -370,7 +363,7 @@ Hotspot bt_night Hotspot bt_vacat Attributes - ID : 28 + ID : 27 Scope : local Dragging : 0 Send Component ID: disabled @@ -394,7 +387,7 @@ Hotspot bt_vacat Hotspot bt_bypass Attributes - ID : 29 + ID : 28 Scope : local Dragging : 0 Send Component ID: disabled @@ -418,7 +411,7 @@ Hotspot bt_bypass Hotspot bt_disarm Attributes - ID : 30 + ID : 29 Scope : local Dragging : 0 Send Component ID: disabled diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt index 0f10895..c893e02 100644 --- a/nspanel_us_land_code/buttonpage01.txt +++ b/nspanel_us_land_code/buttonpage01.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt index c64cc44..ca0d67e 100644 --- a/nspanel_us_land_code/buttonpage02.txt +++ b/nspanel_us_land_code/buttonpage02.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt index 43ebe21..836693a 100644 --- a/nspanel_us_land_code/buttonpage03.txt +++ b/nspanel_us_land_code/buttonpage03.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt index fb671b7..2cd3cb5 100644 --- a/nspanel_us_land_code/buttonpage04.txt +++ b/nspanel_us_land_code/buttonpage04.txt @@ -59,7 +59,7 @@ Text button01text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button01bri Attributes @@ -79,7 +79,7 @@ Text button02text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button02bri Attributes @@ -99,7 +99,7 @@ Text button03text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button03bri Attributes @@ -119,7 +119,7 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button04bri Attributes @@ -139,7 +139,7 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button05bri Attributes @@ -159,7 +159,7 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button06bri Attributes @@ -179,7 +179,7 @@ Text button07text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button07bri Attributes @@ -199,7 +199,7 @@ Text button08text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 10 + Max. Text Size : 22 Text button08bri Attributes