mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-18 10:57:01 +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
eeb43c2994
commit
8d6d31a05d
@@ -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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -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:39:15.434478135 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -62,8 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -758,8 +758,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-05-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -34,8 +34,6 @@
|
||||
vis tEntity4,0
|
||||
vis tEntity5,0
|
||||
@@ -897,8 +897,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -18,26 +18,25 @@
|
||||
vis tTmp,0
|
||||
vis tId,0
|
||||
@@ -1030,8 +1030,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:39:15.434478135 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -31,8 +31,6 @@
|
||||
vis bt6,0
|
||||
vis bt7,0
|
||||
@@ -1177,8 +1177,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -30,7 +30,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
@@ -1198,8 +1198,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -1225,8 +1225,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -29,7 +29,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1293,8 +1293,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -120,7 +120,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1323,8 +1323,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -29,7 +29,7 @@
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -1391,8 +1391,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:39:15.430478097 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
--- 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
|
||||
@@ -17,8 +17,6 @@
|
||||
vis tInstruction,0
|
||||
vis tTmp,0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 06:39:15.826481826 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 06:41:00.209382765 +0000
|
||||
+--- 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
|
||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -33,8 +33,6 @@
|
||||
+ vis b9,0
|
||||
+ vis b10,0
|
||||
@@ -85,8 +85,8 @@
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:39:15.434478135 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -62,8 +62,16 @@
|
||||
+- vis bPrev,0
|
||||
+- vis bNext,0
|
||||
@@ -375,8 +375,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -34,8 +34,6 @@
|
||||
+ vis tEntity4,0
|
||||
+ vis tEntity5,0
|
||||
@@ -514,8 +514,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -18,26 +18,25 @@
|
||||
+ vis tTmp,0
|
||||
+ vis tId,0
|
||||
@@ -647,8 +647,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-05-06 06:39:15.434478135 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -31,8 +31,6 @@
|
||||
+ vis bt6,0
|
||||
+ vis bt7,0
|
||||
@@ -794,8 +794,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -30,7 +30,7 @@
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
@@ -814,8 +814,8 @@
|
||||
+
|
||||
+ Picture p0
|
||||
+ Attributes
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -177,12 +177,12 @@
|
||||
+ crcputh 55 bb
|
||||
+- crcputs sys0,2
|
||||
@@ -824,8 +824,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -29,7 +29,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -892,8 +892,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -120,7 +120,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -922,8 +922,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -29,7 +29,7 @@
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
@@ -990,8 +990,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-05-06 06:39:15.430478097 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:39:15.814481713 +0000
|
||||
+--- 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
|
||||
+@@ -17,8 +17,6 @@
|
||||
+ vis tInstruction,0
|
||||
+ vis tTmp,0
|
||||
|
||||
Reference in New Issue
Block a user