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

fixed model in us-l (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-07 09:49:51 +00:00
committed by github-actions[bot]
parent 87fdec03cd
commit c537d1328d
5 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-07 08:40:23.298285970 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 08:40:24.122300547 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,3 +8,15 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- 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
--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
- tSend.txt="event,startup,"+tVersion.txt+",eu"
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

2
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1 recmod=1
bauds=115200 bauds=115200
// startup event // startup event
tSend.txt="event,startup,"+tVersion.txt+",eu" tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1 recmod=1
bauds=115200 bauds=115200
// startup event // startup event
tSend.txt="event,startup,"+tVersion.txt+",eu" tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

12
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-07 08:40:23.298285970 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +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/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-07 08:40:23.298285970 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -427,8 +427,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/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-07 08:40:23.298285970 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +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

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

@@ -1,7 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:40:23.730293612 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000