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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-24 14:34:15 +00:00
committed by github-actions[bot]
parent 2bea2aa6bc
commit 395b5cd562
9 changed files with 145 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
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
--- HMI/n2t-out/Program.s.txt 2022-05-23 06:20:44.296447221 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-23 06:20:45.196459256 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-24 14:34:13.723678266 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-24 14:34:14.623688759 +0000
@@ -11,6 +11,4 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-23 06:20:44.300447274 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-23 06:20:45.196459256 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-24 14:34:13.723678266 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-24 14:34:14.627688805 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-23 06:20:44.300447274 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-23 06:20:45.196459256 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-24 14:34:13.723678266 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-24 14:34:14.627688805 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -32,3 +32,41 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-24 14:34:13.723678266 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-24 14:34:14.627688805 +0000
@@ -468,9 +468,6 @@
tF4Icon.txt=tF3Icon.txt
tF3Icon.txt=tF2Icon.txt
tF2Icon.txt=tF1Icon.txt
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
@@ -509,10 +506,8 @@
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
- tMainIconAlt.pco=tMainIcon.pco
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
- tMainTextAlt.pco=tMainText.pco
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
@@ -540,8 +535,12 @@
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tMRIcon.pco,0,0
+ covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
+ covx tTmp.txt,tMainTextAlt.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",22
+ covx tTmp.txt,tMRIcon.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="notify")