Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
joBr99
2023-11-24 21:00:41 +01:00
10 changed files with 370 additions and 38 deletions

View File

@@ -84,6 +84,36 @@
│ vis tTmp,0
│ vis tId,0
│ vis bPrev,0
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ dim=dimValueNormal
│ //wup=cardEntities
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -7,26 +7,14 @@
@@ -308,7 +338,35 @@
│ //send cmd
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -326,7 +384,7 @@
│ Max. Text Size: 600
│ Variable (string) strTmp
│ @@ -102,34 +99,14 @@
│ @@ -115,34 +99,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -361,7 +419,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : |
│ @@ -472,17 +449,14 @@
│ @@ -485,17 +449,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -381,7 +439,35 @@
│ {
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -399,7 +485,7 @@
│ Max. Text Size: 1979
│ Variable (string) strTmp
│ @@ -363,34 +360,14 @@
│ @@ -376,34 +360,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -434,7 +520,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : PM
│ @@ -572,15 +549,14 @@
│ @@ -585,15 +549,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0

View File

@@ -88,7 +88,35 @@
│ vis bPrev,0
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -60,16 +60,36 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ dim=dimValueNormal
│ //wup=cardEntities
│ //remove background & activate reparse mode
│ vis p0,0
│ recmod=1
│ baud=115200
│ //debug stuff
│ @@ -73,16 +60,36 @@
│ vis tIcon4,0
│ vis tEntity4,0
│ vis bText4,0
@@ -126,7 +154,7 @@
│ b[sys0].pco=defaultFontColor
│ }
│ if(b[sys0].type==53&&defaultBcoColor==0)
│ @@ -85,45 +105,57 @@
│ @@ -98,45 +105,57 @@
│ }
│ }
@@ -190,7 +218,7 @@
│ Text :
│ Max. Text Size: 500
│ @@ -153,14 +185,26 @@
│ @@ -166,14 +185,26 @@
│ Variable (string) type4
│ Attributes
@@ -217,7 +245,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Value : 0
│ @@ -185,14 +229,30 @@
│ @@ -198,14 +229,30 @@
│ Attributes
│ Scope : local
│ Dragging : 0
@@ -248,7 +276,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : tEntity1
│ @@ -221,14 +281,32 @@
│ @@ -234,14 +281,32 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -281,7 +309,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -266,14 +344,32 @@
│ @@ -279,14 +344,32 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -314,7 +342,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ @@ -407,14 +503,68 @@
│ @@ -420,14 +503,68 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -383,7 +411,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -503,14 +653,62 @@
│ @@ -516,14 +653,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -446,7 +474,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -647,14 +845,62 @@
│ @@ -660,14 +845,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -509,7 +537,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text :
│ @@ -743,14 +989,62 @@
│ @@ -756,14 +989,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -572,7 +600,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ @@ -839,14 +1133,62 @@
│ @@ -852,14 +1133,62 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -635,7 +663,7 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text :
│ @@ -943,14 +1285,66 @@
│ @@ -956,14 +1285,66 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
@@ -702,7 +730,7 @@
│ Send Component ID: disabled
│ Events
│ @@ -1099,14 +1493,92 @@
│ @@ -1112,14 +1493,92 @@
│ page popupInSel
│ }
│ if(type4.txt=="timer")
@@ -795,7 +823,7 @@
│ Send Component ID: disabled
│ Events
│ @@ -1830,14 +2302,312 @@
│ @@ -1843,14 +2302,312 @@
│ covx tTmp.txt,sys0,0,0
│ hSlider4.minval=sys0
│ //third value is max value
@@ -1990,7 +2018,35 @@
│ {
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -2008,7 +2064,7 @@
│ Max. Text Size: 600
│ Variable (string) strTmp
│ @@ -102,34 +99,14 @@
│ @@ -115,34 +99,14 @@
│ Value: 0
│ Variable (int32) ycR
@@ -2043,7 +2099,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : |
│ @@ -472,17 +449,14 @@
│ @@ -485,17 +449,14 @@
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -2061,7 +2117,7 @@
│ }
│ if(tInstruction.txt=="date")
│ {
│ @@ -599,20 +573,14 @@
│ @@ -612,20 +573,14 @@
│ {
│ vis tMainIcon,1
│ vis tMainIconAlt,0
@@ -2084,7 +2140,35 @@
│ if(tTime.bco!=screensaver.bco)
│ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@
│ @@ -7,27 +7,14 @@
│ Swide up page ID : disabled
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID: disabled
│ Events
│ Preinitialize Event
│ - tSend.txt="event,renderCurrentPage"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs tSend.txt,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - dim=dimValueNormal
│ recmod=1
│ baud=115200
│ vis tInstruction,0
│ vis tTmp,0
│ vis p0,0
│ vis tNotifyHead,0
│ vis tNotifyText,0
│ @@ -41,17 +28,14 @@
│ }
│ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue
@@ -2102,7 +2186,7 @@
│ Max. Text Size: 1979
│ Variable (string) strTmp
│ @@ -363,34 +360,14 @@
│ @@ -376,34 +360,14 @@
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
@@ -2137,7 +2221,7 @@
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : PM
│ @@ -572,15 +549,14 @@
│ @@ -585,15 +549,14 @@
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,defaultFontColor,0,0

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-11-24 17:58:09.082084526 +0000
+++ /dev/fd/62 2023-11-24 18:12:20.682875887 +0000
+le list
+ +1,9 @@
+.s.txt
@@ -77,6 +77,34 @@
+ vis bPrev,0
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ dim=dimValueNormal
+ //wup=cardEntities
+ //remove background & activate reparse mode
+ vis p0,0
+ recmod=1
+ baud=115200
+ //debug stuff
+6 +60,36 @@
+ //ui e6
+ vis btOnOff6,0
@@ -129,13 +157,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 38
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 38
+14 +185,26 @@
+e (string) type6
@@ -1532,6 +1560,34 @@
+ {
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ recmod=1
+ baud=115200
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+ vis tNotifyHead,0
+ vis tNotifyText,0
+7 +28,14 @@
+ }
+ tDate.txt=pageIcons.vaDate.txt
@@ -1626,6 +1682,34 @@
+ if(tTime.bco!=screensaver.bco)
+I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt
+ +7,14 @@
+ Swide up page ID : disabled
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID: disabled
+
+nts
+ Preinitialize Event
+ tSend.txt="event,renderCurrentPage"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ dim=dimValueNormal
+ recmod=1
+ baud=115200
+ vis tInstruction,0
+ vis tTmp,0
+ vis p0,0
+ vis tNotifyHead,0
+ vis tNotifyText,0
+7 +28,14 @@
+ }
+ tDate.txt=pageIcons.vaDate.txt