h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-24 00:14:26 +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-11-03 21:17:58 +01:00
parent 1e5b30db0e 98561ed593
commit 24e763db35
11 changed files with 102 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,23 +30,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
├── popupInSel.txt
│ @@ -14,14 +14,15 @@
│ Preinitialize Event
│ dim=dimValueNormal
│ //get entitiy name
│ tEntity.txt=pageIcons.tTmp1.txt
│ //get entity id
│ entn.txt=pageIcons.tTmp2.txt
│ tIcon1.txt=pageIcons.tTmp3.txt
│ + vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ vis bModeNext,0
│ //page open event
│ // event,pageOpenDetail,typeOfPage,tEntityName
├── popupLight.txt
│ @@ -369,15 +369,15 @@
│ Button bEffect

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

@@ -646,57 +646,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
├── popupInSel.txt
│ @@ -14,14 +14,15 @@
│ Preinitialize Event
│ dim=dimValueNormal
│ //get entitiy name
│ tEntity.txt=pageIcons.tTmp1.txt
│ //get entity id
│ entn.txt=pageIcons.tTmp2.txt
│ tIcon1.txt=pageIcons.tTmp3.txt
│ + vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ vis bModeNext,0
│ //page open event
│ // event,pageOpenDetail,typeOfPage,tEntityName
│ @@ -69,15 +70,15 @@
│ Scope: local
│ Value: 0
│
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 960
│ + Max. Text Size: 500
│
│ Variable (string) tId
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 20
│
│ @@ -105,15 +106,15 @@
│ Text :
│ Max. Text Size: 40
│
│ Variable (string) vaModeList
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 900
│ + Max. Text Size: 400
│
│ Variable (int32) vaModePos
│ Attributes
│ Scope: local
│ Value: 0
│
│ Variable (string) vaType
├── popupLight.txt
│ @@ -19,15 +19,14 @@
│ entn.txt=pageIcons.tTmp2.txt
@@ -714,59 +663,3 @@
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -362,31 +361,14 @@
│ //enable color temp
│ vis t4,1
│ vis t3,1
│ vis hTempSlider,1
│ }
│ }
│
│ -Button bEffect
│ - Attributes
│ - Scope : local
│ - Dragging : 0
│ - Disable release event after dragging: 0
│ - Send Component ID : disabled
│ - State : unpressed
│ - Text : 
│ - Max. Text Size : 10
│ -
│ - Events
│ - Touch Press Event
│ - pageIcons.tTmp1.txt=tEntity.txt
│ - pageIcons.tTmp2.txt=entn.txt
│ - pageIcons.tTmp3.txt=tIcon1.txt
│ - page popupInSel
│ -
│ Dual-state Button btOnOff1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ State : unpressed
│ @@ -571,23 +553,14 @@
│ }
│ // set t0 Color (Localization)
│ spstr strCommand.txt,t0.txt,"~",8
│ // set t4 Temperature (Localization)
│ spstr strCommand.txt,t4.txt,"~",9
│ // set t1 Brightness (Localization)
│ spstr strCommand.txt,t1.txt,"~",10
│ - // activate effect button
│ - spstr strCommand.txt,tTmp.txt,"~",11
│ - if(tTmp.txt=="enable")
│ - {
│ - vis bEffect,1
│ - }else
│ - {
│ - vis bEffect,0
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-11-03 19:53:37.881971155 +0000
+++ /dev/fd/62 2022-11-03 20:10:09.477176547 +0000
+14 +116,20 @@
+e (string) strCommand
+ Max. Text Size: 500
@@ -114,37 +114,6 @@
+ if(type5.txt=="button"||type5.txt=="input_sel")
+15 +118,15 @@
+end
+pupInSel.txt
+4 +14,15 @@
+ Preinitialize Event
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+ //get entity id
+ entn.txt=pageIcons.tTmp2.txt
+ tIcon1.txt=pageIcons.tTmp3.txt
+ vis p0,0
+ vis tSend,0
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
+ vis bModeNext,0
+ //page open event
+ // event,pageOpenDetail,typeOfPage,tEntityName
+5 +70,15 @@
+e (string) strCommand
+ Scope : local
+ Text :
+ Max. Text Size: 960
+ Max. Text Size: 500
+e (string) tId
+ Max. Text Size: 20
+
+15 +106,15 @@
+ Text :
+ Max. Text Size: 40
+ Max. Text Size: 900
+e (string) vaType
+pupLight.txt
+5 +19,14 @@
+ entn.txt=pageIcons.tTmp2.txt
@@ -159,45 +128,3 @@
+ // event,pageOpenDetail,typeOfPage,tEntityName
+ // craft command
+ tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+31 +361,14 @@
+ //enable color temp
+ vis t4,1
+ vis t3,1
+ vis hTempSlider,1
+ }
+ }
+bEffect
+ Text : 
+ Max. Text Size : 10
+ pageIcons.tTmp1.txt=tEntity.txt
+ pageIcons.tTmp2.txt=entn.txt
+ pageIcons.tTmp3.txt=tIcon1.txt
+ page popupInSel
+ate Button btOnOff1
+23 +553,14 @@
+ }
+ // set t0 Color (Localization)
+ spstr strCommand.txt,t0.txt,"~",8
+ // set t4 Temperature (Localization)
+ spstr strCommand.txt,t4.txt,"~",9
+ // set t1 Brightness (Localization)
+ spstr strCommand.txt,t1.txt,"~",10
+ // activate effect button
+ spstr strCommand.txt,tTmp.txt,"~",11
+ if(tTmp.txt=="enable")
+ {
+ vis bEffect,1
+ }else
+ {
+ vis bEffect,0
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")

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

@@ -23,9 +23,9 @@ popupShutter
394 Line(s) of event code
216 Unique line(s) of event code
popupLight
27 Component(s)
391 Line(s) of event code
214 Unique line(s) of event code
28 Component(s)
403 Line(s) of event code
222 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
@@ -73,6 +73,6 @@ cardEntities
Total
17 Page(s)
582 Component(s)
7206 Line(s) of event code
1871 Unique line(s) of event code
583 Component(s)
7218 Line(s) of event code
1875 Unique line(s) of event code

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

@@ -86,7 +86,7 @@ Variable (string) strCommand
ID : 8
Scope : local
Text :
Max. Text Size: 500
Max. Text Size: 960
Variable (string) tId
Attributes
@@ -128,7 +128,7 @@ Variable (string) vaModeList
ID : 18
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 900
Variable (int32) vaModePos
Attributes

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

@@ -155,7 +155,7 @@ Text t1
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 341
y coordinate : 374
Width : 240
Height : 30
Effect : load
@@ -185,7 +185,7 @@ Text t2
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 382
y coordinate : 415
Width : 45
Height : 30
Effect : load
@@ -215,7 +215,7 @@ Text t3
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 274
y coordinate : 307
Width : 45
Height : 30
Effect : load
@@ -245,7 +245,7 @@ Text t4
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 234
y coordinate : 267
Width : 242
Height : 30
Effect : load
@@ -335,7 +335,7 @@ Text tId
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 416
y coordinate : 417
Width : 100
Height : 30
Effect : load
@@ -365,7 +365,7 @@ Text tInstruction
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 416
y coordinate : 417
Width : 100
Height : 30
Effect : load
@@ -395,7 +395,7 @@ Text tTmp
Send Component ID : disabled
Opacity : 127
x coordinate : 282
y coordinate : 412
y coordinate : 413
Width : 34
Height : 30
Effect : load
@@ -425,7 +425,7 @@ Picture p0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
y coordinate : 1
Width : 319
Height : 479
Effect : load
@@ -487,7 +487,7 @@ Slider hBrightness
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 376
y coordinate : 409
Width : 250
Height : 44
Effect : load
@@ -532,7 +532,7 @@ Slider hTempSlider
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 271
y coordinate : 304
Width : 250
Height : 44
Effect : load
@@ -672,6 +672,45 @@ Button bColor
}
}
Button bEffect
Attributes
ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 195
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
ID : 8
@@ -884,6 +923,15 @@ Timer tmSerial
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{

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

@@ -74,7 +74,7 @@ Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 500
Max. Text Size: 960
Variable (string) tId
Attributes
@@ -110,7 +110,7 @@ Variable (string) vaModeList
Attributes
Scope : local
Text :
Max. Text Size: 400
Max. Text Size: 900
Variable (int32) vaModePos
Attributes

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

@@ -365,6 +365,23 @@ Button bColor
}
}
Button bEffect
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -557,6 +574,15 @@ Timer tmSerial
spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10
// activate effect button
spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable")
{
vis bEffect,1
}else
{
vis bEffect,0
}
}
if(tInstruction.txt=="time")
{

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

@@ -22,10 +22,6 @@ popupNotify
19 Component(s)
253 Line(s) of event code
164 Unique line(s) of event code
popupInSel
34 Component(s)
528 Line(s) of event code
256 Unique line(s) of event code
pageStartup
19 Component(s)
172 Line(s) of event code
@@ -66,6 +62,10 @@ popupThermo
44 Component(s)
515 Line(s) of event code
272 Unique line(s) of event code
popupInSel
34 Component(s)
529 Line(s) of event code
257 Unique line(s) of event code
cardThermo
53 Component(s)
608 Line(s) of event code
@@ -74,5 +74,5 @@ cardThermo
Total
17 Page(s)
577 Component(s)
7044 Line(s) of event code
7045 Line(s) of event code
1816 Unique line(s) of event code

1
HMI/n2t-out-visual/popupInSel.txt
View File

@@ -26,6 +26,7 @@ Page popupInSel
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0

1
HMI/n2t-out/popupInSel.txt
View File

@@ -18,6 +18,7 @@ Page popupInSel
//get entity id
entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0
vis tTmp,0
vis tInstruction,0