Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 16:09:55 +00:00
committed by github-actions[bot]
parent baa6b6bcb1
commit ea0f1f3825
5 changed files with 63 additions and 295 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 16:05:10.964544420 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:05:10.968544443 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -427,8 +427,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-05-06 16:05:10.968544443 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -475,125 +475,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:05:10.964544420 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:05:11.352546659 +0000
@@ -25,19 +25,19 @@
Attributes
Scope : local
Text :
- Max. Text Size: 750
+ Max. Text Size: 500
Variable (string) entn
Attributes
Scope : local
Text :
- Max. Text Size: 80
+ Max. Text Size: 50
Variable (string) vaSpeakerList
Attributes
Scope : local
Text :
- Max. Text Size: 400
+ Max. Text Size: 200
Variable (int32) vaSpeakerPos
Attributes
@@ -135,7 +135,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
@@ -164,7 +164,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
@@ -193,7 +193,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
@@ -233,7 +233,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
@@ -263,7 +263,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
@@ -302,7 +302,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
@@ -353,7 +353,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
@@ -391,7 +391,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
@@ -416,7 +416,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
@@ -448,7 +448,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/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:05:10.964544420 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -613,8 +497,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 16:05:10.964544420 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -634,8 +518,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-05-06 16:05:10.968544443 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -661,8 +545,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:05:10.968544443 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:05:11.352546659 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes