mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-18 19:06:58 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
c03be1cdc7
commit
e05151f08b
@@ -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-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:26:33.600676061 +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-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -44,7 +44,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -86,8 +86,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-04-22 17:18:22.490187960 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -747,8 +747,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
//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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -69,25 +69,25 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -877,8 +877,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-04-22 17:18:22.490187960 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -24,19 +24,19 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1002,8 +1002,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-04-22 17:18:22.490187960 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1140,8 +1140,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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:26:33.600676061 +0000
|
||||
@@ -30,7 +30,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
@@ -1161,8 +1161,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-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -1188,8 +1188,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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/popupLight.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1256,8 +1256,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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -120,7 +120,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1286,8 +1286,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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -29,7 +29,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1354,8 +1354,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-04-22 17:18:22.486188004 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
@@ -17,8 +17,6 @@
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:18:22.878183694 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-22 17:26:33.620675586 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-22 17:26:33.600676061 +0000
|
||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -44,7 +44,7 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -76,8 +76,8 @@
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:18:22.490187960 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -62,6 +62,16 @@
|
||||
+@@ -97,25 +107,37 @@
|
||||
+ Attributes
|
||||
@@ -364,8 +364,8 @@
|
||||
+ //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-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -69,25 +69,25 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -494,8 +494,8 @@
|
||||
+ //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-22 17:18:22.490187960 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/cardMedia.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -24,19 +24,19 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -619,8 +619,8 @@
|
||||
+ //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-04-22 17:18:22.490187960 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -42,7 +42,7 @@
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
@@ -757,8 +757,8 @@
|
||||
+ //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-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
+--- HMI/n2t-out/pageIcons.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-22 17:26:33.600676061 +0000
|
||||
+@@ -30,7 +30,7 @@
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
@@ -777,8 +777,8 @@
|
||||
+
|
||||
+ Picture p0
|
||||
+ Attributes
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -177,12 +177,12 @@
|
||||
+ crcputh 55 bb
|
||||
+- crcputs sys0,2
|
||||
@@ -787,8 +787,8 @@
|
||||
+ //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-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/popupLight.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -29,7 +29,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -855,8 +855,8 @@
|
||||
+ //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-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
+--- HMI/n2t-out/popupNotify.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -120,7 +120,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -885,8 +885,8 @@
|
||||
+ //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-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:18:22.862183870 +0000
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -29,7 +29,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -953,8 +953,8 @@
|
||||
+ //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-04-22 17:18:22.486188004 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:18:22.866183826 +0000
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-04-22 17:26:33.208685366 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-22 17:26:33.604675966 +0000
|
||||
+@@ -17,8 +17,6 @@
|
||||
+ vis tInstruction,0
|
||||
+ vis tTmp,0
|
||||
|
||||
Reference in New Issue
Block a user