mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-17 10:27:00 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
eeb43c2994
commit
8d6d31a05d
@@ -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-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-06 06:40:59.685379956 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 06:41:00.601384867 +0000
|
||||
@@ -11,6 +11,4 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -8,70 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- // fix touch offset
|
||||
- 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-05-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
@@ -33,8 +33,6 @@
|
||||
vis b9,0
|
||||
vis b10,0
|
||||
vis tCode,0
|
||||
- vis bPrev,0
|
||||
- vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:39:15.434478135 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-06 06:39:16.222485554 +0000
|
||||
@@ -62,8 +62,6 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
- vis bPrev,0
|
||||
- vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
@@ -34,8 +34,6 @@
|
||||
vis tEntity4,0
|
||||
vis tEntity5,0
|
||||
vis tEntity6,0
|
||||
- vis bPrev,0
|
||||
- vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
@@ -18,8 +18,7 @@
|
||||
vis tTmp,0
|
||||
vis tId,0
|
||||
vis t5,0
|
||||
- vis bPrev,0
|
||||
- vis bNext,0
|
||||
+ //vis nPageDisp,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-05-06 06:39:15.434478135 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
@@ -31,8 +31,6 @@
|
||||
vis bt6,0
|
||||
vis bt7,0
|
||||
vis bt8,0
|
||||
- vis bPrev,0
|
||||
- vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:39:15.430478097 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 06:39:16.218485517 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:40:59.685379956 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 06:41:00.601384867 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -41,6 +41,8 @@ Page cardAlarm
|
||||
vis b9,0
|
||||
vis b10,0
|
||||
vis tCode,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -70,6 +70,8 @@ Page cardEntities
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -42,6 +42,8 @@ Page cardGrid
|
||||
vis tEntity4,0
|
||||
vis tEntity5,0
|
||||
vis tEntity6,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -26,7 +26,8 @@ Page cardMedia
|
||||
vis tTmp,0
|
||||
vis tId,0
|
||||
vis t5,0
|
||||
//vis nPageDisp,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -39,6 +39,8 @@ Page cardThermo
|
||||
vis bt6,0
|
||||
vis bt7,0
|
||||
vis bt8,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -22,37 +22,37 @@ pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
420 Line(s) of event code
|
||||
246 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
331 Line(s) of event code
|
||||
171 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
345 Line(s) of event code
|
||||
216 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
966 Line(s) of event code
|
||||
412 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
123 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
442 Line(s) of event code
|
||||
247 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
329 Line(s) of event code
|
||||
169 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
|
||||
244 Unique line(s) of event code
|
||||
444 Line(s) of event code
|
||||
249 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
292 Line(s) of event code
|
||||
235 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
964 Line(s) of event code
|
||||
410 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
12 Page(s)
|
||||
343 Component(s)
|
||||
3686 Line(s) of event code
|
||||
1017 Unique line(s) of event code
|
||||
3696 Line(s) of event code
|
||||
1019 Unique line(s) of event code
|
||||
|
||||
@@ -33,6 +33,8 @@ Page cardAlarm
|
||||
vis b9,0
|
||||
vis b10,0
|
||||
vis tCode,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -62,6 +62,8 @@ Page cardEntities
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -34,6 +34,8 @@ Page cardGrid
|
||||
vis tEntity4,0
|
||||
vis tEntity5,0
|
||||
vis tEntity6,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -18,7 +18,8 @@ Page cardMedia
|
||||
vis tTmp,0
|
||||
vis tId,0
|
||||
vis t5,0
|
||||
//vis nPageDisp,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
@@ -31,6 +31,8 @@ Page cardThermo
|
||||
vis bt6,0
|
||||
vis bt7,0
|
||||
vis bt8,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
|
||||
Reference in New Issue
Block a user