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

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

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-10 11:19:04.736144327 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 11:19:05.732151037 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 11:25:51.180810731 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,69 +10,9 @@ 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-10 11:19:04.736144327 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-10 11:25:50.396815209 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 11:19:05.732151037 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 11:25:51.180810731 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

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

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

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

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

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

View File

@@ -14,10 +14,10 @@ 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 cardMedia
35 Component(s) 30 Component(s)
343 Line(s) of event code 329 Line(s) of event code
213 Unique line(s) of event code 169 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -30,29 +30,29 @@ popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
101 Unique line(s) of event code 101 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
168 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
173 Unique line(s) of event code 173 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 418 Line(s) of event code
243 Unique line(s) of event code 244 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
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)
3540 Line(s) of event code 3540 Line(s) of event code
946 Unique line(s) of event code 947 Unique line(s) of event code

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

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

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

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

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

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-10 11:19:04.736144327 +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:19:05.244147749 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-10 11:25:50.792812857 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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) + // 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-10 11:19:04.740144354 +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:19:05.244147749 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-10 11:25:50.792812857 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -537,15 +525,6 @@ 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
@@ -797,45 +776,9 @@ 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-10 11:19:04.736144327 +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:19:05.244147749 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-10 11:25:50.792812857 +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
@@ -855,8 +798,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-10 11:19:04.736144327 +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:19:05.244147749 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-10 11:25:50.792812857 +0000
@@ -48,6 +48,26 @@ @@ -48,6 +48,26 @@
Scope: local Scope: local
Value: 0 Value: 0

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

View File

@@ -2938,7 +2938,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

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

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

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

View File

@@ -22,26 +22,26 @@ 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
cardEntities
86 Component(s)
1350 Line(s) of event code
547 Unique line(s) of event code
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 cardAlarm
35 Component(s) 35 Component(s)
343 Line(s) of event code 343 Line(s) of event code
213 Unique line(s) of event code 214 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
418 Line(s) of event code 418 Line(s) of event code
243 Unique line(s) of event code 244 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
cardEntities
86 Component(s)
1350 Line(s) of event code
548 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -55,4 +55,4 @@ Total
12 Page(s) 12 Page(s)
365 Component(s) 365 Component(s)
3926 Line(s) of event code 3926 Line(s) of event code
1059 Unique line(s) of event code 1060 Unique line(s) of event code

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

View File

@@ -1607,7 +1607,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

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

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

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