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

sync us-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-09-15 18:53:21 +00:00
committed by github-actions[bot]
parent 4fc429097e
commit 2ef455d2f8
6 changed files with 93 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-15 15:16:32.983793313 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-15 18:53:19.233011610 +0000
@@ -14,6 +14,3 @@ @@ -14,6 +14,3 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- page pageStartup - page pageStartup
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-15 15:16:32.983793313 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-15 18:53:19.233011610 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-15 15:16:32.983793313 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-15 18:53:19.233011610 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event

58
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-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 15:16:32.479794687 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 18:53:18.749006644 +0000
@@ -14,6 +14,6 @@ @@ -14,6 +14,6 @@
//color vars //color vars
int defaultFontColor=65535 int defaultFontColor=65535
@@ -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-09-15 15:16:32.035795901 +0000 --- HMI/n2t-out/cardEntities.txt 2022-09-15 18:53:18.305002088 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 15:16:32.479794687 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 18:53:18.753006685 +0000
@@ -65,6 +65,16 @@ @@ -65,6 +65,16 @@
vis nNum4,0 vis nNum4,0
vis bPrev,0 vis bPrev,0
@@ -459,8 +459,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
{ {
Only in HMI/n2t-out: cardPower.txt Only in HMI/n2t-out: cardPower.txt
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-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 15:16:32.479794687 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 18:53:18.749006644 +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
@@ -480,8 +480,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 15:16:32.479794687 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 18:53:18.749006644 +0000
@@ -13,36 +13,6 @@ @@ -13,36 +13,6 @@
Events Events
Preinitialize Event Preinitialize Event
@@ -617,8 +617,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- } - }
- -
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
--- HMI/n2t-out/popupFan.txt 2022-09-15 15:16:32.031795912 +0000 --- HMI/n2t-out/popupFan.txt 2022-09-15 18:53:18.301002047 +0000
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 15:16:32.479794687 +0000 +++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 18:53:18.749006644 +0000
@@ -81,23 +81,23 @@ @@ -81,23 +81,23 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -686,41 +686,3 @@ diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
covx sys2,tTmp.txt,0,0 covx sys2,tTmp.txt,0,0
tSend.txt+="mode-sel,"+tTmp.txt tSend.txt+="mode-sel,"+tTmp.txt
//send calc crc //send calc crc
@@ -498,37 +498,6 @@
covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",7
- //current mode
- spstr strCommand.txt,vaModeCur.txt,"~",8
- //mode list
- spstr strCommand.txt,vaModeList.txt,"~",9
- if(vaModeList.txt=="")
- {
- vis bMode1,0
- vis bMode2,0
- vis bMode3,0
- vis bModeNext,0
- }
- if(bMode1.txt=="")
- {
- click bModeNext,1
- click bModeNext,0
- }
- bMode1.pco=defaultFontColor
- bMode2.pco=defaultFontColor
- bMode3.pco=defaultFontColor
- if(bMode1.txt==vaModeCur.txt)
- {
- bMode1.pco=1374
- }
- if(bMode2.txt==vaModeCur.txt)
- {
- bMode2.pco=1374
- }
- if(bMode3.txt==vaModeCur.txt)
- {
- bMode3.pco=1374
- }
}
if(tInstruction.txt=="time")
{

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

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-15 15:16:32.491794654 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-09-15 18:53:18.765006808 +0000
+--- HMI/n2t-out/Program.s.txt 2022-09-15 15:16:32.031795912 +0000 +--- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 15:16:32.479794687 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 18:53:18.749006644 +0000
+@@ -14,6 +14,6 @@ +@@ -14,6 +14,6 @@
+ //color vars + //color vars
+ int defaultFontColor=65535 + int defaultFontColor=65535
+ int defaultBcoColor=6371 + int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-09-15 15:16:32.035795901 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-09-15 18:53:18.305002088 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 15:16:32.479794687 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 18:53:18.753006685 +0000
+@@ -65,6 +65,16 @@ +@@ -65,6 +65,16 @@
+ vis bPrev,0 + vis bPrev,0
+ vis bNext,0 + vis bNext,0
@@ -36,11 +36,11 @@
++ covx tTmp.txt,sys0,0,0 ++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0 ++ btOnOff5.val=sys0
+Only in HMI/n2t-out: cardPower.txt +Only in HMI/n2t-out: cardPower.txt
+--- HMI/n2t-out/pageStartup.txt 2022-09-15 15:16:32.031795912 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 15:16:32.479794687 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 18:53:18.749006644 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-09-15 15:16:32.031795912 +0000 +--- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 15:16:32.479794687 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 18:53:18.749006644 +0000
+@@ -13,36 +13,6 @@ +@@ -13,36 +13,6 @@
+ Events + Events
+ Preinitialize Event + Preinitialize Event
@@ -176,8 +176,8 @@
+- } +- }
+- +-
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt +diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
+--- HMI/n2t-out/popupFan.txt 2022-09-15 15:16:32.031795912 +0000 +--- HMI/n2t-out/popupFan.txt 2022-09-15 18:53:18.301002047 +0000
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 15:16:32.479794687 +0000 ++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 18:53:18.749006644 +0000
+@@ -81,23 +81,23 @@ +@@ -81,23 +81,23 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -245,41 +245,3 @@
+ covx sys2,tTmp.txt,0,0 + covx sys2,tTmp.txt,0,0
+ tSend.txt+="mode-sel,"+tTmp.txt + tSend.txt+="mode-sel,"+tTmp.txt
+ //send calc crc + //send calc crc
+@@ -498,37 +498,6 @@
+ covx tTmp.txt,hSpeed.maxval,0,0
+ // set t1 Speed (Localization)
+ spstr strCommand.txt,t1.txt,"~",7
+- //current mode
+- spstr strCommand.txt,vaModeCur.txt,"~",8
+- //mode list
+- spstr strCommand.txt,vaModeList.txt,"~",9
+- if(vaModeList.txt=="")
+- {
+- vis bMode1,0
+- vis bMode2,0
+- vis bMode3,0
+- vis bModeNext,0
+- }
+- if(bMode1.txt=="")
+- {
+- click bModeNext,1
+- click bModeNext,0
+- }
+- bMode1.pco=defaultFontColor
+- bMode2.pco=defaultFontColor
+- bMode3.pco=defaultFontColor
+- if(bMode1.txt==vaModeCur.txt)
+- {
+- bMode1.pco=1374
+- }
+- if(bMode2.txt==vaModeCur.txt)
+- {
+- bMode2.pco=1374
+- }
+- if(bMode3.txt==vaModeCur.txt)
+- {
+- bMode3.pco=1374
+- }
+ }
+ if(tInstruction.txt=="time")
+ {

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

@@ -32,8 +32,8 @@ popupLight
211 Unique line(s) of event code 211 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
313 Line(s) of event code 342 Line(s) of event code
180 Unique line(s) of event code 199 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
463 Line(s) of event code 463 Line(s) of event code
@@ -62,5 +62,5 @@ cardEntities
Total Total
14 Page(s) 14 Page(s)
450 Component(s) 450 Component(s)
5454 Line(s) of event code 5483 Line(s) of event code
1459 Unique line(s) of event code 1478 Unique line(s) of event code

31
HMI/US/portrait/n2t-out-visual/popupFan.txt
View File

@@ -789,6 +789,37 @@ Timer tmSerial
covx tTmp.txt,hSpeed.maxval,0,0 covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",7 spstr strCommand.txt,t1.txt,"~",7
//current mode
spstr strCommand.txt,vaModeCur.txt,"~",8
//mode list
spstr strCommand.txt,vaModeList.txt,"~",9
if(vaModeList.txt=="")
{
vis bMode1,0
vis bMode2,0
vis bMode3,0
vis bModeNext,0
}
if(bMode1.txt=="")
{
click bModeNext,1
click bModeNext,0
}
bMode1.pco=defaultFontColor
bMode2.pco=defaultFontColor
bMode3.pco=defaultFontColor
if(bMode1.txt==vaModeCur.txt)
{
bMode1.pco=1374
}
if(bMode2.txt==vaModeCur.txt)
{
bMode2.pco=1374
}
if(bMode3.txt==vaModeCur.txt)
{
bMode3.pco=1374
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

31
HMI/US/portrait/n2t-out/popupFan.txt
View File

@@ -498,6 +498,37 @@ Timer tmSerial
covx tTmp.txt,hSpeed.maxval,0,0 covx tTmp.txt,hSpeed.maxval,0,0
// set t1 Speed (Localization) // set t1 Speed (Localization)
spstr strCommand.txt,t1.txt,"~",7 spstr strCommand.txt,t1.txt,"~",7
//current mode
spstr strCommand.txt,vaModeCur.txt,"~",8
//mode list
spstr strCommand.txt,vaModeList.txt,"~",9
if(vaModeList.txt=="")
{
vis bMode1,0
vis bMode2,0
vis bMode3,0
vis bModeNext,0
}
if(bMode1.txt=="")
{
click bModeNext,1
click bModeNext,0
}
bMode1.pco=defaultFontColor
bMode2.pco=defaultFontColor
bMode3.pco=defaultFontColor
if(bMode1.txt==vaModeCur.txt)
{
bMode1.pco=1374
}
if(bMode2.txt==vaModeCur.txt)
{
bMode2.pco=1374
}
if(bMode3.txt==vaModeCur.txt)
{
bMode3.pco=1374
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {