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

fix nav button in eu version (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-10 11:19:06 +00:00
committed by GitHub Actions
parent 9436514c71
commit fcaa4faae7
13 changed files with 151 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
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-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-08 20:30:54.170202708 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 11:19:05.732151037 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,9 +10,69 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-04-10 11:19:05.732151037 +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/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-10 11:19:04.740144354 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-04-10 11:19:05.732151037 +0000
@@ -1151,7 +1151,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
// get Type
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-04-10 11:19:05.732151037 +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/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-04-10 11:19:05.732151037 +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/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-04-10 11:19:05.732151037 +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/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-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-08 20:30:54.174202881 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 11:19:05.732151037 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-08 20:30:53.734183782 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 11:19:05.244147749 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,9 +10,21 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup 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 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-10 11:19:04.740144354 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-08 20:30:53.738183956 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 11:19:05.244147749 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -525,6 +537,15 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -1151,7 +1607,7 @@
}
if(tTmp.txt=="1")
{
- vis bNext,1
+ vis bPrev,1
bNext.txt=""
}
// get Type
@@ -1642,6 +2098,250 @@ @@ -1642,6 +2098,250 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
@@ -776,9 +797,45 @@ 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/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 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-08 20:30:53.734183782 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 11:19:05.244147749 +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
@@ -798,8 +855,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/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-08 20:30:53.290164509 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-10 11:19:04.736144327 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-08 20:30:53.738183956 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 11:19:05.244147749 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

2
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -1073,7 +1073,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//text arm1 //text arm1

2
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2096,7 +2096,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

2
HMI/n2t-out-visual/cardGrid.txt
View File

@@ -1036,7 +1036,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

2
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -956,7 +956,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name

2
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -1224,7 +1224,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name

24
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -18,10 +18,6 @@ pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
243 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
320 Line(s) of event code 320 Line(s) of event code
@@ -33,26 +29,30 @@ popupShutter
cardMedia cardMedia
30 Component(s) 30 Component(s)
329 Line(s) of event code 329 Line(s) of event code
168 Unique line(s) of event code 169 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
213 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
442 Line(s) of event code 442 Line(s) of event code
246 Unique line(s) of event code 247 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
244 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
195 Line(s) of event code 195 Line(s) of event code
152 Unique line(s) of event code 152 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardEntities cardEntities
62 Component(s) 62 Component(s)
964 Line(s) of event code 964 Line(s) of event code
409 Unique line(s) of event code 410 Unique line(s) of event code
Total Total
12 Page(s) 12 Page(s)
341 Component(s) 341 Component(s)
3541 Line(s) of event code 3541 Line(s) of event code
947 Unique line(s) of event code 948 Unique line(s) of event code

2
HMI/n2t-out/cardAlarm.txt
View File

@@ -543,7 +543,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//text arm1 //text arm1

2
HMI/n2t-out/cardEntities.txt
View File

@@ -1151,7 +1151,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

2
HMI/n2t-out/cardGrid.txt
View File

@@ -599,7 +599,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
// get Type // get Type

2
HMI/n2t-out/cardMedia.txt
View File

@@ -534,7 +534,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name

2
HMI/n2t-out/cardThermo.txt
View File

@@ -671,7 +671,7 @@ Timer tmSerial
} }
if(tTmp.txt=="1") if(tTmp.txt=="1")
{ {
vis bPrev,1 vis bNext,1
bNext.txt="" bNext.txt=""
} }
//entity name //entity name