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

This commit is contained in:
joBr99
2022-04-21 23:04:26 +00:00
committed by github-actions[bot]
parent e03f4875fe
commit 69acd46e69
12 changed files with 253 additions and 79 deletions

View File

@@ -1,6 +1,6 @@
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/US/portrait/n2t-out/Program.s.txt 2022-04-20 06:06:40.491761816 +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-21 23:04:24.850496133 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
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/US/portrait/n2t-out/cardAlarm.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-21 23:04:24.850496133 +0000
@@ -44,7 +44,7 @@
Attributes
Scope : local
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend
Attributes
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/US/portrait/n2t-out/cardEntities.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-21 23:04:24.854496174 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -162,6 +162,24 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
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 @@
prints tSend.txt,0
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")
{
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/US/portrait/n2t-out/cardGrid.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/cardGrid.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-21 23:04:24.850496133 +0000
@@ -69,25 +69,25 @@
Attributes
Scope : local
@@ -510,9 +528,27 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
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
--- HMI/n2t-out/cardMedia.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/cardMedia.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-21 23:04:24.850496133 +0000
@@ -24,19 +24,19 @@
Attributes
Scope : local
@@ -537,8 +573,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (int32) vaSpeakerPos
Attributes
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/US/portrait/n2t-out/cardThermo.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/cardThermo.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-21 23:04:24.850496133 +0000
@@ -42,7 +42,7 @@
Attributes
Scope : local
@@ -549,8 +585,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0
Attributes
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/US/portrait/n2t-out/pageIcons.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/pageIcons.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-21 23:04:24.850496133 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -570,8 +606,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0
Attributes
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/US/portrait/n2t-out/pageStartup.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-21 23:04:24.850496133 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
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
crcrest 1,0xffff // reset CRC
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/US/portrait/n2t-out/popupLight.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-21 23:04:24.850496133 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -604,9 +640,18 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
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
--- HMI/n2t-out/popupShutter.txt 2022-04-20 06:06:40.151757588 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/popupShutter.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-21 23:04:24.850496133 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -619,8 +664,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
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/US/portrait/n2t-out/screensaver.txt 2022-04-20 06:06:40.491761816 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-21 23:04:24.398478719 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-21 23:04:24.850496133 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
@@ -695,3 +740,12 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
dim=dimValueNormal
vaTap.val+=1
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