diff --git a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt index bdaf5e7..439f69b 100644 --- a/hmi/dev/nspanel_CJK_eu_code/Program.s.txt +++ b/hmi/dev/nspanel_CJK_eu_code/Program.s.txt @@ -4,13 +4,15 @@ Program.s int r=0,g=0,b=0 int h=0,s=0,v=0 int p=0,q=0,t=0,f=0 + int is_buttonpage01=1, is_buttonpage02=1, is_buttonpage03=1, is_buttonpage04=1 + int is_entitypage01=1, is_entitypage02=1, is_entitypage03=1, is_entitypage04=1 int back_page_id=0 int dimdelta=0 int api=0 // 0 = disconnected from HA, 1 = connected to HA int is_entities=0,is_qrcode=0,is_notification=0 int brightness=100,brightness_dim=40,brightness_sleep=0 int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape, 4 = blank - int charset=1 // 1 = International (original), 2 = CJK + int charset=2 // 1 = International (original), 2 = CJK //bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt index 9446a71..2026b19 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt @@ -19,6 +19,20 @@ Page buttonpage01 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ●○○○ + Text : Max. Text Size : 12 Text button01pic @@ -782,7 +796,19 @@ TouchCap swipe swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. + if(is_buttonpage02==1) // Check if buttonpage02 is active + { + if(is_buttonpage03==1) // Then check if buttonpage03 is also active + { + page buttonpage03 // Navigate to buttonpage03 if both are active + }else if(is_buttonpage04==1) // If buttonpage03 is not active, but buttonpage04 is + { + page buttonpage04 // Navigate to buttonpage04, skipping buttonpage03 + }else + { + page home // Fallback if neither buttonpage03 nor buttonpage04 is active + } + }else if(is_buttonpage03==1) // If buttonpage02 is active + { + if(is_buttonpage04==1) // Check if buttonpage04 is active + { + page buttonpage04 // Navigate to buttonpage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt index 87af814..3d479dc 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt @@ -19,6 +19,20 @@ Page buttonpage02 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage01 + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage01==1) + { + page home + }else + { + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1||is_buttonpage04==1) + { + page home + }else + { + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt index bb36625..ed1c1f0 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage03.txt @@ -19,6 +19,20 @@ Page buttonpage03 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,30 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage02 + // Navigate back based on active status + if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1||is_buttonpage01==1||is_buttonpage04==0) + { + page home + }else + { + page buttonpage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_buttonpage04==1) + { + page home + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt index 38c8cdd..088a871 100644 --- a/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/buttonpage04.txt @@ -19,6 +19,20 @@ Page buttonpage04 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○○● + Text : Max. Text Size : 12 Text button01pic @@ -776,9 +790,22 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage03 + // Navigate back based on active status + if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage03==1&&is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1||is_entitypage02==1) + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/climate.txt b/hmi/dev/nspanel_CJK_eu_code/climate.txt index b9f183a..c7530e1 100644 --- a/hmi/dev/nspanel_CJK_eu_code/climate.txt +++ b/hmi/dev/nspanel_CJK_eu_code/climate.txt @@ -190,6 +190,13 @@ Variable (int32) temp_gap Scope: local Value: 0 +Variable (string) dec_separator + Attributes + ID : 55 + Scope : local + Text : . + Max. Text Size: 5 + Text current_temp Attributes ID : 3 @@ -567,7 +574,7 @@ Slider slider_high covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt timer1.en=1 active_slider.val=1 @@ -600,7 +607,7 @@ Slider slider_low covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt timer2.en=1 active_slider.val=2 @@ -625,7 +632,7 @@ Slider climateslider covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt active_slider.val=0 timer0.en=1 @@ -664,7 +671,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -678,7 +685,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -692,7 +699,7 @@ Hotspot decrease_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } @@ -729,7 +736,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -743,7 +750,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -757,7 +764,7 @@ Hotspot increase_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt index ceb8e33..977a7b4 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage01.txt @@ -17,6 +17,19 @@ Page entitypage01 page home } vis unavailable,0 + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity01_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ●○○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,25 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage04 + page home } // Right to Left swipec2=0-swipedx if(swipec100) { - page entitypage03 + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage04 + if(is_entitypage02==1) // Check if entitypage02 is active + { + if(is_entitypage03==1) // Then check if entitypage03 is also active + { + page entitypage03 // Navigate to entitypage03 if both are active + }else if(is_entitypage04==1) // If entitypage03 is not active, but entitypage04 is + { + page entitypage04 // Navigate to entitypage04, skipping entitypage03 + }else + { + page home // Fallback if neither entitypage03 nor entitypage04 is active + } + }else if(is_entitypage03==1) // If entitypage02 is not active, check entitypage03 directly + { + if(is_entitypage04==1) // Check if entitypage04 is active + { + page entitypage04 // Navigate to entitypage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt index 1ba1ec3..4b25de6 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage02.txt @@ -17,6 +17,19 @@ Page entitypage02 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity02_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage01 + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage01==1) + { + page home + }else + { + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_entitypage03==1&&is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1||is_entitypage04==1) + { + page home + }else + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt index 7286e7d..38e1097 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage03.txt @@ -17,6 +17,19 @@ Page entitypage03 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity03_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage02 + if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage02==1&&is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1||is_entitypage01==1||is_entitypage04==0) + { + page home + }else + { + page entitypage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage01 + if(is_entitypage04==1) + { + page home + }else if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt index e8e84f8..a7c0222 100644 --- a/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_eu_code/entitypage04.txt @@ -17,6 +17,19 @@ Page entitypage04 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity04_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○○● + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,26 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage03 + // Navigate back based on active status + if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - page entitypage01 + if(is_entitypage03==1&&is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1||is_entitypage02==1) + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/fan.txt b/hmi/dev/nspanel_CJK_eu_code/fan.txt index 6909a73..80c36db 100644 --- a/hmi/dev/nspanel_CJK_eu_code/fan.txt +++ b/hmi/dev/nspanel_CJK_eu_code/fan.txt @@ -17,6 +17,7 @@ Page fan page home } vis unavailable,0 + vis bt_oscillate,0 Postinitialize Event sendme @@ -75,6 +76,20 @@ Text unavailable Text : Max. Text Size : 1 +Text bt_oscillate + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + bt_oscillate.pco=31 + Slider fanslider Attributes ID : 3 diff --git a/hmi/dev/nspanel_CJK_eu_code/home.txt b/hmi/dev/nspanel_CJK_eu_code/home.txt index 43044a3..e8109d7 100644 --- a/hmi/dev/nspanel_CJK_eu_code/home.txt +++ b/hmi/dev/nspanel_CJK_eu_code/home.txt @@ -686,15 +686,47 @@ TouchCap swipe { swipec=swipex-tch2 // From Left to Right - if(swipec>swipedx&&api==1) + if(swipec>swipedx) { - page buttonpage04 + // Navigate back based on active status + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx - if(swipec100&&api==1) + if(swipec>100) { - page buttonpage02 + if(is_buttonpage04==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage04==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage04==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage03==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage03==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } // Down to Up - swipec2=0-swipedy - if(swipec<-100&&api==1) + swipec=0-swipedy + if(swipec<-100) { - page buttonpage03 + // Navigate back up the sequence based on active status + if(is_buttonpage01==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage01==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage02==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else + { + // Do nothing + } } } diff --git a/hmi/dev/nspanel_CJK_eu_code/light.txt b/hmi/dev/nspanel_CJK_eu_code/light.txt index 5a1d342..da41027 100644 --- a/hmi/dev/nspanel_CJK_eu_code/light.txt +++ b/hmi/dev/nspanel_CJK_eu_code/light.txt @@ -169,6 +169,20 @@ Text unavailable Text : Max. Text Size : 1 +Text power_button + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + power_button.pco=31 + Picture light_button Attributes ID : 8 diff --git a/hmi/dev/nspanel_CJK_eu_code/utilities2.txt b/hmi/dev/nspanel_CJK_eu_code/utilities2.txt new file mode 100644 index 0000000..351e7bc --- /dev/null +++ b/hmi/dev/nspanel_CJK_eu_code/utilities2.txt @@ -0,0 +1,440 @@ +Page utilities2 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + + Events + Preinitialize Event + if(api==0) + { + page home + } + vis unavailable,0 + + Postinitialize Event + sendme + +Text title + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : Power Dashboard + Max. Text Size : 100 + +Text title_icon + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text unavailable + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 1 + +Text t1 + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 賈 + Max. Text Size : 4 + +Text t2 + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t3 + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t4 + Attributes + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Green + Max. Text Size : 10 + +Text t5 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Fossil + Max. Text Size : 10 + +Text t7 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 全 + Max. Text Size : 4 + +Text t8 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Solar + Max. Text Size : 10 + +Text t9 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 98% + Max. Text Size : 10 + +Text t10 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 2% + Max. Text Size : 10 + +Text t11 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 豈 + Max. Text Size : 4 + +Text t12 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Battery + Max. Text Size : 10 + +Text t13 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 暑 + Max. Text Size : 4 + +Text t14 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Heating + Max. Text Size : 10 + +Text t15 + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.7 kW + Max. Text Size : 10 + +Text t16 + Attributes + ID : 25 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 21.7°C + Max. Text Size : 10 + +Text t17 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t18 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : -2.1 kW + Max. Text Size : 10 + +Text t19 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 0.8 kW + Max. Text Size : 10 + +Text t20 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 慎 + Max. Text Size : 4 + +Text t21 + Attributes + ID : 30 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Wind + Max. Text Size : 10 + +Text t22 + Attributes + ID : 32 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t23 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t24 + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t25 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t0 + Attributes + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t6 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t26 + Attributes + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Slider h1 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h2 + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h3 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h4 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h5 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h6 + Attributes + ID : 31 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h7 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h0 + Attributes + ID : 39 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Button button_back + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID: on press and release + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page back_page_id + +Timer wakeup_timer + Attributes + ID : 4 + Scope : local + Period (ms): 100 + Enabled : yes + + Events + Timer Event + if(dim100) { - //page + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. + if(is_buttonpage02==1) // Check if buttonpage02 is active + { + if(is_buttonpage03==1) // Then check if buttonpage03 is also active + { + page buttonpage03 // Navigate to buttonpage03 if both are active + }else if(is_buttonpage04==1) // If buttonpage03 is not active, but buttonpage04 is + { + page buttonpage04 // Navigate to buttonpage04, skipping buttonpage03 + }else + { + page home // Fallback if neither buttonpage03 nor buttonpage04 is active + } + }else if(is_buttonpage03==1) // If buttonpage02 is active + { + if(is_buttonpage04==1) // Check if buttonpage04 is active + { + page buttonpage04 // Navigate to buttonpage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt index 87af814..3d479dc 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage02.txt @@ -19,6 +19,20 @@ Page buttonpage02 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage01 + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage01==1) + { + page home + }else + { + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1||is_buttonpage04==1) + { + page home + }else + { + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt index bb36625..ed1c1f0 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage03.txt @@ -19,6 +19,20 @@ Page buttonpage03 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,30 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage02 + // Navigate back based on active status + if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1||is_buttonpage01==1||is_buttonpage04==0) + { + page home + }else + { + page buttonpage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_buttonpage04==1) + { + page home + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt index 38c8cdd..0f5f3e6 100644 --- a/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/buttonpage04.txt @@ -20,6 +20,7 @@ Page buttonpage04 vis 255,0 vis button_back,1 vis page_index,1 + vis page_label,1 } Postinitialize Event @@ -776,9 +777,22 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage03 + // Navigate back based on active status + if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage03==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage03==1||is_buttonpage02==1) + { + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/climate.txt b/hmi/dev/nspanel_CJK_us_code/climate.txt index 2d3bc7c..721f7ad 100644 --- a/hmi/dev/nspanel_CJK_us_code/climate.txt +++ b/hmi/dev/nspanel_CJK_us_code/climate.txt @@ -190,6 +190,13 @@ Variable (int32) temp_gap Scope: local Value: 0 +Variable (string) dec_separator + Attributes + ID : 55 + Scope : local + Text : . + Max. Text Size: 5 + Text current_temp Attributes ID : 3 @@ -567,7 +574,7 @@ Slider slider_high covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt timer1.en=1 active_slider.val=1 @@ -600,7 +607,7 @@ Slider slider_low covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt timer2.en=1 active_slider.val=2 @@ -625,7 +632,7 @@ Slider climateslider covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt active_slider.val=0 timer0.en=1 @@ -664,7 +671,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -678,7 +685,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -692,7 +699,7 @@ Hotspot decrease_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } @@ -729,7 +736,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -743,7 +750,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -757,7 +764,7 @@ Hotspot increase_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt index ceb8e33..977a7b4 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage01.txt @@ -17,6 +17,19 @@ Page entitypage01 page home } vis unavailable,0 + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity01_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ●○○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,25 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage04 + page home } // Right to Left swipec2=0-swipedx if(swipec100) { - page entitypage03 + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage04 + if(is_entitypage02==1) // Check if entitypage02 is active + { + if(is_entitypage03==1) // Then check if entitypage03 is also active + { + page entitypage03 // Navigate to entitypage03 if both are active + }else if(is_entitypage04==1) // If entitypage03 is not active, but entitypage04 is + { + page entitypage04 // Navigate to entitypage04, skipping entitypage03 + }else + { + page home // Fallback if neither entitypage03 nor entitypage04 is active + } + }else if(is_entitypage03==1) // If entitypage02 is not active, check entitypage03 directly + { + if(is_entitypage04==1) // Check if entitypage04 is active + { + page entitypage04 // Navigate to entitypage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt index 1ba1ec3..4b25de6 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage02.txt @@ -17,6 +17,19 @@ Page entitypage02 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity02_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage01 + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage01==1) + { + page home + }else + { + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_entitypage03==1&&is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1||is_entitypage04==1) + { + page home + }else + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt index b343d78..97fecd2 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage03.txt @@ -17,6 +17,19 @@ Page entitypage03 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity03_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage02 + if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage02==1&&is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1||is_entitypage01==1||is_entitypage04==0) + { + page home + }else + { + page entitypage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage01 + if(is_entitypage04==1) + { + page home + }else if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt index e8e84f8..a7c0222 100644 --- a/hmi/dev/nspanel_CJK_us_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_code/entitypage04.txt @@ -17,6 +17,19 @@ Page entitypage04 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity04_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○○● + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,26 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage03 + // Navigate back based on active status + if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - page entitypage01 + if(is_entitypage03==1&&is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1||is_entitypage02==1) + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/fan.txt b/hmi/dev/nspanel_CJK_us_code/fan.txt index 6909a73..80c36db 100644 --- a/hmi/dev/nspanel_CJK_us_code/fan.txt +++ b/hmi/dev/nspanel_CJK_us_code/fan.txt @@ -17,6 +17,7 @@ Page fan page home } vis unavailable,0 + vis bt_oscillate,0 Postinitialize Event sendme @@ -75,6 +76,20 @@ Text unavailable Text : Max. Text Size : 1 +Text bt_oscillate + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + bt_oscillate.pco=31 + Slider fanslider Attributes ID : 3 diff --git a/hmi/dev/nspanel_CJK_us_code/home.txt b/hmi/dev/nspanel_CJK_us_code/home.txt index 43044a3..e8109d7 100644 --- a/hmi/dev/nspanel_CJK_us_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_code/home.txt @@ -686,15 +686,47 @@ TouchCap swipe { swipec=swipex-tch2 // From Left to Right - if(swipec>swipedx&&api==1) + if(swipec>swipedx) { - page buttonpage04 + // Navigate back based on active status + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx - if(swipec100&&api==1) + if(swipec>100) { - page buttonpage02 + if(is_buttonpage04==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage04==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage04==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage03==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage03==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } // Down to Up - swipec2=0-swipedy - if(swipec<-100&&api==1) + swipec=0-swipedy + if(swipec<-100) { - page buttonpage03 + // Navigate back up the sequence based on active status + if(is_buttonpage01==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage01==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage02==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else + { + // Do nothing + } } } diff --git a/hmi/dev/nspanel_CJK_us_code/light.txt b/hmi/dev/nspanel_CJK_us_code/light.txt index 25a940f..ca91503 100644 --- a/hmi/dev/nspanel_CJK_us_code/light.txt +++ b/hmi/dev/nspanel_CJK_us_code/light.txt @@ -169,6 +169,20 @@ Text unavailable Text : Max. Text Size : 1 +Text power_button + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + power_button.pco=31 + Picture light_button Attributes ID : 8 diff --git a/hmi/dev/nspanel_CJK_us_code/utilities2.txt b/hmi/dev/nspanel_CJK_us_code/utilities2.txt new file mode 100644 index 0000000..ca0821f --- /dev/null +++ b/hmi/dev/nspanel_CJK_us_code/utilities2.txt @@ -0,0 +1,440 @@ +Page utilities2 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + + Events + Preinitialize Event + if(api==0) + { + page home + } + vis unavailable,0 + + Postinitialize Event + sendme + +Text title + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : Power Dashboard + Max. Text Size : 100 + +Text title_icon + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text unavailable + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 1 + +Text t1 + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 賈 + Max. Text Size : 4 + +Text t15 + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.7 kW + Max. Text Size : 10 + +Text t16 + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 21.7°C + Max. Text Size : 10 + +Text t2 + Attributes + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t4 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Green + Max. Text Size : 10 + +Text t9 + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 98% + Max. Text Size : 10 + +Text t3 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t5 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Fossil + Max. Text Size : 10 + +Text t10 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 2% + Max. Text Size : 10 + +Text t7 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 全 + Max. Text Size : 4 + +Text t8 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Solar + Max. Text Size : 10 + +Text t17 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t20 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 慎 + Max. Text Size : 4 + +Text t21 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Wind + Max. Text Size : 10 + +Text t22 + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t11 + Attributes + ID : 25 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 豈 + Max. Text Size : 4 + +Text t12 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Battery + Max. Text Size : 10 + +Text t18 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : -2.1 kW + Max. Text Size : 10 + +Text t23 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t24 + Attributes + ID : 30 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t25 + Attributes + ID : 32 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t13 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 暑 + Max. Text Size : 4 + +Text t14 + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Heating + Max. Text Size : 10 + +Text t19 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 0.8 kW + Max. Text Size : 10 + +Text t0 + Attributes + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t6 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t26 + Attributes + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Slider h1 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h2 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h3 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h6 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h4 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h7 + Attributes + ID : 31 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h5 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h0 + Attributes + ID : 39 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Button button_back + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID: on release + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page back_page_id + +Timer wakeup_timer + Attributes + ID : 4 + Scope : local + Period (ms): 100 + Enabled : yes + + Events + Timer Event + if(dim100) { - //page + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Assume starting from buttonpage01 and aiming to navigate two pages ahead based on active pages. + if(is_buttonpage02==1) // Check if buttonpage02 is active + { + if(is_buttonpage03==1) // Then check if buttonpage03 is also active + { + page buttonpage03 // Navigate to buttonpage03 if both are active + }else if(is_buttonpage04==1) // If buttonpage03 is not active, but buttonpage04 is + { + page buttonpage04 // Navigate to buttonpage04, skipping buttonpage03 + }else + { + page home // Fallback if neither buttonpage03 nor buttonpage04 is active + } + }else if(is_buttonpage03==1) // If buttonpage02 is active + { + if(is_buttonpage04==1) // Check if buttonpage04 is active + { + page buttonpage04 // Navigate to buttonpage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt index 87af814..3d479dc 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage02.txt @@ -19,6 +19,20 @@ Page buttonpage02 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage01 + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage01==1) + { + page home + }else + { + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1||is_buttonpage04==1) + { + page home + }else + { + if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt index bb36625..ed1c1f0 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage03.txt @@ -19,6 +19,20 @@ Page buttonpage03 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text button01pic @@ -776,13 +790,30 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage02 + // Navigate back based on active status + if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1||is_buttonpage01==1||is_buttonpage04==0) + { + page home + }else + { + page buttonpage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_buttonpage04==1) + { + page home + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt index 38c8cdd..088a871 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/buttonpage04.txt @@ -19,6 +19,20 @@ Page buttonpage04 { vis 255,0 vis button_back,1 + vis page_label,1 + 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 } @@ -69,7 +83,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○○● + Text : Max. Text Size : 12 Text button01pic @@ -776,9 +790,22 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page buttonpage03 + // Navigate back based on active status + if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage03==1&&is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1||is_entitypage02==1) + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/climate.txt b/hmi/dev/nspanel_CJK_us_land_code/climate.txt index b9f183a..c7530e1 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/climate.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/climate.txt @@ -190,6 +190,13 @@ Variable (int32) temp_gap Scope: local Value: 0 +Variable (string) dec_separator + Attributes + ID : 55 + Scope : local + Text : . + Max. Text Size: 5 + Text current_temp Attributes ID : 3 @@ -567,7 +574,7 @@ Slider slider_high covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt timer1.en=1 active_slider.val=1 @@ -600,7 +607,7 @@ Slider slider_low covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt timer2.en=1 active_slider.val=2 @@ -625,7 +632,7 @@ Slider climateslider covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt active_slider.val=0 timer0.en=1 @@ -664,7 +671,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -678,7 +685,7 @@ Hotspot decrease_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -692,7 +699,7 @@ Hotspot decrease_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } @@ -729,7 +736,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number0.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==1) @@ -743,7 +750,7 @@ Hotspot increase_temp covx va0.val,target_high.txt,0,0 va0.val=temp_number1.val%10 covx va0.val,va1.txt,0,0 - target_high.txt+="."+va1.txt + target_high.txt+=dec_separator.txt+va1.txt target_high.txt+=temp_unit.txt } }else if(active_slider.val==2) @@ -757,7 +764,7 @@ Hotspot increase_temp covx va0.val,target_low.txt,0,0 va0.val=temp_number2.val%10 covx va0.val,va1.txt,0,0 - target_low.txt+="."+va1.txt + target_low.txt+=dec_separator.txt+va1.txt target_low.txt+=temp_unit.txt } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt index ceb8e33..977a7b4 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage01.txt @@ -17,6 +17,19 @@ Page entitypage01 page home } vis unavailable,0 + page_index.txt+="●" + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity01_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ●○○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,25 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage04 + page home } // Right to Left swipec2=0-swipedx if(swipec100) { - page entitypage03 + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage04 + if(is_entitypage02==1) // Check if entitypage02 is active + { + if(is_entitypage03==1) // Then check if entitypage03 is also active + { + page entitypage03 // Navigate to entitypage03 if both are active + }else if(is_entitypage04==1) // If entitypage03 is not active, but entitypage04 is + { + page entitypage04 // Navigate to entitypage04, skipping entitypage03 + }else + { + page home // Fallback if neither entitypage03 nor entitypage04 is active + } + }else if(is_entitypage03==1) // If entitypage02 is not active, check entitypage03 directly + { + if(is_entitypage04==1) // Check if entitypage04 is active + { + page entitypage04 // Navigate to entitypage04, effectively skipping two pages + }else + { + page home // Fallback to home otherwise + } + }else + { + page home // Fallback to home if none of the conditions are met + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt index 1ba1ec3..4b25de6 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage02.txt @@ -17,6 +17,19 @@ Page entitypage02 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage03==1) + { + page_index.txt+="○" + } + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity02_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○●○○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage01 + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage01==1) + { + page home + }else + { + if(is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + if(is_entitypage03==1&&is_entitypage04==1) + { + page entitypage04 + }else if(is_entitypage03==1||is_entitypage04==1) + { + page home + }else + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt index 7286e7d..38e1097 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage03.txt @@ -17,6 +17,19 @@ Page entitypage03 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + page_index.txt+="●" + if(is_entitypage04==1) + { + page_index.txt+="○" + } Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity03_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○●○ + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,28 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage02 + if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } // Right to Left swipec2=0-swipedx if(swipec100) { - //page + if(is_entitypage02==1&&is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1||is_entitypage01==1||is_entitypage04==0) + { + page home + }else + { + page entitypage04 + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - page entitypage01 + if(is_entitypage04==1) + { + page home + }else if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt index e8e84f8..a7c0222 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/entitypage04.txt @@ -17,6 +17,19 @@ Page entitypage04 page home } vis unavailable,0 + if(is_entitypage01==1) + { + page_index.txt+="○" + } + if(is_entitypage02==1) + { + page_index.txt+="○" + } + if(is_entitypage03==1) + { + page_index.txt+="○" + } + page_index.txt+="●" Postinitialize Event sendme @@ -71,7 +84,7 @@ Text value03_label Text : Max. Text Size : 60 -Text entity04_label +Text page_label Attributes ID : 8 Scope : local @@ -278,7 +291,7 @@ Text page_index Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : ○○○● + Text : Max. Text Size : 12 Text unavailable @@ -359,13 +372,26 @@ TouchCap swipe // From Left to Right if(swipec>swipedx) { - page entitypage03 + // Navigate back based on active status + if(is_entitypage03==1) + { + page entitypage03 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx if(swipec100) { - page entitypage01 + if(is_entitypage03==1&&is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1||is_entitypage02==1) + { + if(is_entitypage01==1) + { + page entitypage01 + }else + { + page home + } + }else + { + page home + } } // Down to Up - swipec2=0-swipedy + swipec=0-swipedy if(swipec<-100) { - //page + // Navigate back up the sequence based on active status + if(is_entitypage01==1) + { + page entitypage01 + }else if(is_entitypage02==1) + { + page entitypage02 + }else if(is_entitypage03==1) + { + page entitypage03 + }else + { + page home + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/fan.txt b/hmi/dev/nspanel_CJK_us_land_code/fan.txt index 6909a73..80c36db 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/fan.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/fan.txt @@ -17,6 +17,7 @@ Page fan page home } vis unavailable,0 + vis bt_oscillate,0 Postinitialize Event sendme @@ -75,6 +76,20 @@ Text unavailable Text : Max. Text Size : 1 +Text bt_oscillate + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + bt_oscillate.pco=31 + Slider fanslider Attributes ID : 3 diff --git a/hmi/dev/nspanel_CJK_us_land_code/home.txt b/hmi/dev/nspanel_CJK_us_land_code/home.txt index 43044a3..e8109d7 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/home.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/home.txt @@ -686,15 +686,47 @@ TouchCap swipe { swipec=swipex-tch2 // From Left to Right - if(swipec>swipedx&&api==1) + if(swipec>swipedx) { - page buttonpage04 + // Navigate back based on active status + if(is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } - // Right to Left + // Right to Left swipe now navigates to home, looping back to the start. swipec2=0-swipedx - if(swipec100&&api==1) + if(swipec>100) { - page buttonpage02 + if(is_buttonpage04==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage04==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage04==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage03==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage03==1&&is_buttonpage01==1) + { + page buttonpage01 + }else if(is_buttonpage02==1&&is_buttonpage01==1) + { + page buttonpage01 + }else + { + // Do nothing + } } // Down to Up - swipec2=0-swipedy - if(swipec<-100&&api==1) + swipec=0-swipedy + if(swipec<-100) { - page buttonpage03 + // Navigate back up the sequence based on active status + if(is_buttonpage01==1&&is_buttonpage02==1) + { + page buttonpage02 + }else if(is_buttonpage01==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage01==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage02==1&&is_buttonpage03==1) + { + page buttonpage03 + }else if(is_buttonpage02==1&&is_buttonpage04==1) + { + page buttonpage04 + }else if(is_buttonpage03==1&&is_buttonpage04==1) + { + page buttonpage04 + }else + { + // Do nothing + } } } diff --git a/hmi/dev/nspanel_CJK_us_land_code/light.txt b/hmi/dev/nspanel_CJK_us_land_code/light.txt index 5a1d342..da41027 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/light.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/light.txt @@ -169,6 +169,20 @@ Text unavailable Text : Max. Text Size : 1 +Text power_button + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 3 + + Events + Touch Release Event + power_button.pco=31 + Picture light_button Attributes ID : 8 diff --git a/hmi/dev/nspanel_CJK_us_land_code/utilities2.txt b/hmi/dev/nspanel_CJK_us_land_code/utilities2.txt new file mode 100644 index 0000000..351e7bc --- /dev/null +++ b/hmi/dev/nspanel_CJK_us_land_code/utilities2.txt @@ -0,0 +1,440 @@ +Page utilities2 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + + Events + Preinitialize Event + if(api==0) + { + page home + } + vis unavailable,0 + + Postinitialize Event + sendme + +Text title + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text : Power Dashboard + Max. Text Size : 100 + +Text title_icon + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : on press and release + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text unavailable + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 1 + +Text t1 + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 賈 + Max. Text Size : 4 + +Text t2 + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t3 + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t4 + Attributes + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Green + Max. Text Size : 10 + +Text t5 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Fossil + Max. Text Size : 10 + +Text t7 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 全 + Max. Text Size : 4 + +Text t8 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Solar + Max. Text Size : 10 + +Text t9 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 98% + Max. Text Size : 10 + +Text t10 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 2% + Max. Text Size : 10 + +Text t11 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 豈 + Max. Text Size : 4 + +Text t12 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Battery + Max. Text Size : 10 + +Text t13 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 暑 + Max. Text Size : 4 + +Text t14 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Heating + Max. Text Size : 10 + +Text t15 + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.7 kW + Max. Text Size : 10 + +Text t16 + Attributes + ID : 25 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 21.7°C + Max. Text Size : 10 + +Text t17 + Attributes + ID : 26 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t18 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : -2.1 kW + Max. Text Size : 10 + +Text t19 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 0.8 kW + Max. Text Size : 10 + +Text t20 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 慎 + Max. Text Size : 4 + +Text t21 + Attributes + ID : 30 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Wind + Max. Text Size : 10 + +Text t22 + Attributes + ID : 32 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t23 + Attributes + ID : 33 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t24 + Attributes + ID : 34 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t25 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Text t0 + Attributes + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 4 + +Text t6 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Car + Max. Text Size : 10 + +Text t26 + Attributes + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : 1.1 kW + Max. Text Size : 10 + +Slider h1 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h2 + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h3 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h4 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h5 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h6 + Attributes + ID : 31 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h7 + Attributes + ID : 35 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider h0 + Attributes + ID : 39 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Button button_back + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID: on press and release + State : unpressed + Text :  + Max. Text Size : 3 + + Events + Touch Press Event + page back_page_id + +Timer wakeup_timer + Attributes + ID : 4 + Scope : local + Period (ms): 100 + Enabled : yes + + Events + Timer Event + if(dim