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

This commit is contained in:
joBr99
2022-05-21 14:30:08 +00:00
committed by github-actions[bot]
parent 0af8d58899
commit a49114ee05
6 changed files with 361 additions and 276 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-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:30:06.897411144 +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-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.897411144 +0000
@@ -788,10 +788,6 @@
{
page cardAlarm
@@ -25,8 +25,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:30:06.485412317 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:30:06.901411132 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -568,8 +568,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:30:06.897411144 +0000
@@ -869,10 +869,6 @@
{
page cardAlarm
@@ -582,8 +582,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:30:06.897411144 +0000
@@ -740,10 +740,6 @@
{
page cardAlarm
@@ -596,8 +596,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:30:06.897411144 +0000
@@ -19,16 +19,6 @@
vis tId,0
vis bPrev,0
@@ -805,8 +805,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:30:06.897411144 +0000
@@ -1192,10 +1192,6 @@
{
page cardAlarm
@@ -819,8 +819,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:30:06.897411144 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -860,8 +860,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:30:06.901411132 +0000
@@ -618,10 +618,6 @@
{
page cardAlarm
@@ -874,8 +874,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:30:06.897411144 +0000
@@ -381,10 +381,6 @@
{
page cardAlarm
@@ -888,8 +888,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:30:06.897411144 +0000
@@ -422,10 +422,6 @@
{
page cardAlarm
@@ -902,8 +902,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
// end of user code
udelete payloadLength-1
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-21 14:27:14.739536696 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:27:15.215443403 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-21 14:30:06.481412328 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:30:06.897411144 +0000
@@ -607,10 +607,6 @@
{
page cardAlarm