mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-14 00:48:17 +01:00
Changed known diff
This commit is contained in:
jmbinette
@@ -27,16 +27,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ vis bText5,0
|
+ vis bText5,0
|
||||||
+ vis hSlider5,0
|
+ vis hSlider5,0
|
||||||
+ vis nNum5,0
|
+ vis nNum5,0
|
||||||
+ //ui e6
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis tIcon6,0
|
|
||||||
+ vis tEntity6,0
|
|
||||||
+ vis bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
|
|
||||||
Variable (string) strCommand
|
Variable (string) strCommand
|
||||||
Attributes
|
Attributes
|
||||||
@@ -50,23 +41,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ Text :
|
+ Text :
|
||||||
+ Max. Text Size: 70
|
+ Max. Text Size: 70
|
||||||
+
|
+
|
||||||
+Variable (string) entn6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+ Max. Text Size: 70
|
|
||||||
+
|
+
|
||||||
+Variable (string) type5
|
+Variable (string) type5
|
||||||
+ Attributes
|
+ Attributes
|
||||||
+ Scope : local
|
+ Scope : local
|
||||||
+ Text :
|
+ Text :
|
||||||
+ Max. Text Size: 10
|
+ Max. Text Size: 10
|
||||||
+
|
|
||||||
+Variable (string) type6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Text :
|
|
||||||
+ Max. Text Size: 10
|
|
||||||
+
|
+
|
||||||
Number nNum1
|
Number nNum1
|
||||||
Attributes
|
Attributes
|
||||||
@@ -84,15 +64,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ Associated Keyboard : none
|
+ Associated Keyboard : none
|
||||||
+ Value : 0
|
+ Value : 0
|
||||||
+
|
+
|
||||||
+Number nNum6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Associated Keyboard : none
|
|
||||||
+ Value : 0
|
|
||||||
+
|
|
||||||
Text tHeading
|
Text tHeading
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -120,26 +92,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ Text : î°
|
+ Text : î°
|
||||||
+ Max. Text Size : 5
|
+ Max. Text Size : 5
|
||||||
+
|
+
|
||||||
+Text tEntity6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Associated Keyboard : none
|
|
||||||
+ Text : tEntity6
|
|
||||||
+ Max. Text Size : 30
|
|
||||||
+
|
|
||||||
+Text tIcon6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Associated Keyboard : none
|
|
||||||
+ Text : î°
|
|
||||||
+ Max. Text Size : 5
|
|
||||||
+
|
|
||||||
Picture p0
|
Picture p0
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -175,34 +128,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ prints tSend.txt,0
|
+ prints tSend.txt,0
|
||||||
+ prints crcval,2
|
+ prints crcval,2
|
||||||
+
|
+
|
||||||
+Slider hSlider6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ Position : 50
|
|
||||||
+ Upper range limit : 100
|
|
||||||
+ Lower range limit : 0
|
|
||||||
+
|
|
||||||
+ Events
|
|
||||||
+ Touch Release Event
|
|
||||||
+ nNum6.val=hSlider6.val
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
|
|
||||||
+ covx nNum6.val,tTmp.txt,0,0
|
|
||||||
+ tSend.txt+=tTmp.txt
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
Button bDown1
|
Button bDown1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -310,106 +236,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ prints tSend.txt,0
|
+ prints tSend.txt,0
|
||||||
+ prints crcval,2
|
+ prints crcval,2
|
||||||
+
|
+
|
||||||
+Button bStop6
|
|
||||||
+ 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
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",stop"
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
+Button bDown6
|
|
||||||
+ 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
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",down"
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
+Button bUp6
|
|
||||||
+ 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
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",up"
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
+Button bText6
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+ State : unpressed
|
|
||||||
+ Text : newtxt
|
|
||||||
+ Max. Text Size : 10
|
|
||||||
+
|
|
||||||
+ Events
|
|
||||||
+ Touch Press Event
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
Dual-state Button btOnOff1
|
Dual-state Button btOnOff1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -444,33 +271,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ prints tSend.txt,0
|
+ prints tSend.txt,0
|
||||||
+ prints crcval,2
|
+ prints crcval,2
|
||||||
+
|
+
|
||||||
+Dual-state Button btOnOff6
|
|
||||||
+ 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
|
|
||||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
|
|
||||||
+ covx btOnOff6.val,tTmp.txt,0,0
|
|
||||||
+ tSend.txt+=tTmp.txt
|
|
||||||
+ //send calc crc
|
|
||||||
+ btlen tSend.txt,sys0
|
|
||||||
+ crcrest 1,0xffff // reset CRC
|
|
||||||
+ crcputh 55 bb
|
|
||||||
+ crcputs sys0,1
|
|
||||||
+ crcputs tSend.txt,0
|
|
||||||
+ //send cmd
|
|
||||||
+ printh 55 bb
|
|
||||||
+ prints sys0,2
|
|
||||||
+ prints tSend.txt,0
|
|
||||||
+ prints crcval,2
|
|
||||||
+
|
|
||||||
Hotspot mSpecial
|
Hotspot mSpecial
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -500,28 +301,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ page popupLight
|
+ page popupLight
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+Hotspot m5
|
|
||||||
+ Attributes
|
|
||||||
+ Scope : local
|
|
||||||
+ Dragging : 0
|
|
||||||
+ Disable release event after dragging: 0
|
|
||||||
+ Send Component ID : disabled
|
|
||||||
+
|
|
||||||
+ Events
|
|
||||||
+ Touch Press Event
|
|
||||||
+ pageIcons.tTmp1.txt=tEntity6.txt
|
|
||||||
+ pageIcons.tTmp2.txt=entn6.txt
|
|
||||||
+ if(type6.txt=="shutter")
|
|
||||||
+ {
|
|
||||||
+ //popupShutter.tHeading.txt=tEntity6.txt
|
|
||||||
+ page popupShutter
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ //popupLight.tEntity.txt=tEntity6.txt
|
|
||||||
+ page popupLight
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
Timer tmSerial
|
Timer tmSerial
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
@@ -651,132 +431,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
+ covx tTmp.txt,sys0,0,0
|
+ covx tTmp.txt,sys0,0,0
|
||||||
+ hSlider5.maxval=sys0
|
+ hSlider5.maxval=sys0
|
||||||
+ }
|
+ }
|
||||||
+ // get Type
|
|
||||||
+ spstr strCommand.txt,type6.txt,"~",33
|
|
||||||
+ // get internal name
|
|
||||||
+ spstr strCommand.txt,entn6.txt,"~",34
|
|
||||||
+ if(type6.txt=="delete"||type6.txt=="")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis tEntity6,0
|
|
||||||
+ vis tIcon6,0
|
|
||||||
+ vis bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ }else
|
|
||||||
+ {
|
|
||||||
+ // change icon
|
|
||||||
+ spstr strCommand.txt,tIcon6.txt,"~",35
|
|
||||||
+ vis tIcon6,1
|
|
||||||
+ // change icon color
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",36
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ tIcon6.pco=sys0
|
|
||||||
+ // set name
|
|
||||||
+ spstr strCommand.txt,tEntity6.txt,"~",37
|
|
||||||
+ vis tEntity6,1
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="shutter")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,1
|
|
||||||
+ vis bStop6,1
|
|
||||||
+ vis bDown6,1
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="light")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,1
|
|
||||||
+ vis bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",38
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff6.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="switch")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,1
|
|
||||||
+ vis bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ // get Button State (optional Value)
|
|
||||||
+ spstr strCommand.txt,tTmp.txt,"~",38
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ btOnOff6.val=sys0
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="text")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis bText6,1
|
|
||||||
+ tsw bText6,0
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ bText6.pco=65535
|
|
||||||
+ bText6.pco2=65535
|
|
||||||
+ // get Text (optional Value)
|
|
||||||
+ spstr strCommand.txt,bText6.txt,"~",38
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="button")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis bText6,1
|
|
||||||
+ tsw bText6,1
|
|
||||||
+ vis hSlider6,0
|
|
||||||
+ vis nNum6,0
|
|
||||||
+ bText6.pco=1374
|
|
||||||
+ bText6.pco2=1374
|
|
||||||
+ // get Text (optional Value)
|
|
||||||
+ spstr strCommand.txt,bText6.txt,"~",38
|
|
||||||
+ }
|
|
||||||
+ if(type6.txt=="number")
|
|
||||||
+ {
|
|
||||||
+ vis bUp6,0
|
|
||||||
+ vis bStop6,0
|
|
||||||
+ vis bDown6,0
|
|
||||||
+ vis btOnOff6,0
|
|
||||||
+ vis bText6,0
|
|
||||||
+ tsw bText6,0
|
|
||||||
+ vis hSlider6,1
|
|
||||||
+ vis nNum6,1
|
|
||||||
+ // get config (optional Value) (use bText as variable)
|
|
||||||
+ spstr strCommand.txt,bText6.txt,"~",38
|
|
||||||
+ //first value is current value
|
|
||||||
+ spstr bText6.txt,tTmp.txt,"|",0
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ hSlider6.val=sys0
|
|
||||||
+ nNum6.val=sys0
|
|
||||||
+ //second value is min value
|
|
||||||
+ spstr bText6.txt,tTmp.txt,"|",1
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ hSlider6.minval=sys0
|
|
||||||
+ //third value is max value
|
|
||||||
+ spstr bText6.txt,tTmp.txt,"|",2
|
|
||||||
+ covx tTmp.txt,sys0,0,0
|
|
||||||
+ hSlider6.maxval=sys0
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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-01 04:54:12.884151859 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +0000
|
||||||
|
|||||||
Reference in New Issue
Block a user