diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e8b4c0f4..00fa1ae0 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -185,23 +185,6 @@ │ if(tInstruction.txt=="date") │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt -│ @@ -141,15 +141,15 @@ -│ -│ Text tVersion -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Send Component ID : disabled -│ Associated Keyboard: none -│ - Text : 52 -│ + Text : 51 -│ Max. Text Size : 10 -│ -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Send Component ID: disabled │ @@ -164,15 +164,15 @@ │ Max. Text Size : 10 │ @@ -240,6 +223,25 @@ │ spstr strCommand.txt,tTmp.txt,"~",1 │ covx tTmp.txt,sleepTimeout,0,0 │ } +│ --- HMI/n2t-out/popupLight.txt +├── +++ HMI/US/landscape/n2t-out/popupLight.txt +│ @@ -631,15 +631,15 @@ +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ } +│ if(tId.txt=="cardGrid2") +│ { +│ - page cardGrid2 +│ + page cardGrid +│ } +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ } +│ if(tId.txt=="popupShutter") │ --- HMI/n2t-out/popupNotify.txt ├── +++ HMI/US/landscape/n2t-out/popupNotify.txt │ @@ -295,19 +295,14 @@ @@ -317,6 +319,36 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : | +│ @@ -702,29 +679,14 @@ +│ } +│ spstr strCommand.txt,tTmp.txt,"~",4 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tNotifyText.pco,0,0 +│ } +│ } +│ - if(tInstruction.txt=="getBrightness") +│ - { +│ - tSend.txt="event,getBrightnessResponse," +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs dim,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 +│ - } +│ if(tInstruction.txt=="pageType") +│ { +│ dim=100 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt │ @@ -28,17 +28,14 @@ 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 684d5cb7..ce3c24e4 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 @@ -18,6 +18,10 @@ popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code +pageStartup + 20 Component(s) + 193 Line(s) of event code + 135 Unique line(s) of event code cardChart 33 Component(s) 437 Line(s) of event code @@ -26,10 +30,6 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code -pageStartup - 20 Component(s) - 193 Line(s) of event code - 135 Unique line(s) of event code pageTest 26 Component(s) 68 Line(s) of event code @@ -62,10 +62,6 @@ cardGrid2 52 Component(s) 611 Line(s) of event code 335 Unique line(s) of event code -popupLight - 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code cardLChart 33 Component(s) 402 Line(s) of event code @@ -94,9 +90,13 @@ cardEntities 67 Component(s) 1170 Line(s) of event code 532 Unique line(s) of event code +popupLight + 28 Component(s) + 412 Line(s) of event code + 226 Unique line(s) of event code Total 23 Page(s) 875 Component(s) - 10331 Line(s) of event code + 10335 Line(s) of event code 2403 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 12ff1c9d..00a1902e 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -396,7 +396,7 @@ Text tVersion Horizontal Alignment: center Vertical Alignment : center Input Type : character - Text : 51 + Text : 52 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 1b118850..0c516441 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -982,6 +982,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 1c5e248c..dd49b712 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -145,7 +145,7 @@ Text tVersion Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 51 + Text : 52 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index dd5eefd3..cfd46ad5 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -633,6 +633,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 57645483..b36338f9 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1688,23 +1688,6 @@ │ Scope : local │ Dragging : 0 │ Send Component ID : disabled -│ @@ -141,15 +135,15 @@ -│ -│ Text tVersion -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Send Component ID : disabled -│ Associated Keyboard: none -│ - Text : 52 -│ + Text : 51 -│ Max. Text Size : 10 -│ -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Send Component ID: disabled │ @@ -164,15 +158,15 @@ │ Max. Text Size : 10 │ @@ -1779,6 +1762,23 @@ │ Variable (string) entn │ Attributes │ Scope : local +│ @@ -631,15 +631,15 @@ +│ } +│ if(tId.txt=="cardGrid") +│ { +│ page cardGrid +│ } +│ if(tId.txt=="cardGrid2") +│ { +│ - page cardGrid2 +│ + page cardGrid +│ } +│ if(tId.txt=="popupLight") +│ { +│ pageIcons.tTmp1.txt=tTmp.txt +│ page popupLight +│ } +│ if(tId.txt=="popupShutter") │ --- HMI/n2t-out/popupNotify.txt ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt │ @@ -295,19 +295,14 @@ @@ -1877,6 +1877,36 @@ │ spstr strCommand.txt,tTmp.txt,"~",1 │ covx tTmp.txt,tTime.bco,0,0 │ if(tTime.bco!=screensaver.bco) +│ @@ -702,29 +673,14 @@ +│ } +│ spstr strCommand.txt,tTmp.txt,"~",4 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,tNotifyText.pco,0,0 +│ } +│ } +│ - if(tInstruction.txt=="getBrightness") +│ - { +│ - tSend.txt="event,getBrightnessResponse," +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs dim,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 +│ - } +│ if(tInstruction.txt=="pageType") +│ { +│ dim=100 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 +│ //save second arg if there's one │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt │ @@ -28,17 +28,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f873a4fc..8a850c2a 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-08-08 20:49:02.082432386 +0000 ++++ /dev/fd/62 2023-08-20 12:32:07.109670758 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -1245,23 +1245,6 @@ + Scope : local + Dragging : 0 + Send Component ID : disabled -+15 +135,15 @@ -+ -+ersion -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID : disabled -+ Associated Keyboard: none -+ Text : 52 -+ Text : 51 -+ Max. Text Size : 10 -+ -+ p0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled +15 +158,15 @@ + Max. Text Size : 10 +20 +269,14 @@ @@ -1321,6 +1304,23 @@ +e (string) entn +ributes + Scope : local ++15 +631,15 @@ ++ } ++ if(tId.txt=="cardGrid") ++ { ++ page cardGrid ++ } ++ if(tId.txt=="cardGrid2") ++ { ++ page cardGrid2 ++ page cardGrid ++ } ++ if(tId.txt=="popupLight") ++ { ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight ++ } ++ if(tId.txt=="popupShutter") +I/n2t-out/popupNotify.txt ++ HMI/US/portrait/n2t-out/popupNotify.txt +19 +295,14 @@ @@ -1419,6 +1419,36 @@ + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + if(tTime.bco!=screensaver.bco) ++29 +673,14 @@ ++ } ++ spstr strCommand.txt,tTmp.txt,"~",4 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tNotifyText.pco,0,0 ++ } ++ } ++ if(tInstruction.txt=="getBrightness") ++ { ++ tSend.txt="event,getBrightnessResponse," ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs dim,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ dim=100 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 ++ //save second arg if there's one +I/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt +7 +28,14 @@ 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 0e879e2c..c972eab3 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 @@ -22,10 +22,10 @@ popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code -popupLight - 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code +pageStartup + 19 Component(s) + 193 Line(s) of event code + 135 Unique line(s) of event code popupFan 27 Component(s) 355 Line(s) of event code @@ -34,10 +34,6 @@ popupLightNew 23 Component(s) 412 Line(s) of event code 209 Unique line(s) of event code -pageStartup - 19 Component(s) - 193 Line(s) of event code - 135 Unique line(s) of event code cardChart 33 Component(s) 437 Line(s) of event code @@ -50,6 +46,10 @@ cardLChart 33 Component(s) 402 Line(s) of event code 266 Unique line(s) of event code +popupLight + 28 Component(s) + 412 Line(s) of event code + 226 Unique line(s) of event code popupShutter 25 Component(s) 402 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 890 Component(s) - 10819 Line(s) of event code + 10823 Line(s) of event code 2527 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index d5f0eac7..49bff599 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -389,7 +389,7 @@ Text tVersion Horizontal Alignment: center Vertical Alignment : center Input Type : character - Text : 51 + Text : 52 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 00dbc185..436017c8 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -982,6 +982,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 15eebedf..3ebca809 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -139,7 +139,7 @@ Text tVersion Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 51 + Text : 52 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 2a094065..938b6c8d 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -633,6 +633,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 13993665..8162306e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ popupLightNew 23 Component(s) 412 Line(s) of event code 209 Unique line(s) of event code -popupLight - 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code popupNotify 19 Component(s) 271 Line(s) of event code @@ -58,10 +54,10 @@ cardAlarm 43 Component(s) 500 Line(s) of event code 273 Unique line(s) of event code -screensaver - 47 Component(s) - 444 Line(s) of event code - 316 Unique line(s) of event code +popupLight + 28 Component(s) + 412 Line(s) of event code + 227 Unique line(s) of event code cardThermo 57 Component(s) 540 Line(s) of event code @@ -78,6 +74,10 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code +screensaver + 47 Component(s) + 457 Line(s) of event code + 327 Unique line(s) of event code cardPower 54 Component(s) 531 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 878 Component(s) - 10404 Line(s) of event code - 2418 Unique line(s) of event code + 10421 Line(s) of event code + 2421 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 1b118850..47df5328 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -982,6 +982,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index eb8a1b86..8f3685ee 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1299,6 +1299,21 @@ Timer tmSerial covx tTmp.txt,tNotifyText.pco,0,0 } } + if(tInstruction.txt=="getBrightness") + { + tSend.txt="event,getBrightnessResponse," + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs dim,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + } if(tInstruction.txt=="pageType") { dim=100 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index dd5eefd3..21b19052 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -633,6 +633,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 30e471fc..16bc1e34 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -706,6 +706,21 @@ Timer tmSerial covx tTmp.txt,tNotifyText.pco,0,0 } } + if(tInstruction.txt=="getBrightness") + { + tSend.txt="event,getBrightnessResponse," + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs dim,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + } if(tInstruction.txt=="pageType") { dim=100