h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 10:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jmbinette
2022-04-01 00:12:30 +00:00
committed by GitHub Actions
parent e7ec0541bb
commit b5b3f3d9ae
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:36:10.913861716 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-01 00:12:29.768534180 +0000
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
vis tInstruction,0 vis tInstruction,0
vis tTmp,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 arm2,0
vis arm3,0 vis arm3,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-01 00:12:28.776464093 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:36:10.913861716 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-01 00:12:29.768534180 +0000
@@ -211,7 +211,7 @@ @@ -211,7 +211,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none 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 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/cardGrid.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:36:10.913861716 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-01 00:12:29.768534180 +0000
@@ -12,28 +12,307 @@ @@ -12,28 +12,307 @@
Events 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 spstr strCommand.txt,type1.txt,",",3
// get internal name // get internal name
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/pageIcons.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:36:10.909861639 +0000 +++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-04-01 00:12:29.764533897 +0000
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
Attributes Attributes
Scope : global Scope : global
@@ -456,8 +456,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tIcons Text tIcons
Attributes Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:36:10.913861716 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-01 00:12:29.768534180 +0000
@@ -30,6 +30,26 @@ @@ -30,6 +30,26 @@
vis tSend,0 vis tSend,0
//page open event //page open event

12
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:36:10.513854100 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 00:12:29.268498854 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-01 00:12:28.776464093 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:36:10.513854100 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 00:12:29.268498854 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,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") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:36:10.109846409 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-01 00:12:28.772463810 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:36:10.513854100 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 00:12:29.268498854 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled