diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index d077984..a2faa6b 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -7324,6 +7324,22 @@ action: confirm: !input 'entity32_confirm' page: buttonpage04 component: button08 + confirm_list: > + {{ + button_pages_buttons[first_button:last_button] + | sort(attribute="component") + | map(attribute="confirm") + | list + }} + confirm_value: > + {% set ns = namespace(decimal_value = 0, index = 0) %} + {% for confirm_item in confirm_list %} + {% if (confirm_item) %} + {% set ns.decimal_value = ns.decimal_value + (2 ** ns.index) %} + {% endif %} + {% set ns.index = ns.index + 1 %} + {% endfor %} + {{ ns.decimal_value }} - if: '{{ button_page_index >= 0 and button_page_index <= 3 }}' then: ##### Button Page Label ##### @@ -7335,6 +7351,13 @@ action: message: '{{ button_pages_labels[button_page_index].label }}' continue_on_error: true + ###### Confirm buttons ###### DEBUG + - *delay-default + - service: '{{ nextion.command.value }}' + data: + component: confirm + message: '{{ confirm_value }}' + continue_on_error: true ###### Display page while other elements are still loading ##### - variables: show_while_loading: !input 'show_while_loading' diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index f72d3cc..56c4d3a 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 152fb9f..c2851a8 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt index c4e36a2..8fae1a1 100644 --- a/nspanel_eu_code/buttonpage01.txt +++ b/nspanel_eu_code/buttonpage01.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage01 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt index 2dbc205..f967fd5 100644 --- a/nspanel_eu_code/buttonpage02.txt +++ b/nspanel_eu_code/buttonpage02.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage02 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt index 64ea985..4d697f5 100644 --- a/nspanel_eu_code/buttonpage03.txt +++ b/nspanel_eu_code/buttonpage03.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage03 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt index 3e4c608..549c392 100644 --- a/nspanel_eu_code/buttonpage04.txt +++ b/nspanel_eu_code/buttonpage04.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage04 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us.HMI b/nspanel_us.HMI index a3e9481..50aac6c 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 4e349d1..a635a5a 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt index c4e36a2..8fae1a1 100644 --- a/nspanel_us_code/buttonpage01.txt +++ b/nspanel_us_code/buttonpage01.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage01 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt index f9e152d..45caef4 100644 --- a/nspanel_us_code/buttonpage02.txt +++ b/nspanel_us_code/buttonpage02.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage02 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index b0dbb68..1e7a3d4 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage03 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt index f34210d..362b803 100644 --- a/nspanel_us_code/buttonpage04.txt +++ b/nspanel_us_code/buttonpage04.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage04 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 729e455..6b6ff4d 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 31da1c1..b29f0f8 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt index ed156b5..5066361 100644 --- a/nspanel_us_land_code/buttonpage01.txt +++ b/nspanel_us_land_code/buttonpage01.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage01 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt index d23037b..f651ef6 100644 --- a/nspanel_us_land_code/buttonpage02.txt +++ b/nspanel_us_land_code/buttonpage02.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage02 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt index 84f65eb..5311424 100644 --- a/nspanel_us_land_code/buttonpage03.txt +++ b/nspanel_us_land_code/buttonpage03.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage03 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt index 138400a..1dea0a3 100644 --- a/nspanel_us_land_code/buttonpage04.txt +++ b/nspanel_us_land_code/buttonpage04.txt @@ -63,54 +63,12 @@ Variable (string) page_name Text : buttonpage04 Max. Text Size: 12 -Variable (int32) button01conf - Attributes - ID : 50 - Scope: local - Value: 0 - -Variable (int32) button02conf +Variable (int32) confirm Attributes ID : 51 Scope: local Value: 0 -Variable (int32) button03conf - Attributes - ID : 52 - Scope: local - Value: 0 - -Variable (int32) button04conf - Attributes - ID : 53 - Scope: local - Value: 0 - -Variable (int32) button05conf - Attributes - ID : 54 - Scope: local - Value: 0 - -Variable (int32) button06conf - Attributes - ID : 55 - Scope: local - Value: 0 - -Variable (int32) button07conf - Attributes - ID : 56 - Scope: local - Value: 0 - -Variable (int32) button08conf - Attributes - ID : 57 - Scope: local - Value: 0 - Text button01text Attributes ID : 4 @@ -457,7 +415,8 @@ Hotspot button01 if(click_timer.en==1) { click_timer.en=0 - if(button01conf.val==1) + sys0=confirm.val&1 + if(sys0>0) { confirm.body.txt=button01text.txt confirm.page_id.val=dp @@ -492,7 +451,8 @@ Hotspot button02 if(click_timer.en==1) { click_timer.en=0 - if(button02conf.val==1) + sys0=confirm.val&2 + if(sys0>0) { confirm.body.txt=button02text.txt confirm.page_id.val=dp @@ -527,7 +487,8 @@ Hotspot button03 if(click_timer.en==1) { click_timer.en=0 - if(button03conf.val==1) + sys0=confirm.val&4 + if(sys0>0) { confirm.body.txt=button03text.txt confirm.page_id.val=dp @@ -562,7 +523,8 @@ Hotspot button04 if(click_timer.en==1) { click_timer.en=0 - if(button04conf.val==1) + sys0=confirm.val&8 + if(sys0>0) { confirm.body.txt=button04text.txt confirm.page_id.val=dp @@ -597,7 +559,8 @@ Hotspot button05 if(click_timer.en==1) { click_timer.en=0 - if(button05conf.val==1) + sys0=confirm.val&16 + if(sys0>0) { confirm.body.txt=button05text.txt confirm.page_id.val=dp @@ -632,7 +595,8 @@ Hotspot button06 if(click_timer.en==1) { click_timer.en=0 - if(button06conf.val==1) + sys0=confirm.val&32 + if(sys0>0) { confirm.body.txt=button06text.txt confirm.page_id.val=dp @@ -667,7 +631,8 @@ Hotspot button07 if(click_timer.en==1) { click_timer.en=0 - if(button07conf.val==1) + sys0=confirm.val&64 + if(sys0>0) { confirm.body.txt=button07text.txt confirm.page_id.val=dp @@ -702,7 +667,8 @@ Hotspot button08 if(click_timer.en==1) { click_timer.en=0 - if(button08conf.val==1) + sys0=confirm.val&128 + if(sys0>0) { confirm.body.txt=button08text.txt confirm.page_id.val=dp @@ -753,7 +719,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 58 + ID : 50 Scope : local Period (ms): 100 Enabled : yes