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

sync us-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-01-24 18:23:55 +00:00
committed by github-actions[bot]
parent e5c222a1d1
commit 7fb49f04f8
9 changed files with 30 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1047,51 +1047,6 @@
│ //command format pageType,specialPageName │ //command format pageType,specialPageName
│ //write name of speical page to tId │ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -891,18 +891,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -602,19 +602,19 @@
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",26
│ }
│ if(type2.txt=="delete"||type2.txt=="")
│ {
│ if(type1.txt=="delete"||type1.txt=="")
│ {
│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
│ }
│ }else
│ {
│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@ │ @@ -35,20 +35,14 @@
@@ -1151,7 +1106,7 @@
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,22 +29,19 @@ │ @@ -29,17 +29,14 @@
│ } │ }
│ tDate.txt=pageIcons.vaDate.txt │ tDate.txt=pageIcons.vaDate.txt
│ dim=dimValue │ dim=dimValue
@@ -1166,15 +1121,9 @@
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ Text : │ Text :
│ - Max. Text Size: 400 │ Max. Text Size: 400
│ + Max. Text Size: 200
│ │
│ Variable (string) strTmp │ Variable (string) strTmp
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 2
│
│ @@ -103,35 +100,14 @@ │ @@ -103,35 +100,14 @@
│ Value: 0 │ Value: 0
│ │

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-24 17:39:56.497711621 +0000 +++ /dev/fd/62 2023-01-24 18:23:47.994140804 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
@@ -54,13 +54,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +186,26 @@ +14 +186,26 @@
+e (string) type6 +e (string) type6
@@ -466,51 +466,6 @@
+ covx tTmp.txt,sys0,0,0 + covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0 + hSlider6.maxval=sys0
+ } + }
+I/n2t-out/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+18 +891,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+19 +602,19 @@
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",26
+ }
+ if(type2.txt=="delete"||type2.txt=="")
+ {
+ if(type1.txt=="delete"||type1.txt=="")
+ {
+ qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt
+ }
+ }else
+ {
+ qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
+ qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+I/n2t-out/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@ +0 +35,14 @@
@@ -536,7 +491,7 @@
+ Associated Keyboard : none + Associated Keyboard : none
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+2 +29,19 @@ +7 +29,14 @@
+ } + }
+ tDate.txt=pageIcons.vaDate.txt + tDate.txt=pageIcons.vaDate.txt
+ dim=dimValue + dim=dimValue
@@ -552,14 +507,8 @@
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 400 + Max. Text Size: 400
+ Max. Text Size: 200
+ +
+e (string) strTmp +e (string) strTmp
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 2
+
+35 +100,14 @@ +35 +100,14 @@
+ Value: 0 + Value: 0
+ +

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

@@ -1463,6 +1463,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -907,11 +907,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")

22
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -22,18 +22,14 @@ popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
204 Unique line(s) of event code 204 Unique line(s) of event code
cardQR
34 Component(s)
402 Line(s) of event code
234 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
185 Line(s) of event code 185 Line(s) of event code
131 Unique line(s) of event code 131 Unique line(s) of event code
screensaver cardQR
46 Component(s) 34 Component(s)
418 Line(s) of event code 402 Line(s) of event code
299 Unique line(s) of event code 234 Unique line(s) of event code
cardGrid cardGrid
44 Component(s) 44 Component(s)
515 Line(s) of event code 515 Line(s) of event code
@@ -62,6 +58,10 @@ cardLChart
33 Component(s) 33 Component(s)
408 Line(s) of event code 408 Line(s) of event code
268 Unique line(s) of event code 268 Unique line(s) of event code
screensaver
46 Component(s)
418 Line(s) of event code
299 Unique line(s) of event code
popupTimer popupTimer
42 Component(s) 42 Component(s)
512 Line(s) of event code 512 Line(s) of event code
@@ -76,8 +76,8 @@ popupInSel
295 Unique line(s) of event code 295 Unique line(s) of event code
cardPower cardPower
48 Component(s) 48 Component(s)
483 Line(s) of event code 487 Line(s) of event code
324 Unique line(s) of event code 326 Unique line(s) of event code
cardEntities cardEntities
91 Component(s) 91 Component(s)
1622 Line(s) of event code 1622 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
747 Component(s) 747 Component(s)
9215 Line(s) of event code 9219 Line(s) of event code
2390 Unique line(s) of event code 2390 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -46,7 +46,7 @@ Variable (string) strCommand
ID : 4 ID : 4
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (string) strTmp Variable (string) strTmp
Attributes Attributes

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

@@ -895,6 +895,10 @@ Timer tmSerial
{ {
page cardChart page cardChart
} }
if(tId.txt=="cardLChart")
{
page cardLChart
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -606,11 +606,11 @@ Timer tmSerial
{ {
if(type1.txt=="delete"||type1.txt=="") if(type1.txt=="delete"||type1.txt=="")
{ {
qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt
} }
}else }else
{ {
qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")

2
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -37,7 +37,7 @@ Variable (string) strCommand
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 400
Variable (string) strTmp Variable (string) strTmp
Attributes Attributes