h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-24 00:14:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix some of the messages send by the panel #160 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-21 23:04:26 +00:00
committed by github-actions[bot]
parent 2a556eeb96
commit 2710d375f6
12 changed files with 253 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-20 06:06:40.971767785 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-21 23:04:25.342501224 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,9 +8,51 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-21 23:04:25.346501266 +0000
@@ -726,7 +726,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -751,7 +751,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-21 23:04:25.342501224 +0000
@@ -254,7 +254,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -279,7 +279,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-20 06:06:40.971767785 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-21 23:04:25.346501266 +0000
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -30,8 +72,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-20 06:06:40.971767785 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-21 23:04:25.346501266 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -41,3 +83,27 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-21 23:04:25.342501224 +0000
@@ -298,7 +298,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-21 23:04:25.346501266 +0000
@@ -664,7 +664,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

98
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-21 23:04:24.850496133 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.850496133 +0000
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend Variable (string) tSend
Attributes Attributes
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-21 23:04:24.854496174 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -162,6 +162,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1 Button bDown1
Attributes Attributes
Scope : local Scope : local
@@ -726,7 +805,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -751,7 +830,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -859,6 +938,106 @@ @@ -859,6 +938,106 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -462,8 +480,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-21 23:04:24.850496133 +0000
@@ -69,25 +69,25 @@ @@ -69,25 +69,25 @@
Attributes Attributes
Scope : local Scope : local
@@ -510,9 +528,27 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading Text tHeading
Attributes Attributes
@@ -254,7 +254,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -279,7 +279,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-21 23:04:24.850496133 +0000
@@ -24,19 +24,19 @@ @@ -24,19 +24,19 @@
Attributes Attributes
Scope : local Scope : local
@@ -537,8 +573,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (int32) vaSpeakerPos Variable (int32) vaSpeakerPos
Attributes Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/cardThermo.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-21 23:04:24.850496133 +0000
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -549,8 +585,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0 Variable (string) va0
Attributes Attributes
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/pageIcons.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-21 23:04:24.850496133 +0000
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -570,8 +606,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0 Picture p0
Attributes Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-21 23:04:24.850496133 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -591,8 +627,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-21 23:04:24.850496133 +0000
@@ -59,8 +59,8 @@ @@ -59,8 +59,8 @@
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -604,9 +640,18 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode Variable (int32) mode
Attributes Attributes
@@ -298,7 +298,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/popupShutter.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-21 23:04:24.850496133 +0000
@@ -46,8 +46,8 @@ @@ -46,8 +46,8 @@
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -619,8 +664,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity Text tEntity
Attributes Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-20 06:06:40.151757588 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-20 06:06:40.491761816 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-21 23:04:24.850496133 +0000
@@ -17,8 +17,6 @@ @@ -17,8 +17,6 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,0 vis tTmp,0
@@ -695,3 +740,12 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
dim=dimValueNormal dim=dimValueNormal
vaTap.val+=1 vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
@@ -664,7 +618,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

104
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-20 06:06:40.619763407 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-04-21 23:04:24.866496298 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-21 23:04:24.850496133 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -13,14 +13,16 @@
+ +
+ Variable (string) tSend + Variable (string) tSend
+ Attributes + Attributes
+--- HMI/n2t-out/cardEntities.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-21 23:04:24.854496174 +0000
+@@ -62,6 +62,16 @@ +@@ -62,6 +62,16 @@
+@@ -97,25 +107,37 @@ +@@ -97,25 +107,37 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Text :
+- Max. Text Size: 80 +- Max. Text Size: 80
++ Max. Text Size: 70 ++ Max. Text Size: 70
+
+ Variable (string) entn2 + Variable (string) entn2
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -31,10 +33,8 @@
+ Variable (string) entn3 + Variable (string) entn3
+ Attributes + Attributes
+ Scope : local + Scope : local
+ Text :
+- Max. Text Size: 80 +- Max. Text Size: 80
++ Max. Text Size: 70 ++ Max. Text Size: 70
+
+ Variable (string) entn4 + Variable (string) entn4
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -46,6 +46,24 @@
+@@ -153,6 +175,15 @@ +@@ -153,6 +175,15 @@
+@@ -283,6 +314,26 @@ +@@ -283,6 +314,26 @@
+@@ -402,6 +453,34 @@ +@@ -402,6 +453,34 @@
+@@ -726,7 +805,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -751,7 +830,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -859,6 +938,106 @@ +@@ -859,6 +938,106 @@
+@@ -967,6 +1146,33 @@ +@@ -967,6 +1146,33 @@
+@@ -1072,6 +1278,28 @@ +@@ -1072,6 +1278,28 @@
@@ -54,8 +72,8 @@
+ if(tInstruction.txt=="pageType") + if(tInstruction.txt=="pageType")
+ { + {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -69,25 +69,25 @@ +@@ -69,25 +69,25 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -102,9 +120,27 @@
+ +
+ Text tHeading + Text tHeading
+ Attributes + Attributes
+@@ -254,7 +254,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -279,7 +279,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -24,19 +24,19 @@ +@@ -24,19 +24,19 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -129,8 +165,8 @@
+ Variable (int32) vaSpeakerPos + Variable (int32) vaSpeakerPos
+ Attributes + Attributes
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -141,8 +177,8 @@
+ Variable (string) va0 + Variable (string) va0
+ Attributes + Attributes
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -30,7 +30,7 @@ +@@ -30,7 +30,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
@@ -161,11 +197,11 @@
+ +
+ Picture p0 + Picture p0
+ Attributes + Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-21 23:04:24.850496133 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -59,8 +59,8 @@ +@@ -59,8 +59,8 @@
+ Variable (string) entn + Variable (string) entn
+ Attributes + Attributes
@@ -177,9 +213,18 @@
+ +
+ Variable (int32) mode + Variable (int32) mode
+ Attributes + Attributes
+@@ -298,7 +298,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -46,8 +46,8 @@ +@@ -46,8 +46,8 @@
+ Variable (string) entn + Variable (string) entn
+ Attributes + Attributes
@@ -192,8 +237,8 @@
+ Text tEntity + Text tEntity
+ Attributes + Attributes
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-20 06:06:40.151757588 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-20 06:06:40.491761816 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-21 23:04:24.850496133 +0000
+@@ -17,8 +17,6 @@ +@@ -17,8 +17,6 @@
+ vis tInstruction,0 + vis tInstruction,0
+ vis tTmp,0 + vis tTmp,0
@@ -268,3 +313,12 @@
+ dim=dimValueNormal + dim=dimValueNormal
+ vaTap.val+=1 + vaTap.val+=1
+ covx vaTap.val,tTmp.txt,0,0 + covx vaTap.val,tTmp.txt,0,0
+@@ -664,7 +618,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb

4
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -1443,7 +1443,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -1490,7 +1490,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

4
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -527,7 +527,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -574,7 +574,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

28
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -10,14 +10,18 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
cardEntities popupLight
62 Component(s) 27 Component(s)
964 Line(s) of event code 338 Line(s) of event code
410 Unique line(s) of event code 183 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 418 Line(s) of event code
244 Unique line(s) of event code 245 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
191 Line(s) of event code 191 Line(s) of event code
@@ -30,18 +34,10 @@ pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
cardAlarm cardAlarm
35 Component(s) 35 Component(s)
343 Line(s) of event code 343 Line(s) of event code
214 Unique line(s) of event code 214 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
442 Line(s) of event code 442 Line(s) of event code
@@ -50,9 +46,13 @@ cardMedia
30 Component(s) 30 Component(s)
329 Line(s) of event code 329 Line(s) of event code
169 Unique line(s) of event code 169 Unique line(s) of event code
cardEntities
62 Component(s)
964 Line(s) of event code
411 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
343 Component(s) 343 Component(s)
3687 Line(s) of event code 3687 Line(s) of event code
1018 Unique line(s) of event code 1019 Unique line(s) of event code

2
HMI/n2t-out-visual/popupLight.txt
View File

@@ -602,7 +602,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

2
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1190,7 +1190,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

4
HMI/n2t-out/cardEntities.txt
View File

@@ -726,7 +726,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -751,7 +751,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

4
HMI/n2t-out/cardGrid.txt
View File

@@ -254,7 +254,7 @@ Button bPrev
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
@@ -279,7 +279,7 @@ Button bNext
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

2
HMI/n2t-out/popupLight.txt
View File

@@ -298,7 +298,7 @@ Button b0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb

2
HMI/n2t-out/screensaver.txt
View File

@@ -664,7 +664,7 @@ TouchCap tc0
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb
crcputs sys0,1 crcputs sys0,2
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb