h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 07:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Synced US-P (#178) (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-06 15:00:34 +00:00
committed by github-actions[bot]
parent fa24d04c3d
commit cbb875cc1b
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 14:54:02.317683797 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:00:32.468241140 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 14:54:02.321684107 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:00:32.468241140 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

40
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-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.365609923 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd //send cmd
printh 55 bb printh 55 bb
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-05-06 14:54:01.365609923 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -493,8 +493,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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000
@@ -71,25 +71,25 @@ @@ -71,25 +71,25 @@
Attributes Attributes
Scope : local Scope : local
@@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading Text tHeading
Attributes Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000
@@ -25,19 +25,19 @@ @@ -25,19 +25,19 @@
Attributes Attributes
Scope : local Scope : local
@@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
//send cmd //send cmd
printh 55 bb printh 55 bb
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:54:01.365609923 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -787,8 +787,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send cmd //send cmd
printh 55 bb printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/pageIcons.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
@@ -808,8 +808,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0 Picture p0
Attributes Attributes
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-05-06 14:54:01.361609612 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +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
@@ -829,8 +829,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 14:54:01.365609923 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000
@@ -59,8 +59,8 @@ @@ -59,8 +59,8 @@
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -843,8 +843,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode Variable (int32) mode
Attributes Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:54:01.365609923 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:54:01.817644997 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000
@@ -46,8 +46,8 @@ @@ -46,8 +46,8 @@
Variable (string) entn Variable (string) entn
Attributes Attributes

42
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 14:54:01.837646549 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:00:32.080234971 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:00:32.064234717 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.365609923 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -46,7 +46,7 @@ +@@ -46,7 +46,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -67,8 +67,8 @@
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 14:54:01.365609923 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:00:32.068234780 +0000
+@@ -62,6 +62,16 @@ +@@ -62,6 +62,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -91,8 +91,8 @@
+ if(tInstruction.txt=="pageType") + if(tInstruction.txt=="pageType")
+ { + {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:54:01.361609612 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:00:32.068234780 +0000
+@@ -71,25 +71,25 @@ +@@ -71,25 +71,25 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -140,8 +140,8 @@
+ Text tHeading + Text tHeading
+ Attributes + Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:54:01.361609612 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -25,19 +25,19 @@ +@@ -25,19 +25,19 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -256,8 +256,8 @@
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:54:01.365609923 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -385,8 +385,8 @@
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:54:01.361609612 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -30,7 +30,7 @@ +@@ -30,7 +30,7 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
@@ -405,11 +405,11 @@
+ +
+ Picture p0 + Picture p0
+ Attributes + Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:00:32.064234717 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 14:54:01.365609923 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -59,8 +59,8 @@ +@@ -59,8 +59,8 @@
+ Variable (string) entn + Variable (string) entn
+ Attributes + Attributes
@@ -422,8 +422,8 @@
+ Variable (int32) mode + Variable (int32) mode
+ Attributes + Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:54:01.365609923 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:00:31.684228675 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:54:01.817644997 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:00:32.064234717 +0000
+@@ -46,8 +46,8 @@ +@@ -46,8 +46,8 @@
+ Variable (string) entn + Variable (string) entn
+ Attributes + Attributes