From 0b7fec2f995fe068434b4ea21f1fb33c40ebb1cb Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sun, 20 Mar 2022 13:56:05 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/cardAlarm.txt | 49 +++++--------- HMI/n2t-out/cardEntities.txt | 118 ++++++++++------------------------ HMI/n2t-out/cardGrid.txt | 21 +----- HMI/n2t-out/cardMedia.txt | 23 +------ HMI/n2t-out/cardThermo.txt | 23 +------ HMI/n2t-out/nspanel_Stats.txt | 64 +++++++++--------- HMI/n2t-out/popupLight.txt | 4 +- HMI/n2t-out/popupNotify.txt | 2 +- HMI/n2t-out/popupShutter.txt | 8 +-- HMI/n2t-out/screensaver.txt | 25 ++++++- 10 files changed, 116 insertions(+), 221 deletions(-) diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 6da8c2b0..cc758578 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -27,25 +27,6 @@ Page cardAlarm vis tTmp,0 vis tId,0 //vis nPageDisp,0 - //page open event - // event,pageOpen,cardEntities,pageNumber - // craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,pageOpen,"+tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - //display current page from global var - nPageDisp.val=nPage Variable (string) strCommand Attributes @@ -278,7 +259,7 @@ Button bNext Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -332,7 +313,7 @@ Button bPrev Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -388,7 +369,7 @@ Button b0 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -426,7 +407,7 @@ Button b1 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -464,7 +445,7 @@ Button b2 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -502,7 +483,7 @@ Button b3 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -540,7 +521,7 @@ Button b4 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -578,7 +559,7 @@ Button b5 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -616,7 +597,7 @@ Button b6 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -654,7 +635,7 @@ Button b7 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -692,7 +673,7 @@ Button b8 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -730,7 +711,7 @@ Button b9 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -768,7 +749,7 @@ Button b10 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -806,7 +787,7 @@ Button b11 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -840,7 +821,7 @@ Button b12 Font ID : 0 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 1374 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index c55c06e6..96644574 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -27,7 +27,6 @@ Page cardEntities bauds=115200 //debug stuff vis tTmp,0 - vis nPageDisp,0 vis tSend,0 vis tInstruction,0 vis tId,0 @@ -63,25 +62,6 @@ Page cardEntities vis tIcon4,0 vis tEntity4,0 vis bText4,0 - //page open event - // event,pageOpen,cardEntities,pageNumber - // craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,pageOpen,"+tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - //display current page from global var - nPageDisp.val=nPage Variable (string) strCommand Attributes @@ -92,90 +72,60 @@ Variable (string) strCommand Variable (string) type1 Attributes - ID : 46 + ID : 45 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 47 + ID : 46 Scope : local Text : Max. Text Size: 10 Variable (string) type3 Attributes - ID : 48 + ID : 47 Scope : local Text : Max. Text Size: 10 Variable (string) type4 Attributes - ID : 49 + ID : 48 Scope : local Text : Max. Text Size: 10 Variable (string) entn1 Attributes - ID : 50 + ID : 49 Scope : local Text : Max. Text Size: 50 Variable (string) entn2 Attributes - ID : 51 + ID : 50 Scope : local Text : Max. Text Size: 50 Variable (string) entn3 Attributes - ID : 52 + ID : 51 Scope : local Text : Max. Text Size: 50 Variable (string) entn4 Attributes - ID : 53 + ID : 52 Scope : local Text : Max. Text Size: 50 -Number nPageDisp - Attributes - ID : 35 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 409 - y coordinate : 0 - Width : 42 - Height : 24 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Value : 0 - Significant digits shown : all - Format : decimal - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tHeading Attributes ID : 2 @@ -603,7 +553,7 @@ Button bDown1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -657,7 +607,7 @@ Button bUp1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -711,7 +661,7 @@ Button bStop1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -765,7 +715,7 @@ Button bStop2 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -819,7 +769,7 @@ Button bDown2 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -873,7 +823,7 @@ Button bUp2 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -927,7 +877,7 @@ Button bStop3 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -981,7 +931,7 @@ Button bDown3 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1035,7 +985,7 @@ Button bUp3 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1089,7 +1039,7 @@ Button bStop4 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1143,7 +1093,7 @@ Button bDown4 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1197,7 +1147,7 @@ Button bUp4 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1251,7 +1201,7 @@ Button bPrev Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1266,7 +1216,6 @@ Button bPrev Events Touch Press Event nPage=nPage-1 - nPageDisp.val=nPage //page open event // event,pageOpen,cardEntities,pageNumber // craft command @@ -1305,7 +1254,7 @@ Button bNext Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -1320,7 +1269,6 @@ Button bNext Events Touch Press Event nPage=nPage+1 - nPageDisp.val=nPage //page open event // event,pageOpen,cardEntities,pageNumber // craft command @@ -1341,7 +1289,7 @@ Button bNext Button bText1 Attributes - ID : 38 + ID : 37 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1395,7 +1343,7 @@ Button bText1 Button bText2 Attributes - ID : 39 + ID : 38 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1449,7 +1397,7 @@ Button bText2 Button bText3 Attributes - ID : 40 + ID : 39 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1503,7 +1451,7 @@ Button bText3 Button bText4 Attributes - ID : 41 + ID : 40 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1765,7 +1713,7 @@ Dual-state Button btOnOff4 Hotspot mSpecial Attributes - ID : 36 + ID : 35 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1791,7 +1739,7 @@ Hotspot mSpecial Hotspot m2 Attributes - ID : 42 + ID : 41 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1822,7 +1770,7 @@ Hotspot m2 Hotspot m1 Attributes - ID : 43 + ID : 42 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1853,7 +1801,7 @@ Hotspot m1 Hotspot m0 Attributes - ID : 44 + ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -1884,7 +1832,7 @@ Hotspot m0 Hotspot m3 Attributes - ID : 45 + ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -2398,7 +2346,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 37 + ID : 36 Scope : local Period (ms): 1000 Enabled : yes @@ -2418,7 +2366,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 54 + ID : 53 Scope: local Value: 0 diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index ec81517c..e4928c4f 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -42,23 +42,6 @@ Page cardGrid vis tEntity4,0 vis tEntity5,0 vis tEntity6,0 - //page open event - // event,pageOpen,cardEntities,pageNumber - // craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,pageOpen,"+tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 Variable (string) strCommand Attributes @@ -518,7 +501,7 @@ Button bPrev Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -571,7 +554,7 @@ Button bNext Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 0c4007ad..d59e1b12 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -27,25 +27,6 @@ Page cardMedia vis tTmp,0 vis tId,0 //vis nPageDisp,0 - //page open event - // event,pageOpen,cardEntities,pageNumber - // craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,pageOpen,"+tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - //display current page from global var - nPageDisp.val=nPage Variable (string) strCommand Attributes @@ -573,7 +554,7 @@ Button bNext Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -627,7 +608,7 @@ Button bPrev Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 7b7674bc..7ab87680 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -40,25 +40,6 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 - //page open event - // event,pageOpen,cardThermo,pageNumber - // craft command - // convert pageNumber and write to tTmp - covx nPage,tTmp.txt,0,0 - tSend.txt="event,pageOpen,"+tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - //display current page from global var - nPageDisp.val=nPage Variable (string) strCommand Attributes @@ -564,7 +545,7 @@ Button bNext Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -728,7 +709,7 @@ Button bPrev Font ID : 2 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 1218aa7a..e690ea5b 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -10,14 +10,14 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -screensaver - 25 Component(s) - 160 Line(s) of event code - 122 Unique line(s) of event code -popupShutter - 19 Component(s) - 148 Line(s) of event code - 84 Unique line(s) of event code +cardGrid + 39 Component(s) + 406 Line(s) of event code + 224 Unique line(s) of event code +popupNotify + 16 Component(s) + 152 Line(s) of event code + 100 Unique line(s) of event code pageStartup 19 Component(s) 145 Line(s) of event code @@ -26,41 +26,41 @@ pageSwipeTest 18 Component(s) 62 Line(s) of event code 44 Unique line(s) of event code -popupNotify - 16 Component(s) - 152 Line(s) of event code - 100 Unique line(s) of event code +popupShutter + 19 Component(s) + 148 Line(s) of event code + 84 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardAlarm - 28 Component(s) - 159 Line(s) of event code - 106 Unique line(s) of event code -cardMedia - 22 Component(s) - 222 Line(s) of event code - 116 Unique line(s) of event code popupLight 27 Component(s) 297 Line(s) of event code 154 Unique line(s) of event code -cardEntities - 55 Component(s) - 823 Line(s) of event code - 322 Unique line(s) of event code +screensaver + 25 Component(s) + 173 Line(s) of event code + 124 Unique line(s) of event code +cardMedia + 22 Component(s) + 210 Line(s) of event code + 116 Unique line(s) of event code cardThermo 42 Component(s) - 450 Line(s) of event code + 438 Line(s) of event code 221 Unique line(s) of event code -cardGrid - 39 Component(s) - 417 Line(s) of event code - 224 Unique line(s) of event code +cardAlarm + 28 Component(s) + 147 Line(s) of event code + 106 Unique line(s) of event code +cardEntities + 54 Component(s) + 808 Line(s) of event code + 320 Unique line(s) of event code Total 14 Page(s) - 343 Component(s) - 3114 Line(s) of event code - 769 Unique line(s) of event code + 342 Component(s) + 3065 Line(s) of event code + 768 Unique line(s) of event code diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 4868efe8..1bba5a34 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -639,7 +639,7 @@ Button b0 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 6371 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -675,7 +675,7 @@ Button bColor Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 6371 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 7fa9f2c2..146f522c 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -272,7 +272,7 @@ Button b0 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 6371 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index bab60615..8cbae7a5 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -353,7 +353,7 @@ Button b0 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 6371 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -389,7 +389,7 @@ Button bDown1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -443,7 +443,7 @@ Button bStop1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center @@ -497,7 +497,7 @@ Button bUp1 Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 1024 + Back. Color (Pressed) : 14823 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 Horizontal Alignment : center diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index fa5a09b3..ffb9f932 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -774,6 +774,10 @@ Timer tmSerial { page cardGrid } + if(tId.txt=="cardEntities") + { + page cardEntities + } if(tId.txt=="cardAlarm") { page cardAlarm @@ -799,6 +803,23 @@ TouchCap tc0 Events Touch Press Event - dim=100 - page originPage.val + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //dim=100 + //page originPage.val