h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-03 21:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

add status icons (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-27 19:16:50 +00:00
committed by github-actions[bot]
parent 9ecd4a4ca0
commit 1c848d57dd
8 changed files with 454 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
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
--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 14:55:08.183641171 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 19:16:49.553773382 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 14:55:08.183641171 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 19:16:49.553773382 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 14:55:08.183641171 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 19:16:49.553773382 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -32,3 +32,91 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
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-05-27 19:16:48.789764560 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 19:16:49.553773382 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 19:16:49.553773382 +0000
@@ -62,12 +62,6 @@
Text :
Max. Text Size: 50
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tTime
Attributes
Scope : local
@@ -88,6 +82,16 @@
Text : Tuesday, 08. March 2022
Max. Text Size : 35
+Text tSend
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Text tMainIcon
Attributes
Scope : local
@@ -308,26 +312,6 @@
Text :
Max. Text Size : 35
-Text tIcon1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
-Text tIcon2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
Picture p0
Attributes
Scope : local
@@ -490,14 +474,6 @@
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
- //statusIcon1
- spstr strCommand.txt,tIcon1.txt,"~",17
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tIcon1.pco,0,0
- //statusIcon2
- spstr strCommand.txt,tIcon2.txt,"~",19
- spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tIcon2.pco,0,0
}
if(tInstruction.txt=="color")
{

103
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
--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +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-27 14:55:07.303628300 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -500,10 +500,80 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
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-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000
@@ -455,22 +455,6 @@
--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000
@@ -62,12 +62,6 @@
Text :
Max. Text Size: 50
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tTime
Attributes
Scope : local
@@ -88,6 +82,16 @@
Text : Tuesday, 08. March 2022
Max. Text Size : 35
+Text tSend
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Text tMainIcon
Attributes
Scope : local
@@ -308,26 +312,6 @@
Text :
Max. Text Size : 35
-Text tIcon1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
-Text tIcon2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 5
-
Picture p0
Attributes
Scope : local
@@ -471,33 +455,9 @@
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,1
@@ -526,3 +596,14 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
- //statusIcon1
- spstr strCommand.txt,tIcon1.txt,"~",17
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tIcon1.pco,0,0
- //statusIcon2
- spstr strCommand.txt,tIcon2.txt,"~",19
- spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tIcon2.pco,0,0
}
if(tInstruction.txt=="color")
{

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

@@ -1,11 +1,93 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 14:55:07.791635235 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 14:55:07.303628300 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 14:55:07.731634352 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-27 14:55:07.299628243 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 14:55:07.731634352 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 19:16:49.169768948 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:16:49.157768810 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:16:49.157768810 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:16:49.157768810 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:16:49.157768810 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:16:49.157768810 +0000
+@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+- tSend.txt+="|"
+- covx pColorWheel.h,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-27 19:16:48.789764560 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:16:49.157768810 +0000
+@@ -62,12 +62,6 @@
+ Text :
+ Max. Text Size: 50
+
+-Variable (string) tSend
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 50
+-
+ Text tTime
+ Attributes
+ Scope : local
+@@ -88,6 +82,16 @@
+ Text : Tuesday, 08. March 2022
+ Max. Text Size : 35
+
++Text tSend
++ Attributes
++ Scope : local
++ Dragging : 0
++ Disable release event after dragging: 0
++ Send Component ID : disabled
++ Associated Keyboard : none
++ Text :
++ Max. Text Size : 50
++
+ Text tMainIcon
+ Attributes
+ Scope : local
+@@ -308,26 +312,6 @@
+ Text :
+ Max. Text Size : 35
+
+-Text tIcon1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 5
+-
+-Text tIcon2
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 5
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -471,33 +455,9 @@
+- //statusIcon1
+- spstr strCommand.txt,tIcon1.txt,"~",17
+- spstr strCommand.txt,tTmp.txt,"~",18
+- covx tTmp.txt,tIcon1.pco,0,0
+- //statusIcon2
+- spstr strCommand.txt,tIcon2.txt,"~",19
+- spstr strCommand.txt,tTmp.txt,"~",20
+- covx tTmp.txt,tIcon2.pco,0,0
+ }
+ if(tInstruction.txt=="color")
+ {