mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-25 17:04:25 +01:00
Merge pull request #107 from jmbinette/main (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-04-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 01:57:13.779812142 +0000
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-04-01 04:54:12.888152138 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 04:54:13.840218589 +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-04-01 01:57:12.803742845 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 01:57:13.779812142 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-01 04:54:12.888152138 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 04:54:13.844218868 +0000
|
||||
@@ -211,7 +211,7 @@
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
@@ -83,8 +83,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-04-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 01:57:13.779812142 +0000
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-04-01 04:54:12.888152138 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 04:54:13.844218868 +0000
|
||||
@@ -12,28 +12,307 @@
|
||||
|
||||
Events
|
||||
@@ -444,8 +444,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-04-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 01:57:13.779812142 +0000
|
||||
--- HMI/n2t-out/pageIcons.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 04:54:13.840218589 +0000
|
||||
@@ -20,7 +20,7 @@
|
||||
Attributes
|
||||
Scope : global
|
||||
@@ -456,8 +456,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-04-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 01:57:13.779812142 +0000
|
||||
--- HMI/n2t-out/screensaver.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 04:54:13.840218589 +0000
|
||||
@@ -30,6 +30,26 @@
|
||||
vis tSend,0
|
||||
//page open event
|
||||
|
||||
@@ -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-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 01:57:13.279776641 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-01 01:57:12.803742845 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 01:57:13.283776925 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-01 04:54:12.888152138 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-01 01:57:12.799742561 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 01:57:13.279776641 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
|
||||
Reference in New Issue
Block a user