diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8be1b00a..c7e92e89 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,3 +30,21 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── popupThermo.txt +│ @@ -38,15 +38,15 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ popupThermo.bco=defaultBcoColor +│ - for(sys0=0;sys0<43;sys0++) +│ + for(sys0=0;sys0<24;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index e1a4cb3d..533b2dc0 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -52,8 +52,8 @@ screensaver 266 Unique line(s) of event code popupInSel 34 Component(s) - 476 Line(s) of event code - 222 Unique line(s) of event code + 529 Line(s) of event code + 257 Unique line(s) of event code cardQR 32 Component(s) 409 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 563 Component(s) - 6803 Line(s) of event code - 1736 Unique line(s) of event code + 6856 Line(s) of event code + 1772 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupInSel.txt b/HMI/US/landscape/n2t-out-visual/popupInSel.txt index b083c78f..3a9b8c13 100644 --- a/HMI/US/landscape/n2t-out-visual/popupInSel.txt +++ b/HMI/US/landscape/n2t-out-visual/popupInSel.txt @@ -1091,7 +1091,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -1108,6 +1108,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -1118,6 +1127,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -1130,6 +1148,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/popupInSel.txt b/HMI/US/landscape/n2t-out/popupInSel.txt index f52ee9e9..188585fd 100644 --- a/HMI/US/landscape/n2t-out/popupInSel.txt +++ b/HMI/US/landscape/n2t-out/popupInSel.txt @@ -711,7 +711,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -728,6 +728,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -738,6 +747,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -750,6 +768,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e0a36508..14adc5b5 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -677,6 +677,24 @@ │ crcrest 1,0xffff // reset CRC │ crcputh 55 bb │ crcputs sys0,2 +├── popupThermo.txt +│ @@ -38,15 +38,15 @@ +│ crcputs tSend.txt,0 +│ //send cmd +│ printh 55 bb +│ prints sys0,2 +│ prints tSend.txt,0 +│ prints crcval,2 +│ popupThermo.bco=defaultBcoColor +│ - for(sys0=0;sys0<43;sys0++) +│ + for(sys0=0;sys0<24;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) ├── screensaver.txt │ @@ -71,15 +71,15 @@ │ Text tTime diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f8f90d88..a1911970 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-25 17:27:14.174175138 +0000 ++++ /dev/fd/62 2022-10-25 18:20:57.776626176 +0000 +,14 +1329,45 @@ + page popupFan + if(type4.txt=="input_sel") @@ -11,6 +11,24 @@ + if(type5.txt=="button"||type5.txt=="input_sel") + tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt ++pupThermo.txt ++5 +38,15 @@ ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ popupThermo.bco=defaultBcoColor ++ for(sys0=0;sys0<43;sys0++) ++ for(sys0=0;sys0<24;sys0++) ++ { ++ if(b[sys0].type==98||b[sys0].type==116) ++ { ++ b[sys0].bco=defaultBcoColor ++ b[sys0].pco=defaultFontColor ++ } ++ if(b[sys0].type==53&&defaultBcoColor==0) +reensaver.txt +5 +71,15 @@ +ime diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 27050bee..7fc08dbc 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -26,10 +26,6 @@ pageStartup 19 Component(s) 172 Line(s) of event code 125 Unique line(s) of event code -popupInSel - 34 Component(s) - 476 Line(s) of event code - 222 Unique line(s) of event code cardQR 32 Component(s) 409 Line(s) of event code @@ -62,6 +58,10 @@ cardThermo 53 Component(s) 596 Line(s) of event code 313 Unique line(s) of event code +popupInSel + 34 Component(s) + 529 Line(s) of event code + 257 Unique line(s) of event code popupThermo 44 Component(s) 515 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 575 Component(s) - 7030 Line(s) of event code - 1811 Unique line(s) of event code + 7083 Line(s) of event code + 1847 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupInSel.txt b/HMI/US/portrait/n2t-out-visual/popupInSel.txt index 0299ac32..0fb2a9ef 100644 --- a/HMI/US/portrait/n2t-out-visual/popupInSel.txt +++ b/HMI/US/portrait/n2t-out-visual/popupInSel.txt @@ -1091,7 +1091,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -1108,6 +1108,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -1118,6 +1127,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -1130,6 +1148,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/popupInSel.txt b/HMI/US/portrait/n2t-out/popupInSel.txt index f52ee9e9..188585fd 100644 --- a/HMI/US/portrait/n2t-out/popupInSel.txt +++ b/HMI/US/portrait/n2t-out/popupInSel.txt @@ -711,7 +711,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -728,6 +728,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -738,6 +747,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -750,6 +768,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c3e79a4b..8b8f5da0 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,10 +18,6 @@ popupLight 27 Component(s) 391 Line(s) of event code 214 Unique line(s) of event code -popupThermo - 44 Component(s) - 515 Line(s) of event code - 272 Unique line(s) of event code popupNotify 19 Component(s) 253 Line(s) of event code @@ -48,8 +44,8 @@ cardThermo 313 Unique line(s) of event code popupInSel 34 Component(s) - 476 Line(s) of event code - 222 Unique line(s) of event code + 529 Line(s) of event code + 257 Unique line(s) of event code popupFan 27 Component(s) 347 Line(s) of event code @@ -62,6 +58,10 @@ cardAlarm 40 Component(s) 427 Line(s) of event code 258 Unique line(s) of event code +popupThermo + 44 Component(s) + 515 Line(s) of event code + 272 Unique line(s) of event code cardPower 43 Component(s) 423 Line(s) of event code @@ -74,5 +74,5 @@ cardEntities Total 17 Page(s) 569 Component(s) - 6856 Line(s) of event code - 1751 Unique line(s) of event code + 6909 Line(s) of event code + 1787 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupInSel.txt b/HMI/n2t-out-visual/popupInSel.txt index 53d10da0..e0392a68 100644 --- a/HMI/n2t-out-visual/popupInSel.txt +++ b/HMI/n2t-out-visual/popupInSel.txt @@ -1091,7 +1091,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -1108,6 +1108,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -1118,6 +1127,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -1130,6 +1148,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/popupThermo.txt b/HMI/n2t-out-visual/popupThermo.txt index 1a7c1e66..f96f1016 100644 --- a/HMI/n2t-out-visual/popupThermo.txt +++ b/HMI/n2t-out-visual/popupThermo.txt @@ -50,7 +50,7 @@ Page popupThermo prints tSend.txt,0 prints crcval,2 popupThermo.bco=defaultBcoColor - for(sys0=0;sys0<24;sys0++) + for(sys0=0;sys0<43;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { diff --git a/HMI/n2t-out/popupInSel.txt b/HMI/n2t-out/popupInSel.txt index f52ee9e9..188585fd 100644 --- a/HMI/n2t-out/popupInSel.txt +++ b/HMI/n2t-out/popupInSel.txt @@ -711,7 +711,7 @@ Timer tmSerial if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + //spstr strCommand.txt,tIcon1.txt,"~",2 vis tIcon1,1 // change icon color spstr strCommand.txt,tTmp.txt,"~",3 @@ -728,6 +728,15 @@ Timer tmSerial vis bMode1,0 vis bMode2,0 vis bMode3,0 + vis bMode4,0 + vis bMode5,0 + vis bMode6,0 + vis bMode7,0 + vis bMode8,0 + vis bMode9,0 + vis bMode10,0 + vis bMode11,0 + vis bMode12,0 vis bModeNext,0 } if(bMode1.txt=="") @@ -738,6 +747,15 @@ Timer tmSerial bMode1.pco=defaultFontColor bMode2.pco=defaultFontColor bMode3.pco=defaultFontColor + bMode4.pco=defaultFontColor + bMode5.pco=defaultFontColor + bMode6.pco=defaultFontColor + bMode7.pco=defaultFontColor + bMode8.pco=defaultFontColor + bMode9.pco=defaultFontColor + bMode10.pco=defaultFontColor + bMode11.pco=defaultFontColor + bMode12.pco=defaultFontColor if(bMode1.txt==vaModeCur.txt) { bMode1.pco=1374 @@ -750,6 +768,42 @@ Timer tmSerial { bMode3.pco=1374 } + if(bMode4.txt==vaModeCur.txt) + { + bMode4.pco=1374 + } + if(bMode5.txt==vaModeCur.txt) + { + bMode5.pco=1374 + } + if(bMode6.txt==vaModeCur.txt) + { + bMode6.pco=1374 + } + if(bMode7.txt==vaModeCur.txt) + { + bMode7.pco=1374 + } + if(bMode8.txt==vaModeCur.txt) + { + bMode8.pco=1374 + } + if(bMode9.txt==vaModeCur.txt) + { + bMode9.pco=1374 + } + if(bMode10.txt==vaModeCur.txt) + { + bMode10.pco=1374 + } + if(bMode11.txt==vaModeCur.txt) + { + bMode11.pco=1374 + } + if(bMode12.txt==vaModeCur.txt) + { + bMode12.pco=1374 + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/popupThermo.txt b/HMI/n2t-out/popupThermo.txt index 0e750601..99b09b24 100644 --- a/HMI/n2t-out/popupThermo.txt +++ b/HMI/n2t-out/popupThermo.txt @@ -42,7 +42,7 @@ Page popupThermo prints tSend.txt,0 prints crcval,2 popupThermo.bco=defaultBcoColor - for(sys0=0;sys0<24;sys0++) + for(sys0=0;sys0<43;sys0++) { if(b[sys0].type==98||b[sys0].type==116) {