h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-08 06:16:34 +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-04-10 11:25:51 +00:00
committed by GitHub Actions
parent 9b928832cc
commit a8ea56e461
24 changed files with 53 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
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
--- HMI/n2t-out/Program.s.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 11:19:05.244147749 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 11:25:50.792812857 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -10,21 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-10 11:19:05.248147776 +0000
@@ -543,7 +543,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
//text arm1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-10 11:19:04.740144354 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 11:19:05.244147749 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 11:25:50.792812857 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -537,15 +525,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial
Attributes
Scope : local
@@ -1151,7 +1607,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
// get Type
@@ -1642,6 +2098,250 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
@@ -797,45 +776,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-10 11:19:05.248147776 +0000
@@ -599,7 +599,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
// get Type
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-10 11:19:05.244147749 +0000
@@ -534,7 +534,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
//entity name
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-10 11:19:05.248147776 +0000
@@ -671,7 +671,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
//entity name
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 11:19:05.244147749 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 11:25:50.792812857 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -855,8 +798,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 11:19:05.244147749 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 11:25:50.792812857 +0000
@@ -48,6 +48,26 @@
Scope: local
Value: 0