h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-13 00:27:12 +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-06-06 20:37:29 +00:00
committed by github-actions[bot]
parent 7eea343bef
commit 69a2a431cb
12 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
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-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:32:17.830992218 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:37:24.258297598 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset - // fix touch offset
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 20:32:17.834992421 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:32:17.834992421 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:37:24.258297598 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +23,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:32:17.830992218 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:37:24.258297598 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -99,8 +85,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:32:17.834992421 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:37:24.258297598 +0000
@@ -1152,10 +1152,6 @@ @@ -1152,10 +1152,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -113,8 +99,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
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-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:32:17.830992218 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:37:24.258297598 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -124,42 +110,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -273,10 +273,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 20:32:17.830992218 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 20:32:17.830992218 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{

4
HMI/US/landscape/n2t-out-visual/cardEntities.txt
View File

@@ -2897,6 +2897,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

26
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,18 +10,10 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
popupNotify
17 Component(s)
201 Line(s) of event code
126 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 157 Line(s) of event code
115 Unique line(s) of event code 117 Unique line(s) of event code
popupLight
27 Component(s)
349 Line(s) of event code
189 Unique line(s) of event code
cardMedia cardMedia
33 Component(s) 33 Component(s)
347 Line(s) of event code 347 Line(s) of event code
@@ -34,6 +26,10 @@ cardGrid
42 Component(s) 42 Component(s)
436 Line(s) of event code 436 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
popupNotify
17 Component(s)
204 Line(s) of event code
128 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
330 Line(s) of event code 330 Line(s) of event code
@@ -48,8 +44,12 @@ screensaver
253 Unique line(s) of event code 253 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1130 Line(s) of event code 1133 Line(s) of event code
494 Unique line(s) of event code 496 Unique line(s) of event code
popupLight
27 Component(s)
352 Line(s) of event code
191 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
392 Line(s) of event code 392 Line(s) of event code
@@ -58,5 +58,5 @@ cardAlarm
Total Total
13 Page(s) 13 Page(s)
411 Component(s) 411 Component(s)
4608 Line(s) of event code 4620 Line(s) of event code
1220 Unique line(s) of event code 1220 Unique line(s) of event code

4
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -568,6 +568,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out-visual/popupLight.txt
View File

@@ -907,6 +907,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out-visual/popupNotify.txt
View File

@@ -520,6 +520,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out/cardEntities.txt
View File

@@ -1925,6 +1925,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -273,6 +273,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -561,6 +561,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/landscape/n2t-out/popupNotify.txt
View File

@@ -311,6 +311,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

16
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-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
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-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,8 @@ 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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-06-06 20:32:16.934946602 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +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

18
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:32:17.386969613 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:37:23.814292644 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:32:16.934946602 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:32:17.370968799 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:32:17.374969002 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:32:17.374969002 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,5 +59,5 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:32:17.374969002 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000