diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index fa2a4ca..98f9254 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_us_land_code/boot.txt @@ -101,7 +101,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.3.0 + Text : 4.3.1d1 Max. Text Size : 9 Text esph_version diff --git a/hmi/dev/nspanel_us_land_code/buttonpage01.txt b/hmi/dev/nspanel_us_land_code/buttonpage01.txt index 0b5acd8..0d1b9c9 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage01.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage01.txt @@ -20,20 +20,24 @@ Page buttonpage01 vis 255,0 vis button_back,1 vis page_label,1 - page_index.txt+="●" - if(is_buttonpage02==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + page_index.txt+="●" + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - vis page_index,1 } sendme diff --git a/hmi/dev/nspanel_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_us_land_code/buttonpage02.txt index eed659f..ec2f1e9 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage02.txt @@ -20,20 +20,24 @@ Page buttonpage02 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - page_index.txt+="●" - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - vis page_index,1 } sendme diff --git a/hmi/dev/nspanel_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_us_land_code/buttonpage03.txt index 17f7232..dedf149 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage03.txt @@ -20,20 +20,24 @@ Page buttonpage03 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_buttonpage04==1) + { + page_index.txt+="○" + } + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_buttonpage04==1) - { - page_index.txt+="○" - } - vis page_index,1 } sendme diff --git a/hmi/dev/nspanel_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_us_land_code/buttonpage04.txt index 3268c4d..c8ac33f 100644 --- a/hmi/dev/nspanel_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_us_land_code/buttonpage04.txt @@ -20,20 +20,24 @@ Page buttonpage04 vis 255,0 vis button_back,1 vis page_label,1 - if(is_buttonpage01==1) + sys0=is_buttonpage01+is_buttonpage02+is_buttonpage03+is_buttonpage04 + if(sys0>1) { - page_index.txt+="○" + if(is_buttonpage01==1) + { + page_index.txt+="○" + } + if(is_buttonpage02==1) + { + page_index.txt+="○" + } + if(is_buttonpage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + vis page_index,1 } - if(is_buttonpage02==1) - { - page_index.txt+="○" - } - if(is_buttonpage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" - vis page_index,1 } sendme diff --git a/hmi/dev/nspanel_us_land_code/entitypage01.txt b/hmi/dev/nspanel_us_land_code/entitypage01.txt index e4cf268..4408d70 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage01.txt @@ -17,18 +17,25 @@ Page entitypage01 page home } vis unavailable,0 - page_index.txt+="●" - if(is_entitypage02==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage03==1) + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" - } - if(is_entitypage04==1) - { - page_index.txt+="○" + vis page_index,0 } sendme diff --git a/hmi/dev/nspanel_us_land_code/entitypage02.txt b/hmi/dev/nspanel_us_land_code/entitypage02.txt index 624506d..2f5ad4b 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage02.txt @@ -17,18 +17,25 @@ Page entitypage02 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_entitypage03==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" - } - if(is_entitypage04==1) - { - page_index.txt+="○" + vis page_index,0 } sendme diff --git a/hmi/dev/nspanel_us_land_code/entitypage03.txt b/hmi/dev/nspanel_us_land_code/entitypage03.txt index b2b9ed3..91f7c22 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage03.txt @@ -17,18 +17,25 @@ Page entitypage03 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } + }else { - page_index.txt+="○" - } - page_index.txt+="●" - if(is_entitypage04==1) - { - page_index.txt+="○" + vis page_index,0 } sendme @@ -122,7 +129,7 @@ Text value08_label Text : Max. Text Size : 60 -Text value01_pic +Text value01_icon Attributes ID : 12 Scope : local diff --git a/hmi/dev/nspanel_us_land_code/entitypage04.txt b/hmi/dev/nspanel_us_land_code/entitypage04.txt index 5ae4454..3a661c6 100644 --- a/hmi/dev/nspanel_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_us_land_code/entitypage04.txt @@ -17,19 +17,26 @@ Page entitypage04 page home } vis unavailable,0 - if(is_entitypage01==1) + sys0=is_entitypage01+is_entitypage02+is_entitypage03+is_entitypage04 + if(sys0>1) { - page_index.txt+="○" - } - if(is_entitypage02==1) + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + }else { - page_index.txt+="○" + vis page_index,0 } - if(is_entitypage03==1) - { - page_index.txt+="○" - } - page_index.txt+="●" sendme Text value01_label diff --git a/hmi/dev/nspanel_us_land_code/utilities.txt b/hmi/dev/nspanel_us_land_code/utilities.txt index 30c6040..540eab7 100644 --- a/hmi/dev/nspanel_us_land_code/utilities.txt +++ b/hmi/dev/nspanel_us_land_code/utilities.txt @@ -111,7 +111,7 @@ Text home_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Home + Text : Max. Text Size : 10 Text home @@ -151,7 +151,7 @@ Text grid_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Grid + Text : Max. Text Size : 10 Text grid @@ -191,7 +191,7 @@ Text group01_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group01 @@ -231,7 +231,7 @@ Text group02_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group02 @@ -271,7 +271,7 @@ Text group03_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group03 @@ -311,7 +311,7 @@ Text group04_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group04 @@ -351,7 +351,7 @@ Text group05_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group05 @@ -391,7 +391,7 @@ Text group06_label Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : Label + Text : Max. Text Size : 10 Text group06 diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 693bf17..ec8b1bd 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index e9d252d..964566c 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 2e97437..63ff376 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ