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

synced popupShutter, popupLight and pageIcons (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-06 15:18:25 +00:00
committed by github-actions[bot]
parent 446c056cd2
commit 1f6910174a
7 changed files with 41 additions and 111 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 15:15:11.662432193 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:15:12.706604053 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:18:24.886472251 +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 15:15:11.662432193 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:15:12.706604053 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:18:24.886472251 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

63
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 15:15:11.662432193 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.662432193 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.662432193 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -786,30 +786,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0 crcputs tSend.txt,0
//send cmd //send cmd
printh 55 bb printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Text tTmp2
Attributes
@@ -40,7 +40,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Picture p0
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 15:15:11.662432193 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +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
@@ -828,17 +807,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
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
--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Variable (int32) mode
Attributes

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:15:12.202541951 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:18:24.378468969 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:15:11.662432193 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 15:18:23.858465659 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:18:23.862465684 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:18:23.862465684 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.662432193 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:18:23.862465684 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.662432193 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:18:23.862465684 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:18:24.362468867 +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 15:15:11.666433006 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 15:18:23.862465684 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:15:12.138528943 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 15:18:24.362468867 +0000
+@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@
+ Attributes + Attributes
+ Scope : local + Scope : local
@@ -384,40 +384,5 @@
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+ printh 55 bb + printh 55 bb
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:18:23.862465684 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:15:11.662432193 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:18:24.362468867 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+- Max. Text Size : 80
++ Max. Text Size : 50
+
+ Text tTmp2
+ Attributes
+@@ -40,7 +40,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+- Max. Text Size : 80
++ Max. Text Size : 50
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:15:12.138528943 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:15:11.662432193 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:15:12.138528943 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Variable (int32) mode
+ Attributes

4
HMI/US/portrait/n2t-out-visual/pageIcons.txt
View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

4
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -69,8 +69,8 @@ Variable (string) entn
Attributes Attributes
ID : 21 ID : 21
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes

4
HMI/US/portrait/n2t-out/pageIcons.txt
View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Text tTmp2 Text tTmp2
Attributes Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 50 Max. Text Size : 80
Picture p0 Picture p0
Attributes Attributes

4
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
Text : newtxt Text :
Max. Text Size: 50 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes