h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-16 18:06:59 +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-04-13 20:21:36 +00:00
committed by github-actions[bot]
parent d215029319
commit cc40d38c41
9 changed files with 315 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
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-04-13 20:17:06.882470529 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:17:07.698466051 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:21:35.478242275 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:17:07.698466051 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:21:35.478242275 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:17:07.698466051 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:21:35.478242275 +0000
@@ -570,43 +570,25 @@
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
@@ -76,8 +76,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:17:07.698466051 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:21:34.698226402 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:21:35.478242275 +0000
@@ -48,18 +48,6 @@
Scope: local
Value: 0
@@ -124,81 +124,3 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
Picture p0
Attributes
Scope : local
@@ -450,77 +458,6 @@
//tMR
spstr strCommand.txt,tMR.txt,"~",16
}
- if(tInstruction.txt=="color")
- {
- spstr strCommand.txt,tTmp.txt,"~",1
- covx tTmp.txt,tTime.bco,0,0
- screensaver.bco=tTime.bco
- tAMPM.bco=tTime.bco
- tDate.bco=tTime.bco
- tMainIcon.bco=tTime.bco
- tMainText.bco=tTime.bco
- tMainIconAlt.bco=tTime.bco
- tMainTextAlt.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tMR.bco=tTime.bco
- tMRIcon.bco=tTime.bco
- tForecast1.bco=tTime.bco
- tForecast1Val.bco=tTime.bco
- tF1Icon.bco=tTime.bco
- tForecast2.bco=tTime.bco
- tForecast2Val.bco=tTime.bco
- tF2Icon.bco=tTime.bco
- tForecast3.bco=tTime.bco
- tForecast3Val.bco=tTime.bco
- tF3Icon.bco=tTime.bco
- tForecast4.bco=tTime.bco
- tForecast4Val.bco=tTime.bco
- tF4Icon.bco=tTime.bco
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,tTime.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",3
- covx tTmp.txt,tAMPM.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",4
- covx tTmp.txt,tDate.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,tMainIcon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",6
- covx tTmp.txt,tMainText.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",7
- covx tTmp.txt,tForecast1.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",8
- covx tTmp.txt,tForecast2.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",9
- covx tTmp.txt,tForecast3.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",10
- covx tTmp.txt,tForecast4.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",11
- covx tTmp.txt,tF1Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",12
- covx tTmp.txt,tF2Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",13
- covx tTmp.txt,tF3Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",14
- covx tTmp.txt,tF4Icon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",15
- covx tTmp.txt,tForecast1Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",16
- covx tTmp.txt,tForecast2Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",17
- covx tTmp.txt,tForecast3Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tForecast4Val.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",19
- covx tTmp.txt,t10.bco,0,0
- spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tMainIconAlt.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",21
- covx tTmp.txt,tMainTextAlt.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",22
- covx tTmp.txt,tMRIcon.pco,0,0
- spstr strCommand.txt,tTmp.txt,"~",23
- covx tTmp.txt,tMR.pco,0,0
- }
if(tInstruction.txt=="pageType")
{
dim=100

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

@@ -10,10 +10,6 @@ pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
screensaver
33 Component(s)
195 Line(s) of event code
152 Unique line(s) of event code
cardMedia
30 Component(s)
329 Line(s) of event code
@@ -50,9 +46,13 @@ popupLight
27 Component(s)
320 Line(s) of event code
173 Unique line(s) of event code
screensaver
33 Component(s)
266 Line(s) of event code
218 Unique line(s) of event code
Total
12 Page(s)
341 Component(s)
3571 Line(s) of event code
947 Unique line(s) of event code
3642 Line(s) of event code
1001 Unique line(s) of event code

71
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -980,6 +980,77 @@ Timer tmSerial
//tMR
spstr strCommand.txt,tMR.txt,"~",16
}
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMainTextAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType")
{
dim=100

71
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -458,6 +458,77 @@ Timer tmSerial
//tMR
spstr strCommand.txt,tMR.txt,"~",16
}
if(tInstruction.txt=="color")
{
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,tTime.bco,0,0
screensaver.bco=tTime.bco
tAMPM.bco=tTime.bco
tDate.bco=tTime.bco
tMainIcon.bco=tTime.bco
tMainText.bco=tTime.bco
tMainIconAlt.bco=tTime.bco
tMainTextAlt.bco=tTime.bco
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco
tForecast2.bco=tTime.bco
tForecast2Val.bco=tTime.bco
tF2Icon.bco=tTime.bco
tForecast3.bco=tTime.bco
tForecast3Val.bco=tTime.bco
tF3Icon.bco=tTime.bco
tForecast4.bco=tTime.bco
tForecast4Val.bco=tTime.bco
tF4Icon.bco=tTime.bco
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,tTime.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,tAMPM.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,tDate.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,tMainIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,tMainText.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,tForecast1.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,tForecast2.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",9
covx tTmp.txt,tForecast3.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,tForecast4.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",11
covx tTmp.txt,tF1Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,tF2Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",13
covx tTmp.txt,tF3Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,tF4Icon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",15
covx tTmp.txt,tForecast1Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,tForecast2Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",17
covx tTmp.txt,tForecast3Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,tForecast4Val.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",19
covx tTmp.txt,t10.bco,0,0
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tMainIconAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",21
covx tTmp.txt,tMainTextAlt.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tMRIcon.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
if(tInstruction.txt=="pageType")
{
dim=100