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

fix us-l sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-19 18:31:23 +00:00
committed by github-actions[bot]
parent 6cc61ac042
commit e6edbb39b7
8 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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
--- HMI/n2t-out/Program.s.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000
@@ -44,7 +44,7 @@
Attributes
Scope : local
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend
Attributes
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -462,8 +462,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000
@@ -69,25 +69,25 @@
Attributes
Scope : local
@@ -511,8 +511,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000
@@ -30,7 +30,7 @@
Attributes
Scope : local
@@ -523,8 +523,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (string) vaSpeakerList
Attributes
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000
@@ -42,7 +42,7 @@
Attributes
Scope : local
@@ -535,8 +535,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0
Attributes
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -556,8 +556,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Picture p0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -577,8 +577,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -591,8 +591,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -605,8 +605,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:11:27.467306986 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:11:27.439306391 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-19 18:31:22.492132663 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-19 18:31:22.456132087 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -44,7 +44,7 @@
+ Attributes
+ Scope : local
@@ -13,8 +13,8 @@
+
+ Variable (string) tSend
+ Attributes
+--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:11:27.443306476 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -62,6 +62,16 @@
+@@ -97,25 +107,37 @@
+ Attributes
@@ -54,8 +54,8 @@
+ if(tInstruction.txt=="pageType")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -69,25 +69,25 @@
+ Attributes
+ Scope : local
@@ -103,8 +103,8 @@
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -30,7 +30,7 @@
+ Attributes
+ Scope : local
@@ -115,8 +115,8 @@
+ Variable (string) vaSpeakerList
+ Attributes
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -42,7 +42,7 @@
+ Attributes
+ Scope : local
@@ -127,8 +127,8 @@
+ Variable (string) va0
+ Attributes
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -147,11 +147,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-19 18:31:22.456132087 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/popupLight.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -164,8 +164,8 @@
+ Variable (int32) mode
+ Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
@@ -178,8 +178,8 @@
+ Text tEntity
+ Attributes
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-19 18:11:27.067298484 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:11:27.439306391 +0000
+--- HMI/n2t-out/screensaver.txt 2022-04-19 18:31:22.068125874 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-19 18:31:22.456132087 +0000
+@@ -17,8 +17,6 @@
+ vis tInstruction,0
+ vis tTmp,0