h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-21 06:54:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2023-08-20 14:39:27 +02:00
parent 48e9d2c8a3 306a189d79
commit a1104b8f81
18 changed files with 230 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
HMI/US/landscape/diff-eu-version.txt
View File

@@ -185,23 +185,6 @@
│ if(tInstruction.txt=="date") │ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -141,15 +141,15 @@
│
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 52
│ + Text : 51
│ Max. Text Size : 10
│
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +164,15 @@ │ @@ -164,15 +164,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
@@ -240,6 +223,25 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0 │ covx tTmp.txt,sleepTimeout,0,0
│ } │ }
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/landscape/n2t-out/popupLight.txt
│ @@ -631,15 +631,15 @@
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ if(tId.txt=="cardGrid2")
│ {
│ - page cardGrid2
│ + page cardGrid
│ }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ --- HMI/n2t-out/popupNotify.txt │ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt ├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@ │ @@ -295,19 +295,14 @@
@@ -317,6 +319,36 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : | │ Text : |
│ @@ -702,29 +679,14 @@
│ }
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,tNotifyText.pco,0,0
│ }
│ }
│ - if(tInstruction.txt=="getBrightness")
│ - {
│ - tSend.txt="event,getBrightnessResponse,"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs dim,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/landscape/n2t-out/screensaver2.txt ├── +++ HMI/US/landscape/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

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

@@ -18,6 +18,10 @@ popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
pageStartup
20 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
437 Line(s) of event code 437 Line(s) of event code
@@ -26,10 +30,6 @@ popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
297 Unique line(s) of event code 297 Unique line(s) of event code
pageStartup
20 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
pageTest pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
@@ -62,10 +62,6 @@ cardGrid2
52 Component(s) 52 Component(s)
611 Line(s) of event code 611 Line(s) of event code
335 Unique line(s) of event code 335 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
cardLChart cardLChart
33 Component(s) 33 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -94,9 +90,13 @@ cardEntities
67 Component(s) 67 Component(s)
1170 Line(s) of event code 1170 Line(s) of event code
532 Unique line(s) of event code 532 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
226 Unique line(s) of event code
Total Total
23 Page(s) 23 Page(s)
875 Component(s) 875 Component(s)
10331 Line(s) of event code 10335 Line(s) of event code
2403 Unique line(s) of event code 2403 Unique line(s) of event code

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

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -982,6 +982,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

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

@@ -145,7 +145,7 @@ Text tVersion
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -633,6 +633,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

64
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1688,23 +1688,6 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ @@ -141,15 +135,15 @@
│
│ Text tVersion
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ - Text : 52
│ + Text : 51
│ Max. Text Size : 10
│
│ Picture p0
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -164,15 +158,15 @@ │ @@ -164,15 +158,15 @@
│ Max. Text Size : 10 │ Max. Text Size : 10
│ │
@@ -1779,6 +1762,23 @@
│ Variable (string) entn │ Variable (string) entn
│ Attributes │ Attributes
│ Scope : local │ Scope : local
│ @@ -631,15 +631,15 @@
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ }
│ if(tId.txt=="cardGrid2")
│ {
│ - page cardGrid2
│ + page cardGrid
│ }
│ if(tId.txt=="popupLight")
│ {
│ pageIcons.tTmp1.txt=tTmp.txt
│ page popupLight
│ }
│ if(tId.txt=="popupShutter")
│ --- HMI/n2t-out/popupNotify.txt │ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt ├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@ │ @@ -295,19 +295,14 @@
@@ -1877,6 +1877,36 @@
│ spstr strCommand.txt,tTmp.txt,"~",1 │ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,tTime.bco,0,0 │ covx tTmp.txt,tTime.bco,0,0
│ if(tTime.bco!=screensaver.bco) │ if(tTime.bco!=screensaver.bco)
│ @@ -702,29 +673,14 @@
│ }
│ spstr strCommand.txt,tTmp.txt,"~",4
│ if(tTmp.txt!="")
│ {
│ covx tTmp.txt,tNotifyText.pco,0,0
│ }
│ }
│ - if(tInstruction.txt=="getBrightness")
│ - {
│ - tSend.txt="event,getBrightnessResponse,"
│ - //send calc crc
│ - btlen tSend.txt,sys0
│ - crcrest 1,0xffff // reset CRC
│ - crcputh 55 bb
│ - crcputs sys0,2
│ - crcputs dim,0
│ - //send cmd
│ - printh 55 bb
│ - prints sys0,2
│ - prints tSend.txt,0
│ - prints crcval,2
│ - }
│ if(tInstruction.txt=="pageType")
│ {
│ dim=100
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ --- HMI/n2t-out/screensaver2.txt │ --- HMI/n2t-out/screensaver2.txt
├── +++ HMI/US/portrait/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-08-08 20:49:02.082432386 +0000 +++ /dev/fd/62 2023-08-20 12:32:07.109670758 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@ +1 +12,11 @@
@@ -1245,23 +1245,6 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Send Component ID : disabled + Send Component ID : disabled
+15 +135,15 @@
+
+ersion
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 52
+ Text : 51
+ Max. Text Size : 10
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+15 +158,15 @@ +15 +158,15 @@
+ Max. Text Size : 10 + Max. Text Size : 10
+20 +269,14 @@ +20 +269,14 @@
@@ -1321,6 +1304,23 @@
+e (string) entn +e (string) entn
+ributes +ributes
+ Scope : local + Scope : local
+15 +631,15 @@
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
+ }
+ if(tId.txt=="cardGrid2")
+ {
+ page cardGrid2
+ page cardGrid
+ }
+ if(tId.txt=="popupLight")
+ {
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+ if(tId.txt=="popupShutter")
+I/n2t-out/popupNotify.txt +I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt ++ HMI/US/portrait/n2t-out/popupNotify.txt
+19 +295,14 @@ +19 +295,14 @@
@@ -1419,6 +1419,36 @@
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,tTime.bco,0,0 + covx tTmp.txt,tTime.bco,0,0
+ if(tTime.bco!=screensaver.bco) + if(tTime.bco!=screensaver.bco)
+29 +673,14 @@
+ }
+ spstr strCommand.txt,tTmp.txt,"~",4
+ if(tTmp.txt!="")
+ {
+ covx tTmp.txt,tNotifyText.pco,0,0
+ }
+ }
+ if(tInstruction.txt=="getBrightness")
+ {
+ tSend.txt="event,getBrightnessResponse,"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs dim,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ }
+ if(tInstruction.txt=="pageType")
+ {
+ dim=100
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+I/n2t-out/screensaver2.txt +I/n2t-out/screensaver2.txt
++ HMI/US/portrait/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt
+7 +28,14 @@ +7 +28,14 @@

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

@@ -22,10 +22,10 @@ popupTimer
42 Component(s) 42 Component(s)
516 Line(s) of event code 516 Line(s) of event code
257 Unique line(s) of event code 257 Unique line(s) of event code
popupLight pageStartup
28 Component(s) 19 Component(s)
408 Line(s) of event code 193 Line(s) of event code
225 Unique line(s) of event code 135 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
355 Line(s) of event code 355 Line(s) of event code
@@ -34,10 +34,6 @@ popupLightNew
23 Component(s) 23 Component(s)
412 Line(s) of event code 412 Line(s) of event code
209 Unique line(s) of event code 209 Unique line(s) of event code
pageStartup
19 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
cardChart cardChart
33 Component(s) 33 Component(s)
437 Line(s) of event code 437 Line(s) of event code
@@ -50,6 +46,10 @@ cardLChart
33 Component(s) 33 Component(s)
402 Line(s) of event code 402 Line(s) of event code
266 Unique line(s) of event code 266 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
226 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
402 Line(s) of event code 402 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
890 Component(s) 890 Component(s)
10819 Line(s) of event code 10823 Line(s) of event code
2527 Unique line(s) of event code 2527 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -389,7 +389,7 @@ Text tVersion
Horizontal Alignment: center Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

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

@@ -982,6 +982,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -139,7 +139,7 @@ Text tVersion
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : 51 Text : 52
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

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

@@ -633,6 +633,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

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

@@ -26,10 +26,6 @@ popupLightNew
23 Component(s) 23 Component(s)
412 Line(s) of event code 412 Line(s) of event code
209 Unique line(s) of event code 209 Unique line(s) of event code
popupLight
28 Component(s)
408 Line(s) of event code
225 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
271 Line(s) of event code 271 Line(s) of event code
@@ -58,10 +54,10 @@ cardAlarm
43 Component(s) 43 Component(s)
500 Line(s) of event code 500 Line(s) of event code
273 Unique line(s) of event code 273 Unique line(s) of event code
screensaver popupLight
47 Component(s) 28 Component(s)
444 Line(s) of event code 412 Line(s) of event code
316 Unique line(s) of event code 227 Unique line(s) of event code
cardThermo cardThermo
57 Component(s) 57 Component(s)
540 Line(s) of event code 540 Line(s) of event code
@@ -78,6 +74,10 @@ popupInSel
34 Component(s) 34 Component(s)
621 Line(s) of event code 621 Line(s) of event code
297 Unique line(s) of event code 297 Unique line(s) of event code
screensaver
47 Component(s)
457 Line(s) of event code
327 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
531 Line(s) of event code 531 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total Total
23 Page(s) 23 Page(s)
878 Component(s) 878 Component(s)
10404 Line(s) of event code 10421 Line(s) of event code
2418 Unique line(s) of event code 2421 Unique line(s) of event code

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

@@ -982,6 +982,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

15
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1299,6 +1299,21 @@ Timer tmSerial
covx tTmp.txt,tNotifyText.pco,0,0 covx tTmp.txt,tNotifyText.pco,0,0
} }
} }
if(tInstruction.txt=="getBrightness")
{
tSend.txt="event,getBrightnessResponse,"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs dim,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100

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

@@ -633,6 +633,10 @@ Timer tmSerial
{ {
page cardGrid page cardGrid
} }
if(tId.txt=="cardGrid2")
{
page cardGrid2
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt

15
HMI/n2t-out/screensaver.txt
View File

@@ -706,6 +706,21 @@ Timer tmSerial
covx tTmp.txt,tNotifyText.pco,0,0 covx tTmp.txt,tNotifyText.pco,0,0
} }
} }
if(tInstruction.txt=="getBrightness")
{
tSend.txt="event,getBrightnessResponse,"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs dim,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
dim=100 dim=100