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

This commit is contained in:
joBr99
2022-03-31 21:34:55 +00:00
committed by GitHub Actions
parent 47eee71681
commit eb06b2056e
5 changed files with 42 additions and 46 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:30:20.453497161 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:34:53.332219061 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:34:54.344250692 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm2,0
vis arm3,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:30:20.453497161 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:34:53.332219061 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:34:54.348250817 +0000
@@ -1125,33 +1125,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:30:20.453497161 +0000
--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:34:53.332219061 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:34:54.348250817 +0000
@@ -12,28 +12,307 @@
Events
@@ -408,8 +408,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 21:30:19.649486397 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:30:20.453497161 +0000
--- HMI/n2t-out/screensaver.txt 2022-03-31 21:34:53.332219061 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:34:54.344250692 +0000
@@ -30,6 +30,26 @@
vis tSend,0
//page open event