mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-06 21:38:56 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
@@ -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-04-10 11:19:04.736144327 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-10 11:19:05.732151037 +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:25:51.180810731 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
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)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
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
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-10 11:19:04.736144327 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-10 11:19:05.732151037 +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:25:51.180810731 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -1073,7 +1073,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//text arm1
|
||||
|
||||
@@ -2096,7 +2096,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
|
||||
@@ -1036,7 +1036,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
|
||||
@@ -956,7 +956,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
|
||||
@@ -1224,7 +1224,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
|
||||
@@ -14,10 +14,10 @@ screensaver
|
||||
33 Component(s)
|
||||
195 Line(s) of event code
|
||||
152 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
343 Line(s) of event code
|
||||
213 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
329 Line(s) of event code
|
||||
169 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
178 Line(s) of event code
|
||||
@@ -30,29 +30,29 @@ popupShutter
|
||||
19 Component(s)
|
||||
178 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
|
||||
27 Component(s)
|
||||
320 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
|
||||
39 Component(s)
|
||||
418 Line(s) of event code
|
||||
243 Unique line(s) of event code
|
||||
244 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
442 Line(s) of event code
|
||||
246 Unique line(s) of event code
|
||||
247 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
964 Line(s) of event code
|
||||
409 Unique line(s) of event code
|
||||
410 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
12 Page(s)
|
||||
341 Component(s)
|
||||
3540 Line(s) of event code
|
||||
946 Unique line(s) of event code
|
||||
947 Unique line(s) of event code
|
||||
|
||||
@@ -543,7 +543,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//text arm1
|
||||
|
||||
@@ -1151,7 +1151,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
|
||||
@@ -599,7 +599,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
|
||||
@@ -534,7 +534,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
|
||||
@@ -671,7 +671,7 @@ Timer tmSerial
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
{
|
||||
vis bPrev,1
|
||||
vis bNext,1
|
||||
bNext.txt="î³"
|
||||
}
|
||||
//entity name
|
||||
|
||||
Reference in New Issue
Block a user