h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 22:18:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2022-04-13 22:21:11 +02:00
parent ea28a41836 380320da6b
commit 5efd4a6238
6 changed files with 76 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-04-13 20:13:59.313209160 +0000 --- 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:14:00.109218807 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-13 20:17:07.698466051 +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/landscape/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/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-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:14:00.109218807 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-13 20:17:07.698466051 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/popupLight.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:14:00.109218807 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-13 20:17:07.698466051 +0000
@@ -570,43 +570,25 @@ @@ -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 ... //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 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") if(tId.txt=="cardAlarm")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:14:00.109218807 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-04-13 20:17:07.698466051 +0000
@@ -48,18 +48,6 @@ @@ -48,18 +48,6 @@
Scope: local Scope: local
Value: 0 Value: 0

69
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-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +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-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -427,8 +427,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/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-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +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
@@ -447,62 +447,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/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
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +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
bufferPos=0
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
+ if(tId.txt=="cardMedia")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
+ page cardMedia
}
- if(tId.txt=="popupShutter")
+ if(tId.txt=="pageStartup")
{
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
+ page pageStartup
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
- if(tId.txt=="cardThermo")
- {
- page cardThermo
- }
- if(tId.txt=="cardMedia")
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 --- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000
@@ -450,77 +450,6 @@ @@ -450,77 +450,6 @@
//tMR //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:13:59.713214007 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-04-13 20:17:07.294468268 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-13 20:13:59.313209160 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-13 20:17:06.882470529 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:13:59.697213814 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-13 20:17:07.278468356 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:13:59.313209160 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-13 20:17:06.886470507 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:13:59.701213862 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-13 20:17:07.278468356 +0000
+@@ -62,6 +62,16 @@ +@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@ +@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@ +@@ -153,6 +175,15 @@
@@ -15,64 +15,11 @@
+ } + }
+ if(tInstruction.txt=="pageType") + if(tInstruction.txt=="pageType")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:13:59.313209160 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-13 20:17:06.886470507 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:13:59.697213814 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-13 20:17:07.278468356 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-13 20:13:59.313209160 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-13 20:13:59.697213814 +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
+ bufferPos=0
+- if(tId.txt=="pageStartup")
+- {
+- page pageStartup
+- }
+- if(tId.txt=="screensaver")
+- {
+- page screensaver
+- }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+- if(tId.txt=="cardGrid")
+- {
+- page cardGrid
+- }
+- if(tId.txt=="popupLight")
++ if(tId.txt=="cardMedia")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupLight
++ page cardMedia
+ }
+- if(tId.txt=="popupShutter")
++ if(tId.txt=="pageStartup")
+ {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupShutter
++ page pageStartup
+ }
+ if(tId.txt=="popupNotify")
+ {
+ page popupNotify
+ }
+- if(tId.txt=="cardThermo")
+- {
+- page cardThermo
+- }
+- if(tId.txt=="cardMedia")
++ if(tId.txt=="cardGrid")
+ {
+- page cardMedia
++ page cardGrid
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-13 20:13:59.313209160 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-13 20:17:06.886470507 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:13:59.697213814 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-13 20:17:07.278468356 +0000
+@@ -450,77 +450,6 @@ +@@ -450,77 +450,6 @@
+ //tMR + //tMR
+ spstr strCommand.txt,tMR.txt,"~",16 + spstr strCommand.txt,tMR.txt,"~",16

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

@@ -24,8 +24,8 @@ pageStartup
113 Unique line(s) of event code 113 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
320 Line(s) of event code 338 Line(s) of event code
173 Unique line(s) of event code 182 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
195 Line(s) of event code 195 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total Total
12 Page(s) 12 Page(s)
353 Component(s) 353 Component(s)
3764 Line(s) of event code 3782 Line(s) of event code
1003 Unique line(s) of event code 1003 Unique line(s) of event code

30
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -916,25 +916,43 @@ Timer tmSerial
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities
} }
if(tId.txt=="cardMedia") if(tId.txt=="cardGrid")
{ {
page cardMedia page cardGrid
} }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
} }
if(tId.txt=="popupNotify") if(tId.txt=="popupNotify")
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid") if(tId.txt=="cardThermo")
{ {
page cardGrid page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
} }
if(tId.txt=="cardAlarm") if(tId.txt=="cardAlarm")
{ {

30
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -570,25 +570,43 @@ Timer tmSerial
//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 ... //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 udelete payloadLength-1
bufferPos=0 bufferPos=0
if(tId.txt=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")
{ {
page cardEntities page cardEntities
} }
if(tId.txt=="cardMedia") if(tId.txt=="cardGrid")
{ {
page cardMedia page cardGrid
} }
if(tId.txt=="pageStartup") if(tId.txt=="popupLight")
{ {
page pageStartup pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
} }
if(tId.txt=="popupNotify") if(tId.txt=="popupNotify")
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid") if(tId.txt=="cardThermo")
{ {
page cardGrid page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
} }
if(tId.txt=="cardAlarm") if(tId.txt=="cardAlarm")
{ {