mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-16 01:46:59 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
@@ -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 22:17:43.214551653 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:17:44.138561902 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:28:25.894497033 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:28:26.694539183 +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 22:17:43.214551653 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:17:44.138561902 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:28:25.898497244 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:28:26.698539394 +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 22:17:43.214551653 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:17:44.138561902 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:28:25.898497244 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:28:26.698539394 +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/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:17:44.138561902 +0000
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:28:25.894497033 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:28:26.694539183 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
Attributes
|
||||
Scope : global
|
||||
@@ -420,8 +420,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
|
||||
Text tIcons
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:17:43.214551653 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:17:44.138561902 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:28:25.894497033 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:28:26.694539183 +0000
|
||||
@@ -30,6 +30,26 @@
|
||||
vis tSend,0
|
||||
//page open event
|
||||
|
||||
Reference in New Issue
Block a user