fix some of the crc erros in us-p version (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 13:54:07 +00:00
committed by github-actions[bot]
parent e562a81677
commit ce87a17972
6 changed files with 165 additions and 593 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-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 13:54:06.240712836 +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-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 13:54:06.240712836 +0000
@@ -33,8 +33,6 @@
vis b9,0
vis b10,0
@@ -95,8 +95,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 13:54:06.240712836 +0000
@@ -62,8 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -201,46 +201,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -312,7 +361,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
@@ -340,7 +389,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
@@ -368,7 +417,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
@@ -396,7 +445,35 @@
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
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -404,6 +453,34 @@
prints tSend.txt,0
prints crcval,2
+Slider hSlider5
+ Attributes
+ Scope : local
@@ -261,118 +225,17 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -421,7 +498,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
@@ -446,7 +523,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
@@ -471,7 +548,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
@@ -496,7 +573,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
@@ -521,7 +598,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
@@ -546,7 +623,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
@@ -571,7 +648,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
@@ -596,7 +673,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
@@ -621,7 +698,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
@@ -646,7 +723,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
@@ -671,7 +748,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
@@ -696,7 +773,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
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
Button bDown1
Attributes
Scope : local
@@ -728,7 +805,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -391,46 +254,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -778,7 +855,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
@@ -803,7 +880,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
@@ -828,7 +905,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
@@ -853,7 +930,107 @@
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
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -861,6 +938,106 @@
prints tSend.txt,0
prints crcval,2
+Button bStop5
+ Attributes
+ Scope : local
@@ -448,7 +275,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
@@ -473,7 +300,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
@@ -498,7 +325,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
@@ -523,42 +350,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -880,7 +1057,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
@@ -907,7 +1084,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
@@ -934,7 +1111,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
@@ -961,7 +1138,34 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
@@ -567,6 +358,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ prints tSend.txt,0
+ prints crcval,2
+
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -969,6 +1146,33 @@
prints tSend.txt,0
prints crcval,2
+Dual-state Button btOnOff5
+ Attributes
+ Scope : local
@@ -586,10 +384,17 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+
Hotspot mSpecial
Attributes
Scope : local
@@ -1074,6 +1278,28 @@
page popupLight
}
@@ -748,18 +553,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
@@ -1754,7 +2102,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/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 13:54:06.240712836 +0000
@@ -34,8 +34,6 @@
vis tEntity4,0
vis tEntity5,0
@@ -897,8 +693,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
//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-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 13:54:06.240712836 +0000
@@ -18,26 +18,25 @@
vis tTmp,0
vis tId,0
@@ -1030,8 +826,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 13:54:06.240712836 +0000
@@ -31,8 +31,6 @@
vis bt6,0
vis bt7,0
@@ -1177,8 +973,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 13:54:06.240712836 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -1198,8 +994,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-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 13:54:06.240712836 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1225,8 +1021,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 13:54:06.240712836 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1293,8 +1089,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 13:54:06.240712836 +0000
@@ -120,7 +120,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1323,8 +1119,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
//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-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 13:54:06.240712836 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1391,8 +1187,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-06 06:40:59.685379956 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:41:00.069382015 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-06 13:54:05.816712383 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 13:54:06.240712836 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0