h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-30 19:34:19 +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-03 16:17:17 +00:00
committed by github-actions[bot]
parent b3669156a5
commit 9ae260693d
12 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
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
--- HMI/n2t-out/Program.s.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-03 16:17:11.076230727 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-03 16:17:12.100247628 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-03 16:17:12.104247694 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-03 16:17:12.104247694 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-03 16:17:12.104247694 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -99,8 +99,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-03 16:17:12.104247694 +0000
@@ -1170,10 +1170,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -113,8 +113,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-03 16:17:12.104247694 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-03 16:17:12.104247694 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -150,8 +150,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-03 16:17:11.076230727 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-03 16:17:12.104247694 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -164,8 +164,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-03 16:17:12.104247694 +0000
@@ -406,10 +406,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -178,8 +178,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-03 16:17:12.104247694 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0

9
HMI/US/landscape/n2t-out-visual/cardAlarm.txt
View File

@@ -750,8 +750,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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

@@ -52,11 +52,11 @@ screensaver
244 Unique line(s) of event code
cardAlarm
40 Component(s)
387 Line(s) of event code
237 Unique line(s) of event code
392 Line(s) of event code
239 Unique line(s) of event code
Total
13 Page(s)
408 Component(s)
4495 Line(s) of event code
1192 Unique line(s) of event code
4500 Line(s) of event code
1194 Unique line(s) of event code

9
HMI/US/landscape/n2t-out/cardAlarm.txt
View File

@@ -340,8 +340,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

20
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
--- HMI/n2t-out/Program.s.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 10:28:27.854115047 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-03 16:17:11.076230727 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 16:17:11.580239046 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 10:28:27.854115047 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 16:17:11.584239112 +0000
@@ -63,6 +63,16 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 10:28:27.854115047 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 16:17:11.584239112 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 10:28:27.854115047 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 16:17:11.584239112 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 10:28:27.854115047 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 16:17:11.584239112 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-03 10:28:27.866115231 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 10:28:27.854115047 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-03 16:17:11.596239310 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-03 16:17:11.076230727 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-03 16:17:11.580239046 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-03 16:17:11.080230793 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-03 16:17:11.584239112 +0000
+@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-06-03 16:17:11.080230793 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-03 16:17:11.584239112 +0000
+@@ -45,12 +45,6 @@
+ Scope: local
+ Value: 0
@@ -59,10 +59,10 @@
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 10:28:27.854115047 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-06-03 16:17:11.080230793 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-03 16:17:11.584239112 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-03 16:17:11.080230793 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-03 16:17:11.584239112 +0000
+@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19

9
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -750,8 +750,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -44,8 +44,8 @@ cardMedia
183 Unique line(s) of event code
cardAlarm
40 Component(s)
387 Line(s) of event code
237 Unique line(s) of event code
392 Line(s) of event code
239 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
@@ -58,5 +58,5 @@ screensaver
Total
13 Page(s)
420 Component(s)
4735 Line(s) of event code
1249 Unique line(s) of event code
4740 Line(s) of event code
1251 Unique line(s) of event code

9
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -340,8 +340,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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

@@ -750,8 +750,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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

@@ -44,8 +44,8 @@ cardGrid
259 Unique line(s) of event code
cardAlarm
40 Component(s)
387 Line(s) of event code
237 Unique line(s) of event code
392 Line(s) of event code
239 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total
13 Page(s)
409 Component(s)
4543 Line(s) of event code
1209 Unique line(s) of event code
4548 Line(s) of event code
1211 Unique line(s) of event code

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

@@ -340,8 +340,13 @@ Button b9
Touch Press Event
// event,buttonPress2,entn,arm1,tCode
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+=vaAddBtn.txt
if(vaAddBtn.txt!="")
{
tSend.txt+=vaAddBtn.txt+",button"
}else
{
tSend.txt+=entn.txt+",opnSensorNotify"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC