h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-06 06:35:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
63cc293ee7f3e85d2b8e5e798aaa0896990bd2b7
nspanel-lovelace-ui/HMI/US/portrait/diff-eu-version.txt

3113 lines
134 KiB
Plaintext
Raw Blame History

diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:55:25.143226231 +0000
@@ -5,11 +5,24 @@
int recvCrc=0
int payloadLength=0
int par0=0,par1=0
+ // landsspace orientation x has 480px and y has 320px xy limits todo: adjust xy values to something that fit's resulution
+ //Maximum values in directional change for Swipes beeing detected as swipe (diagonal swipes are invalid) (for one axis at a time)
+ int xLimit=125,yLimit=125
+ int ixLimit=-125,iyLimit=-125
+ //Minimum values for swipes, directional changes below theese values are ignored, because they could be unintended swipes
+ int xLimitMin=60,yLimitMin=60
+ int ixLimitMin=-60,iyLimitMin=-60
+ // Swipe Result Vars
+ int ycR=0,xcR=0
+ // Start End Swipe Touch Locations
+ int yc1=0,xc1=0,yc2=0,xc2=0
// sleep timeout in s
int sleepTimeout=20
int sleepValue=0
// dim value
int dimValue=40
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
+ // current page
+ int nPage=0
+ // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 07:55:25.143226231 +0000
@@ -16,6 +16,7 @@
vis p0,0
vis tSend,0
vis tInstruction,0
+ vis nPageDisp,0
vis tTmp,0
vis tId,0
//vis nPageDisp,0
@@ -38,53 +39,63 @@
Variable (string) strCommand
Attributes
- ID : 6
+ ID : 7
Scope : local
Text :
Max. Text Size: 200
Variable (string) entn
Attributes
- ID : 9
+ ID : 10
Scope : local
Text :
Max. Text Size: 50
Variable (string) tSend
Attributes
- ID : 25
+ ID : 26
Scope : local
Text :
Max. Text Size: 100
Variable (string) va1
Attributes
- ID : 30
+ ID : 31
Scope : local
Text :
Max. Text Size: 20
Variable (string) va2
Attributes
- ID : 31
+ ID : 32
Scope : local
Text :
Max. Text Size: 20
Variable (string) va3
Attributes
- ID : 32
+ ID : 33
Scope : local
Text :
Max. Text Size: 20
Variable (string) va4
Attributes
- ID : 33
+ ID : 34
Scope : local
Text :
Max. Text Size: 20
+Number nPageDisp
+ Attributes
+ ID : 5
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
Text tTmp
Attributes
ID : 2
@@ -98,7 +109,7 @@
Text tInstruction
Attributes
- ID : 7
+ ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -109,7 +120,7 @@
Text tId
Attributes
- ID : 8
+ ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -120,7 +131,7 @@
Text tCode
Attributes
- ID : 23
+ ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -131,13 +142,13 @@
Text tIcon
Attributes
- ID : 26
+ ID : 27
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 
Max. Text Size : 10
Picture p0
@@ -161,7 +172,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardAlarm,bNext"
+ nPage=nPage+1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -187,7 +205,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardAlarm,bPrev"
+ nPage=nPage-1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -202,7 +227,7 @@
Button b0
Attributes
- ID : 12
+ ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -217,7 +242,7 @@
Button b1
Attributes
- ID : 13
+ ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -232,7 +257,7 @@
Button b2
Attributes
- ID : 14
+ ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -247,7 +272,7 @@
Button b3
Attributes
- ID : 15
+ ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -262,7 +287,7 @@
Button b4
Attributes
- ID : 16
+ ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -277,7 +302,7 @@
Button b5
Attributes
- ID : 17
+ ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -292,7 +317,7 @@
Button b6
Attributes
- ID : 18
+ ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -307,7 +332,7 @@
Button b7
Attributes
- ID : 19
+ ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -322,7 +347,7 @@
Button b8
Attributes
- ID : 20
+ ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -337,7 +362,7 @@
Button b9
Attributes
- ID : 21
+ ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -352,13 +377,13 @@
Button b10
Attributes
- ID : 22
+ ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : CLR
+ Text : CLEAR
Max. Text Size : 10
Events
@@ -367,14 +392,14 @@
Button arm1
Attributes
- ID : 24
+ ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 40
+ Max. Text Size : 10
Events
Touch Press Event
@@ -394,18 +419,17 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
- tCode.txt=""
Button arm3
Attributes
- ID : 27
+ ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 40
+ Max. Text Size : 10
Events
Touch Press Event
@@ -425,18 +449,17 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
- tCode.txt=""
Button arm2
Attributes
- ID : 28
+ ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 40
+ Max. Text Size : 10
Events
Touch Press Event
@@ -456,18 +479,17 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
- tCode.txt=""
Button arm4
Attributes
- ID : 29
+ ID : 30
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text :
- Max. Text Size : 40
+ Max. Text Size : 10
Events
Touch Press Event
@@ -487,11 +509,10 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
- tCode.txt=""
Timer tmSerial
Attributes
- ID : 5
+ ID : 6
Scope : local
Period (ms): 50
Enabled : yes
@@ -581,12 +602,8 @@
spstr strCommand.txt,tTmp.txt,",",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
- //icon color
- spstr strCommand.txt,tTmp.txt,",",11
- covx tTmp.txt,sys0,0,0
- tIcon.pco=sys0
//numpad status
- spstr strCommand.txt,tTmp.txt,",",12
+ spstr strCommand.txt,tTmp.txt,",",11
if(tTmp.txt!="disable")
{
vis b0,1
@@ -602,15 +619,6 @@
vis b10,1
vis tCode,1
}
- //flashing status
- spstr strCommand.txt,tTmp.txt,",",13
- if(tTmp.txt=="enable")
- {
- tmFlash.en=1
- }else
- {
- tmFlash.en=0
- }
}
if(tInstruction.txt=="time")
{
@@ -691,7 +699,7 @@
Timer tmSleep
Attributes
- ID : 10
+ ID : 11
Scope : local
Period (ms): 1000
Enabled : yes
@@ -709,28 +717,9 @@
}
}
-Timer tmFlash
- Attributes
- ID : 34
- Scope : local
- Period (ms): 600
- Enabled : no
-
- Events
- Timer Event
- if(tIcon.isbr==1)
- {
- tIcon.isbr=0
- vis tIcon,0
- }else
- {
- tIcon.isbr=1
- vis tIcon,1
- }
-
TouchCap tc0
Attributes
- ID : 11
+ ID : 12
Scope: local
Value: 0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:55:25.143226231 +0000
@@ -31,7 +31,6 @@
vis tIcon1,0
vis tEntity1,0
vis bText1,0
- vis hSlider1,0
//ui e2
vis btOnOff2,0
vis bUp2,0
@@ -40,7 +39,6 @@
vis tIcon2,0
vis tEntity2,0
vis bText2,0
- vis hSlider2,0
//ui e3
vis btOnOff3,0
vis bUp3,0
@@ -49,7 +47,6 @@
vis tIcon3,0
vis tEntity3,0
vis bText3,0
- vis hSlider3,0
//ui e4
vis btOnOff4,0
vis bUp4,0
@@ -58,7 +55,6 @@
vis tIcon4,0
vis tEntity4,0
vis bText4,0
- vis hSlider4,0
Variable (string) strCommand
Attributes
@@ -100,28 +96,56 @@
ID : 49
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn2
Attributes
ID : 50
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn3
Attributes
ID : 51
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn4
Attributes
ID : 52
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
+
+Variable (string) entn5
+ Attributes
+ ID : 70
+ Scope : local
+ Text :
+ Max. Text Size: 50
+
+Variable (string) entn6
+ Attributes
+ ID : 71
+ Scope : local
+ Text :
+ Max. Text Size: 50
+
+Variable (string) type5
+ Attributes
+ ID : 72
+ Scope : local
+ Text :
+ Max. Text Size: 10
+
+Variable (string) type6
+ Attributes
+ ID : 73
+ Scope : local
+ Text :
+ Max. Text Size: 10
Text tHeading
Attributes
@@ -266,57 +290,57 @@
Text :
Max. Text Size : 50
-Picture p0
+Text tEntity5
Attributes
- ID : 1
+ ID : 54
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
+ Associated Keyboard : none
+ Text : tEntity5
+ Max. Text Size : 30
-Slider hSlider1
+Text tIcon5
Attributes
- ID : 54
+ ID : 55
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Position : 50
- Upper range limit : 100
- Lower range limit : 0
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 30
-Slider hSlider2
+Text tEntity6
Attributes
- ID : 55
+ ID : 62
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Position : 50
- Upper range limit : 100
- Lower range limit : 0
+ Associated Keyboard : none
+ Text : tEntity6
+ Max. Text Size : 30
-Slider hSlider3
+Text tIcon6
Attributes
- ID : 56
+ ID : 63
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Position : 50
- Upper range limit : 100
- Lower range limit : 0
+ Associated Keyboard : none
+ Text : 
+ Max. Text Size : 30
-Slider hSlider4
+Picture p0
Attributes
- ID : 57
+ ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- Position : 50
- Upper range limit : 100
- Lower range limit : 0
Button bDown1
Attributes
@@ -643,7 +667,13 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,bPrev"
+ nPage=nPage-1
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -669,7 +699,13 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,bNext"
+ nPage=nPage+1
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -786,6 +822,214 @@
prints tSend.txt,0
prints crcval,2
+Button bStop5
+ Attributes
+ ID : 56
+ 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,"+entn5.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 bDown5
+ Attributes
+ ID : 57
+ 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,"+entn4.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 bUp5
+ Attributes
+ ID : 58
+ 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,"+entn5.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 bText5
+ Attributes
+ ID : 60
+ 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,"+entn5.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
+
+Button bStop6
+ Attributes
+ ID : 64
+ 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
+ ID : 65
+ 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,"+entn4.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
+ ID : 66
+ 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
+ ID : 68
+ 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
Attributes
ID : 23
@@ -898,6 +1142,62 @@
prints tSend.txt,0
prints crcval,2
+Dual-state Button btOnOff5
+ Attributes
+ ID : 59
+ 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,"+entn5.txt+",OnOff,"
+ covx btOnOff5.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
+
+Dual-state Button btOnOff6
+ Attributes
+ ID : 67
+ 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
Attributes
ID : 35
@@ -1008,6 +1308,52 @@
page popupLight
}
+Hotspot m4
+ Attributes
+ ID : 61
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
+ Events
+ Touch Press Event
+ pageIcons.tTmp1.txt=tEntity5.txt
+ pageIcons.tTmp2.txt=entn5.txt
+ if(type5.txt=="shutter")
+ {
+ //popupShutter.tHeading.txt=tEntity5.txt
+ page popupShutter
+ }
+ if(type5.txt=="light")
+ {
+ //popupLight.tEntity.txt=tEntity5.txt
+ page popupLight
+ }
+
+Hotspot m5
+ Attributes
+ ID : 69
+ 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
Attributes
ID : 30
@@ -1060,15 +1406,18 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,",",0
- if(tInstruction.txt=="entityUpd")
+ if(tInstruction.txt=="entityUpdHeading")
{
- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
spstr strCommand.txt,tHeading.txt,",",1
+ }
+ if(tInstruction.txt=="entityUpd")
+ {
+ // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4
// get Type
- spstr strCommand.txt,type1.txt,",",3
+ spstr strCommand.txt,type1.txt,",",1
// get internal name
- spstr strCommand.txt,entn1.txt,",",4
- if(type1.txt=="delete"||type1.txt=="")
+ spstr strCommand.txt,entn1.txt,",",2
+ if(type1.txt=="delete")
{
vis bUp1,0
vis bStop1,0
@@ -1077,20 +1426,19 @@
vis tEntity1,0
vis tIcon1,0
vis bText1,0
- vis hSlider1,0
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",5
+ spstr strCommand.txt,tTmp.txt,",",3
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1
vis tIcon1,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",6
+ spstr strCommand.txt,tTmp.txt,",",4
covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0
// set name
- spstr strCommand.txt,tEntity1.txt,",",7
+ spstr strCommand.txt,tEntity1.txt,",",5
vis tEntity1,1
}
if(type1.txt=="shutter")
@@ -1100,7 +1448,6 @@
vis bDown1,1
vis btOnOff1,0
vis bText1,0
- vis hSlider1,0
}
if(type1.txt=="light")
{
@@ -1109,9 +1456,8 @@
vis bDown1,0
vis btOnOff1,1
vis bText1,0
- vis hSlider1,0
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",8
+ spstr strCommand.txt,tTmp.txt,",",6
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -1122,9 +1468,8 @@
vis bDown1,0
vis btOnOff1,1
vis bText1,0
- vis hSlider1,0
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",8
+ spstr strCommand.txt,tTmp.txt,",",6
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
@@ -1136,11 +1481,10 @@
vis btOnOff1,0
vis bText1,1
tsw bText1,0
- vis hSlider1,0
bText1.pco=65535
bText1.pco2=65535
// get Text (optional Value)
- spstr strCommand.txt,bText1.txt,",",8
+ spstr strCommand.txt,bText1.txt,",",6
}
if(type1.txt=="button")
{
@@ -1150,41 +1494,17 @@
vis btOnOff1,0
vis bText1,1
tsw bText1,1
- vis hSlider1,0
bText1.pco=1374
bText1.pco2=1374
// get Text (optional Value)
- spstr strCommand.txt,bText1.txt,",",8
- }
- if(type1.txt=="number")
- {
- vis bUp1,0
- vis bStop1,0
- vis bDown1,0
- vis btOnOff1,0
- vis bText1,0
- tsw bText1,0
- vis hSlider1,1
- // get config (optional Value) (use bText as variable)
- spstr strCommand.txt,bText1.txt,",",8
- //first value is current value
- spstr bText1.txt,tTmp.txt,"|",1
- covx tTmp.txt,sys0,0,0
- hSlider1.val=sys0
- //second value is min value
- spstr bText1.txt,tTmp.txt,"|",2
- covx tTmp.txt,sys0,0,0
- hSlider1.minval=sys0
- //third value is max value
- spstr bText1.txt,tTmp.txt,"|",3
- covx tTmp.txt,sys0,0,0
- hSlider1.maxval=sys0
+ spstr strCommand.txt,bText1.txt,",",6
}
+ // id2
// get Type
- spstr strCommand.txt,type2.txt,",",9
+ spstr strCommand.txt,type2.txt,",",7
// get internal name
- spstr strCommand.txt,entn2.txt,",",10
- if(type2.txt=="delete"||type2.txt=="")
+ spstr strCommand.txt,entn2.txt,",",8
+ if(type2.txt=="delete")
{
vis bUp2,0
vis bStop2,0
@@ -1193,20 +1513,19 @@
vis tEntity2,0
vis tIcon2,0
vis bText2,0
- vis hSlider2,0
}else
{
- // change icon
- spstr strCommand.txt,tTmp.txt,",",11
+ //change icon
+ spstr strCommand.txt,tTmp.txt,",",9
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1
vis tIcon2,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",12
+ spstr strCommand.txt,tTmp.txt,",",10
covx tTmp.txt,sys0,0,0
tIcon2.pco=sys0
// set name
- spstr strCommand.txt,tEntity2.txt,",",13
+ spstr strCommand.txt,tEntity2.txt,",",11
vis tEntity2,1
}
if(type2.txt=="shutter")
@@ -1216,7 +1535,6 @@
vis bDown2,1
vis btOnOff2,0
vis bText2,0
- vis hSlider2,0
}
if(type2.txt=="light")
{
@@ -1225,9 +1543,8 @@
vis bDown2,0
vis btOnOff2,1
vis bText2,0
- vis hSlider2,0
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",14
+ spstr strCommand.txt,tTmp.txt,",",12
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -1238,9 +1555,8 @@
vis bDown2,0
vis btOnOff2,1
vis bText2,0
- vis hSlider2,0
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",14
+ spstr strCommand.txt,tTmp.txt,",",12
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
@@ -1252,11 +1568,10 @@
vis btOnOff2,0
vis bText2,1
tsw bText2,0
- vis hSlider2,0
bText2.pco=65535
bText2.pco2=65535
// get Text (optional Value)
- spstr strCommand.txt,bText2.txt,",",14
+ spstr strCommand.txt,bText2.txt,",",12
}
if(type2.txt=="button")
{
@@ -1266,41 +1581,17 @@
vis btOnOff2,0
vis bText2,1
tsw bText2,1
- vis hSlider2,0
bText2.pco=1374
bText2.pco2=1374
// get Text (optional Value)
- spstr strCommand.txt,bText2.txt,",",14
- }
- if(type2.txt=="number")
- {
- vis bUp2,0
- vis bStop2,0
- vis bDown2,0
- vis btOnOff2,0
- vis bText2,0
- tsw bText2,0
- vis hSlider2,1
- // get config (optional Value) (use bText as variable)
- spstr strCommand.txt,bText2.txt,",",14
- //first value is current value
- spstr bText2.txt,tTmp.txt,"|",1
- covx tTmp.txt,sys0,0,0
- hSlider2.val=sys0
- //second value is min value
- spstr bText2.txt,tTmp.txt,"|",2
- covx tTmp.txt,sys0,0,0
- hSlider2.minval=sys0
- //third value is max value
- spstr bText2.txt,tTmp.txt,"|",3
- covx tTmp.txt,sys0,0,0
- hSlider2.maxval=sys0
+ spstr strCommand.txt,bText2.txt,",",12
}
+ // id3
// get Type
- spstr strCommand.txt,type3.txt,",",15
+ spstr strCommand.txt,type3.txt,",",13
// get internal name
- spstr strCommand.txt,entn3.txt,",",16
- if(type3.txt=="delete"||type3.txt=="")
+ spstr strCommand.txt,entn3.txt,",",14
+ if(type3.txt=="delete")
{
vis bUp3,0
vis bStop3,0
@@ -1309,20 +1600,19 @@
vis tEntity3,0
vis tIcon3,0
vis bText3,0
- vis hSlider3,0
}else
{
- // change icon
- spstr strCommand.txt,tTmp.txt,",",17
+ //change icon
+ spstr strCommand.txt,tTmp.txt,",",15
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1
vis tIcon3,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",18
+ spstr strCommand.txt,tTmp.txt,",",16
covx tTmp.txt,sys0,0,0
tIcon3.pco=sys0
// set name
- spstr strCommand.txt,tEntity3.txt,",",19
+ spstr strCommand.txt,tEntity3.txt,",",17
vis tEntity3,1
}
if(type3.txt=="shutter")
@@ -1332,18 +1622,16 @@
vis bDown3,1
vis btOnOff3,0
vis bText3,0
- vis hSlider3,0
}
if(type3.txt=="light")
{
vis bUp3,0
vis bStop3,0
vis bDown3,0
- vis btOnOff3,1
vis bText3,0
- vis hSlider3,0
+ vis btOnOff3,1
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",20
+ spstr strCommand.txt,tTmp.txt,",",18
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
@@ -1352,11 +1640,10 @@
vis bUp3,0
vis bStop3,0
vis bDown3,0
- vis btOnOff3,1
vis bText3,0
- vis hSlider3,0
+ vis btOnOff3,1
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",20
+ spstr strCommand.txt,tTmp.txt,",",18
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
@@ -1368,11 +1655,10 @@
vis btOnOff3,0
vis bText3,1
tsw bText3,0
- vis hSlider3,0
bText3.pco=65535
bText3.pco2=65535
// get Text (optional Value)
- spstr strCommand.txt,bText3.txt,",",20
+ spstr strCommand.txt,bText3.txt,",",18
}
if(type3.txt=="button")
{
@@ -1382,41 +1668,17 @@
vis btOnOff3,0
vis bText3,1
tsw bText3,1
- vis hSlider3,0
bText3.pco=1374
bText3.pco2=1374
// get Text (optional Value)
- spstr strCommand.txt,bText3.txt,",",20
- }
- if(type3.txt=="number")
- {
- vis bUp3,0
- vis bStop3,0
- vis bDown3,0
- vis btOnOff3,0
- vis bText3,0
- tsw bText3,0
- vis hSlider3,1
- // get config (optional Value) (use bText as variable)
- spstr strCommand.txt,bText3.txt,",",20
- //first value is current value
- spstr bText3.txt,tTmp.txt,"|",1
- covx tTmp.txt,sys0,0,0
- hSlider3.val=sys0
- //second value is min value
- spstr bText3.txt,tTmp.txt,"|",2
- covx tTmp.txt,sys0,0,0
- hSlider3.minval=sys0
- //third value is max value
- spstr bText3.txt,tTmp.txt,"|",3
- covx tTmp.txt,sys0,0,0
- hSlider3.maxval=sys0
+ spstr strCommand.txt,bText3.txt,",",18
}
+ // id4
// get Type
- spstr strCommand.txt,type4.txt,",",21
+ spstr strCommand.txt,type4.txt,",",19
// get internal name
- spstr strCommand.txt,entn4.txt,",",22
- if(type4.txt=="delete"||type4.txt=="")
+ spstr strCommand.txt,entn4.txt,",",20
+ if(type4.txt=="delete")
{
vis bUp4,0
vis bStop4,0
@@ -1425,20 +1687,19 @@
vis tEntity4,0
vis tIcon4,0
vis bText4,0
- vis hSlider4,0
}else
{
- // change icon
- spstr strCommand.txt,tTmp.txt,",",23
+ //change icon
+ spstr strCommand.txt,tTmp.txt,",",21
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1
vis tIcon4,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",24
+ spstr strCommand.txt,tTmp.txt,",",22
covx tTmp.txt,sys0,0,0
tIcon4.pco=sys0
// set name
- spstr strCommand.txt,tEntity4.txt,",",25
+ spstr strCommand.txt,tEntity4.txt,",",23
vis tEntity4,1
}
if(type4.txt=="shutter")
@@ -1448,18 +1709,16 @@
vis bDown4,1
vis btOnOff4,0
vis bText4,0
- vis hSlider4,0
}
if(type4.txt=="light")
{
vis bUp4,0
vis bStop4,0
vis bDown4,0
- vis btOnOff4,1
vis bText4,0
- vis hSlider4,0
+ vis btOnOff4,1
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",26
+ spstr strCommand.txt,tTmp.txt,",",24
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
@@ -1468,11 +1727,10 @@
vis bUp4,0
vis bStop4,0
vis bDown4,0
- vis btOnOff4,1
vis bText4,0
- vis hSlider4,0
+ vis btOnOff4,1
// get Button State (optional Value)
- spstr strCommand.txt,tTmp.txt,",",26
+ spstr strCommand.txt,tTmp.txt,",",24
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
@@ -1484,11 +1742,10 @@
vis btOnOff4,0
vis bText4,1
tsw bText4,0
- vis hSlider4,0
bText4.pco=65535
bText4.pco2=65535
// get Text (optional Value)
- spstr strCommand.txt,bText4.txt,",",26
+ spstr strCommand.txt,bText4.txt,",",24
}
if(type4.txt=="button")
{
@@ -1498,35 +1755,184 @@
vis btOnOff4,0
vis bText4,1
tsw bText4,1
- vis hSlider4,0
bText4.pco=1374
bText4.pco2=1374
// get Text (optional Value)
- spstr strCommand.txt,bText4.txt,",",26
+ spstr strCommand.txt,bText4.txt,",",24
}
- if(type4.txt=="number")
+ // id5
+ // get Type
+ spstr strCommand.txt,type5.txt,",",25
+ // get internal name
+ spstr strCommand.txt,entn5.txt,",",26
+ if(type5.txt=="delete")
{
- vis bUp4,0
- vis bStop4,0
- vis bDown4,0
- vis btOnOff4,0
- vis bText4,0
- tsw bText4,0
- vis hSlider4,1
- // get config (optional Value) (use bText as variable)
- spstr strCommand.txt,bText4.txt,",",26
- //first value is current value
- spstr bText4.txt,tTmp.txt,"|",1
- covx tTmp.txt,sys0,0,0
- hSlider4.val=sys0
- //second value is min value
- spstr bText4.txt,tTmp.txt,"|",2
- covx tTmp.txt,sys0,0,0
- hSlider4.minval=sys0
- //third value is max value
- spstr bText4.txt,tTmp.txt,"|",3
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis btOnOff5,0
+ vis tEntity5,0
+ vis tIcon5,0
+ vis bText5,0
+ }else
+ {
+ //change icon
+ spstr strCommand.txt,tTmp.txt,",",27
covx tTmp.txt,sys0,0,0
- hSlider4.maxval=sys0
+ substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
+ vis tIcon5,1
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,",",28
+ covx tTmp.txt,sys0,0,0
+ tIcon5.pco=sys0
+ // set name
+ spstr strCommand.txt,tEntity5.txt,",",29
+ vis tEntity5,1
+ }
+ if(type5.txt=="shutter")
+ {
+ vis bUp5,1
+ vis bStop5,1
+ vis bDown5,1
+ vis btOnOff5,0
+ vis bText5,0
+ }
+ if(type5.txt=="light")
+ {
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis bText5,0
+ vis btOnOff5,1
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,",",30
+ covx tTmp.txt,sys0,0,0
+ btOnOff5.val=sys0
+ }
+ if(type5.txt=="switch")
+ {
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis bText5,0
+ vis btOnOff5,1
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,",",30
+ covx tTmp.txt,sys0,0,0
+ btOnOff5.val=sys0
+ }
+ if(type5.txt=="text")
+ {
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis btOnOff5,0
+ vis bText5,1
+ tsw bText5,0
+ bText5.pco=65535
+ bText5.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText5.txt,",",30
+ }
+ if(type5.txt=="button")
+ {
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis btOnOff5,0
+ vis bText5,1
+ tsw bText5,1
+ bText5.pco=1374
+ bText5.pco2=1374
+ // get Text (optional Value)
+ spstr strCommand.txt,bText5.txt,",",30
+ }
+ // id6
+ // get Type
+ spstr strCommand.txt,type6.txt,",",31
+ // get internal name
+ spstr strCommand.txt,entn6.txt,",",32
+ if(type6.txt=="delete")
+ {
+ vis bUp6,0
+ vis bStop6,0
+ vis bDown6,0
+ vis btOnOff6,0
+ vis tEntity6,0
+ vis tIcon6,0
+ vis bText6,0
+ }else
+ {
+ //change icon
+ spstr strCommand.txt,tTmp.txt,",",33
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
+ vis tIcon6,1
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,",",34
+ covx tTmp.txt,sys0,0,0
+ tIcon6.pco=sys0
+ // set name
+ spstr strCommand.txt,tEntity6.txt,",",35
+ vis tEntity6,1
+ }
+ if(type6.txt=="shutter")
+ {
+ vis bUp6,1
+ vis bStop6,1
+ vis bDown6,1
+ vis btOnOff6,0
+ vis bText6,0
+ }
+ if(type6.txt=="light")
+ {
+ vis bUp6,0
+ vis bStop6,0
+ vis bDown6,0
+ vis bText6,0
+ vis btOnOff6,1
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,",",36
+ covx tTmp.txt,sys0,0,0
+ btOnOff6.val=sys0
+ }
+ if(type6.txt=="switch")
+ {
+ vis bUp6,0
+ vis bStop6,0
+ vis bDown6,0
+ vis bText6,0
+ vis btOnOff6,1
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,",",36
+ 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
+ bText6.pco=65535
+ bText6.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText6.txt,",",36
+ }
+ if(type6.txt=="button")
+ {
+ vis bUp6,0
+ vis bStop6,0
+ vis bDown6,0
+ vis btOnOff6,0
+ vis bText6,1
+ tsw bText6,1
+ bText6.pco=1374
+ bText6.pco2=1374
+ // get Text (optional Value)
+ spstr strCommand.txt,bText6.txt,",",36
}
}
if(tInstruction.txt=="pageType")
@@ -1541,43 +1947,30 @@
//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")
+ if(tId.txt=="popupLight")
{
- page cardEntities
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
}
- if(tId.txt=="cardGrid")
+ if(tId.txt=="cardThermo")
{
- page cardGrid
+ page cardThermo
}
- 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/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 07:55:25.143226231 +0000
@@ -76,28 +76,28 @@
ID : 18
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn2
Attributes
ID : 19
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn3
Attributes
ID : 20
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) entn4
Attributes
ID : 21
Scope : local
Text :
- Max. Text Size: 70
+ Max. Text Size: 50
Variable (string) type5
Attributes
@@ -269,7 +269,13 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardGrid,bPrev"
+ nPage=nPage-1
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -295,7 +301,13 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardGrid,bNext"
+ nPage=nPage+1
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -600,14 +612,17 @@
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,",",0
- if(tInstruction.txt=="entityUpd")
+ if(tInstruction.txt=="entityUpdHeading")
{
- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
spstr strCommand.txt,tHeading.txt,",",1
+ }
+ if(tInstruction.txt=="entityUpd")
+ {
+ // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
// get Type
- spstr strCommand.txt,type1.txt,",",3
+ spstr strCommand.txt,type1.txt,",",1
// get internal name
- spstr strCommand.txt,entn1.txt,",",4
+ spstr strCommand.txt,entn1.txt,",",2
if(type1.txt=="delete"||type1.txt=="")
{
vis tEntity1,0
@@ -615,22 +630,22 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",5
+ spstr strCommand.txt,tTmp.txt,",",3
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1
vis bEntity1,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",6
+ spstr strCommand.txt,tTmp.txt,",",4
covx tTmp.txt,sys0,0,0
bEntity1.pco=sys0
// set name
- spstr strCommand.txt,tEntity1.txt,",",7
+ spstr strCommand.txt,tEntity1.txt,",",5
vis tEntity1,1
}
// get Type
- spstr strCommand.txt,type2.txt,",",9
+ spstr strCommand.txt,type2.txt,",",7
// get internal name
- spstr strCommand.txt,entn2.txt,",",10
+ spstr strCommand.txt,entn2.txt,",",8
if(type2.txt=="delete"||type2.txt=="")
{
vis tEntity2,0
@@ -638,22 +653,22 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",11
+ spstr strCommand.txt,tTmp.txt,",",9
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1
vis bEntity2,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",12
+ spstr strCommand.txt,tTmp.txt,",",10
covx tTmp.txt,sys0,0,0
bEntity2.pco=sys0
// set name
- spstr strCommand.txt,tEntity2.txt,",",13
+ spstr strCommand.txt,tEntity2.txt,",",11
vis tEntity2,1
}
// get Type
- spstr strCommand.txt,type3.txt,",",15
+ spstr strCommand.txt,type3.txt,",",13
// get internal name
- spstr strCommand.txt,entn3.txt,",",16
+ spstr strCommand.txt,entn3.txt,",",14
if(type3.txt=="delete"||type3.txt=="")
{
vis tEntity3,0
@@ -661,22 +676,22 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",17
+ spstr strCommand.txt,tTmp.txt,",",15
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1
vis bEntity3,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",18
+ spstr strCommand.txt,tTmp.txt,",",16
covx tTmp.txt,sys0,0,0
bEntity3.pco=sys0
// set name
- spstr strCommand.txt,tEntity3.txt,",",19
+ spstr strCommand.txt,tEntity3.txt,",",17
vis tEntity3,1
}
// get Type
- spstr strCommand.txt,type4.txt,",",21
+ spstr strCommand.txt,type4.txt,",",19
// get internal name
- spstr strCommand.txt,entn4.txt,",",22
+ spstr strCommand.txt,entn4.txt,",",20
if(type4.txt=="delete"||type4.txt=="")
{
vis tEntity4,0
@@ -684,22 +699,22 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",23
+ spstr strCommand.txt,tTmp.txt,",",21
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1
vis bEntity4,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",24
+ spstr strCommand.txt,tTmp.txt,",",22
covx tTmp.txt,sys0,0,0
bEntity4.pco=sys0
// set name
- spstr strCommand.txt,tEntity4.txt,",",25
+ spstr strCommand.txt,tEntity4.txt,",",23
vis tEntity4,1
}
// get Type
- spstr strCommand.txt,type5.txt,",",27
+ spstr strCommand.txt,type5.txt,",",25
// get internal name
- spstr strCommand.txt,entn5.txt,",",28
+ spstr strCommand.txt,entn5.txt,",",26
if(type5.txt=="delete"||type5.txt=="")
{
vis tEntity5,0
@@ -707,22 +722,22 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",29
+ spstr strCommand.txt,tTmp.txt,",",27
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1
vis bEntity5,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",30
+ spstr strCommand.txt,tTmp.txt,",",28
covx tTmp.txt,sys0,0,0
bEntity5.pco=sys0
// set name
- spstr strCommand.txt,tEntity5.txt,",",31
+ spstr strCommand.txt,tEntity5.txt,",",29
vis tEntity5,1
}
// get Type
- spstr strCommand.txt,type6.txt,",",33
+ spstr strCommand.txt,type6.txt,",",31
// get internal name
- spstr strCommand.txt,entn6.txt,",",34
+ spstr strCommand.txt,entn6.txt,",",32
if(type6.txt=="delete"||type6.txt=="")
{
vis tEntity6,0
@@ -730,16 +745,16 @@
}else
{
// change icon
- spstr strCommand.txt,tTmp.txt,",",35
+ spstr strCommand.txt,tTmp.txt,",",33
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1
vis bEntity6,1
// change icon color
- spstr strCommand.txt,tTmp.txt,",",36
+ spstr strCommand.txt,tTmp.txt,",",34
covx tTmp.txt,sys0,0,0
bEntity6.pco=sys0
// set name
- spstr strCommand.txt,tEntity6.txt,",",37
+ spstr strCommand.txt,tEntity6.txt,",",35
vis tEntity6,1
}
}
@@ -755,43 +770,30 @@
//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")
+ if(tId.txt=="popupLight")
{
- page cardEntities
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
}
- if(tId.txt=="cardGrid")
+ if(tId.txt=="cardThermo")
{
- page cardGrid
+ page cardThermo
}
- 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=="cardEntities")
{
- page cardMedia
+ page cardEntities
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:55:25.143226231 +0000
@@ -16,37 +16,34 @@
vis p0,0
vis tSend,0
vis tInstruction,0
+ vis nPageDisp,0
vis tTmp,0
vis tId,0
- vis t5,0
//vis nPageDisp,0
Variable (string) strCommand
Attributes
- ID : 7
+ ID : 8
Scope : local
Text :
- Max. Text Size: 500
+ Max. Text Size: 200
Variable (string) entn
Attributes
- ID : 18
+ ID : 19
Scope : local
Text :
Max. Text Size: 50
-Variable (string) vaSpeakerList
+Number nPageDisp
Attributes
- ID : 27
+ ID : 6
Scope : local
- Text :
- Max. Text Size: 200
-
-Variable (int32) vaSpeakerPos
- Attributes
- ID : 28
- Scope: local
- Value: 0
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
Text tSend
Attributes
@@ -56,8 +53,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
- Max. Text Size : 200
+ Text : newtxt
+ Max. Text Size : 100
Text tTmp
Attributes
@@ -72,7 +69,7 @@
Text tInstruction
Attributes
- ID : 8
+ ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -83,7 +80,7 @@
Text tId
Attributes
- ID : 9
+ ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -94,7 +91,7 @@
Text tHeading
Attributes
- ID : 10
+ ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -105,7 +102,7 @@
Text tTitle
Attributes
- ID : 11
+ ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -116,7 +113,7 @@
Text tAuthor
Attributes
- ID : 12
+ ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -127,7 +124,7 @@
Text t2
Attributes
- ID : 13
+ ID : 14
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -157,7 +154,7 @@
Text tPlayPause
Attributes
- ID : 14
+ ID : 15
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -187,7 +184,7 @@
Text t0
Attributes
- ID : 15
+ ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -217,171 +214,15 @@
Text tIcon
Attributes
- ID : 17
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text t1
- Attributes
- ID : 22
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- hVolume.val=hVolume.val-5
- // event,buttonPress2,internalNameEntity,volumeSlider,50
- //craft command
- tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
- covx hVolume.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
-
-Text t3
- Attributes
- ID : 23
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- hVolume.val=hVolume.val+5
- // event,buttonPress2,internalNameEntity,volumeSlider,50
- //craft command
- tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
- covx hVolume.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
-
-Text t4
- Attributes
- ID : 24
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
-Text tSpeaker
- Attributes
- ID : 25
+ ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 50
-
- Events
- Touch Press Event
- // event,buttonPress2,entn,media-next
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="speaker-sel,"+tSpeaker.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
-
-Text t6
- Attributes
- ID : 26
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
Max. Text Size : 10
- Events
- Touch Press Event
- //speaker
- tSpeaker.pco=65535
- spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val
- vaSpeakerPos.val+=1
- if(tSpeaker.txt=="")
- {
- vaSpeakerPos.val=0
- spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val
- }
-
-Text t5
- Attributes
- ID : 29
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
- Events
- Touch Press Event
- // event,buttonPress2,entn,media-next
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="media-OnOff"
- //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
-
Picture p0
Attributes
ID : 1
@@ -392,7 +233,7 @@
Slider hVolume
Attributes
- ID : 16
+ ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -403,8 +244,6 @@
Events
Touch Release Event
- tmCooldown.en=1
- tmCooldown.tim=800
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -435,7 +274,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardMedia,bNext"
+ nPage=nPage+1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -461,7 +307,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardMedia,bPrev"
+ nPage=nPage-1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -476,7 +329,7 @@
Timer tmSerial
Attributes
- ID : 6
+ ID : 7
Scope : local
Period (ms): 50
Enabled : yes
@@ -548,32 +401,6 @@
spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
- //speaker current
- spstr strCommand.txt,tSpeaker.txt,"|",8
- if(tSpeaker.txt!="")
- {
- tSpeaker.pco=1374
- }else
- {
- tSpeaker.pco=65535
- }
- //speaker list
- spstr strCommand.txt,vaSpeakerList.txt,"|",9
- if(vaSpeakerList.txt=="")
- {
- vis t6,0
- }
- vaSpeakerPos.val=0
- // on off button
- spstr strCommand.txt,tTmp.txt,"|",10
- if(tTmp.txt=="disable")
- {
- vis t5,0
- }else
- {
- vis t5,1
- covx tTmp.txt,t5.pco,0,0
- }
}
if(tInstruction.txt=="time")
{
@@ -663,7 +490,7 @@
Timer tmSleep
Attributes
- ID : 19
+ ID : 20
Scope : local
Period (ms): 1000
Enabled : yes
@@ -681,20 +508,9 @@
}
}
-Timer tmCooldown
- Attributes
- ID : 21
- Scope : local
- Period (ms): 100
- Enabled : no
-
- Events
- Timer Event
- tmCooldown.en=0
-
TouchCap tc0
Attributes
- ID : 20
+ ID : 21
Scope: local
Value: 0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 07:55:25.143226231 +0000
@@ -269,7 +269,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,bNext"
+ nPage=nPage+1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -369,7 +376,14 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,bPrev"
+ nPage=nPage-1
+ nPageDisp.val=nPage
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
Only in HMI/n2t-out: nspanel_Stats.txt
Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 07:55:25.143226231 +0000
@@ -30,8 +30,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 
- Max. Text Size : 150
+ Text : 
+ Max. Text Size : 120
Text tTmp1
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:55:25.143226231 +0000
@@ -155,7 +155,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : please check your backend configuration
+ Text : pls check your backend configuration
Max. Text Size : 100
Text tVersion
@@ -315,10 +315,6 @@
{
page cardThermo
}
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
Only in HMI/US/portrait/n2t-out: pageSwipeTest.txt
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 07:55:25.143226231 +0000
@@ -53,7 +53,7 @@
Touch Press Event
page pageSerialTest
-Button b3
+Button b2
Attributes
ID : 4
Scope : local
@@ -61,6 +61,21 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
+ Text : swipe
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+ page pageSwipeTest
+
+Button b3
+ Attributes
+ ID : 5
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
Text : disable recmod
Max. Text Size : 20
@@ -70,7 +85,7 @@
Button b6
Attributes
- ID : 5
+ ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -85,7 +100,7 @@
Button b4
Attributes
- ID : 6
+ ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -100,7 +115,7 @@
Button b5
Attributes
- ID : 7
+ ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -115,7 +130,7 @@
Button b7
Attributes
- ID : 8
+ ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -130,7 +145,7 @@
Button b8
Attributes
- ID : 9
+ ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -146,7 +161,7 @@
Button b9
Attributes
- ID : 10
+ ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -161,7 +176,7 @@
Button b10
Attributes
- ID : 11
+ ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -176,7 +191,7 @@
Button b11
Attributes
- ID : 12
+ ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:55:25.143226231 +0000
@@ -252,8 +252,6 @@
Events
Touch Release Event
- tmCooldown.en=1
- tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
@@ -283,8 +281,6 @@
Events
Touch Release Event
- tmCooldown.en=1
- tmCooldown.tim=2500
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
@@ -314,7 +310,12 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,popupLight,bExit"
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -493,11 +494,8 @@
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
- if(tmCooldown.en==0)
- {
hBrightness.val=sys0
}
- }
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",5
if(tTmp.txt=="disable")
@@ -529,11 +527,6 @@
vis hTempSlider,1
vis t3,1
vis t4,1
- if(tmCooldown.en==0)
- {
- covx tTmp.txt,sys0,0,0
- hTempSlider.val=sys0
- }
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
@@ -635,17 +628,6 @@
}
}
-Timer tmCooldown
- Attributes
- ID : 26
- Scope : local
- Period (ms): 100
- Enabled : no
-
- Events
- Timer Event
- tmCooldown.en=0
-
TouchCap tc0
Attributes
ID : 14
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 07:55:25.143226231 +0000
@@ -127,7 +127,12 @@
Events
Touch Press Event
sleepTimeout=vaOldSleepT.val
- tSend.txt="event,buttonPress2,popupNotify,bExit"
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 07:55:25.143226231 +0000
@@ -180,7 +180,12 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,popupShutter,bExit"
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-29 07:55:24.603203320 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 07:55:25.143226231 +0000
@@ -20,26 +20,12 @@
vis tTmp,0
vis p0,0
//load gloabl time string from pageIcons
- //tTime.txt=vaTime.txt
- spstr vaTime.txt,tTime.txt,"?",0
- spstr vaTime.txt,tAMPM.txt,"?",1
- if(tAMPM.txt=="")
- {
- vis tAMPM,0
- }
+ tTime.txt=vaTime.txt
tDate.txt=vaDate.txt
dim=dimValue
vis tSend,0
//page open event
- // clear weather elements, to keep example content in HMI
- tMainIcon.txt=""
- tMainText.txt=""
- tForecast1.txt=""
- tF1Icon.txt=""
- tForecast1Val.txt=""
- tForecast2.txt=""
- tF2Icon.txt=""
- tForecast2Val.txt=""
+ // craft command
tSend.txt="event,screensaverOpen"
//send calc crc
btlen tSend.txt,sys0
@@ -52,20 +38,31 @@
prints sys0,2
prints tSend.txt,0
prints crcval,2
+ // clear weather elements, to keep example content in HMI
+ tMainIcon.txt=""
+ tMainText.txt=""
+ tMRIcon.txt=""
+ tMR.txt=""
+ tForecast1.txt=""
+ tF1Icon.txt=""
+ tForecast1Val.txt=""
+ tForecast2.txt=""
+ tF2Icon.txt=""
+ tForecast2Val.txt=""
Variable (string) strCommand
Attributes
ID : 5
Scope : local
Text :
- Max. Text Size: 200
+ Max. Text Size: 100
Variable (string) vaTime
Attributes
ID : 10
Scope : global
Text :
- Max. Text Size: 15
+ Max. Text Size: 10
Variable (string) vaDate
Attributes
@@ -76,17 +73,11 @@
Variable (string) tId
Attributes
- ID : 22
+ ID : 24
Scope : local
Text :
Max. Text Size: 25
-Variable (int32) vaTap
- Attributes
- ID : 30
- Scope: local
- Value: 0
-
Number originPage
Attributes
ID : 3
@@ -106,7 +97,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 50
+ Max. Text Size : 20
Text tTmp
Attributes
@@ -117,7 +108,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 50
+ Max. Text Size : 20
Text tTime
Attributes
@@ -128,7 +119,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : 21:32
- Max. Text Size : 15
+ Max. Text Size : 10
Text tDate
Attributes
@@ -150,7 +141,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 50
+ Max. Text Size : 25
Text tMainIcon
Attributes
@@ -174,7 +165,7 @@
Text : 2,3 °C
Max. Text Size : 10
-Text tForecast1
+Text tMRIcon
Attributes
ID : 15
Scope : local
@@ -182,10 +173,10 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : Mi
+ Text : 
Max. Text Size : 10
-Text tForecast1Val
+Text tMR
Attributes
ID : 16
Scope : local
@@ -193,10 +184,10 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 9,3 °C
+ Text : 0 mm
Max. Text Size : 10
-Text tF1Icon
+Text tForecast1
Attributes
ID : 17
Scope : local
@@ -204,10 +195,10 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 
+ Text : Mi
Max. Text Size : 10
-Text tForecast2
+Text tForecast1Val
Attributes
ID : 18
Scope : local
@@ -215,10 +206,10 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : Do
+ Text : 9,3 °C
Max. Text Size : 10
-Text tF2Icon
+Text tF1Icon
Attributes
ID : 19
Scope : local
@@ -229,7 +220,7 @@
Text : 
Max. Text Size : 10
-Text tForecast2Val
+Text tForecast2
Attributes
ID : 20
Scope : local
@@ -237,10 +228,10 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : 11,9 °C
+ Text : Do
Max. Text Size : 10
-Text t10
+Text tF2Icon
Attributes
ID : 21
Scope : local
@@ -248,84 +239,29 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text : |
- Max. Text Size : 10
-
-Text tAMPM
- Attributes
- ID : 23
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : PM
- Max. Text Size : 10
-
-Text tForecast3Val
- Attributes
- ID : 24
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tF3Icon
- Attributes
- ID : 25
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tForecast3
- Attributes
- ID : 26
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tForecast4
- Attributes
- ID : 27
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
+ Text : 
Max. Text Size : 10
-Text tF4Icon
+Text tForecast2Val
Attributes
- ID : 28
+ ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 11,9 °C
Max. Text Size : 10
-Text tForecast4Val
+Text t10
Attributes
- ID : 29
+ ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : |
Max. Text Size : 10
Picture p0
@@ -404,12 +340,7 @@
{
//get set time to global variable
spstr strCommand.txt,vaTime.txt,",",1
- spstr vaTime.txt,tTime.txt,"?",0
- spstr vaTime.txt,tAMPM.txt,"?",1
- if(tAMPM.txt=="")
- {
- vis tAMPM,0
- }
+ tTime.txt=vaTime.txt
}
if(tInstruction.txt=="date")
{
@@ -431,38 +362,36 @@
substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
//tMainText
spstr strCommand.txt,tMainText.txt,"?",2
+ //tMRIcon
+ spstr strCommand.txt,tTmp.txt,"?",3
+ covx tTmp.txt,sys0,0,0
+ substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
+ //tMR
+ spstr strCommand.txt,tMR.txt,"?",4
//tForecast1
- spstr strCommand.txt,tForecast1.txt,"?",3
+ spstr strCommand.txt,tForecast1.txt,"?",5
//tF1Icon
- spstr strCommand.txt,tTmp.txt,"?",4
+ spstr strCommand.txt,tTmp.txt,"?",6
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val
- spstr strCommand.txt,tForecast1Val.txt,"?",5
+ spstr strCommand.txt,tForecast1Val.txt,"?",7
//tForecast2
- spstr strCommand.txt,tForecast2.txt,"?",6
+ spstr strCommand.txt,tForecast2.txt,"?",8
//tF2Icon
- spstr strCommand.txt,tTmp.txt,"?",7
+ spstr strCommand.txt,tTmp.txt,"?",9
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val
- spstr strCommand.txt,tForecast2Val.txt,"?",8
- //tForecast3
- spstr strCommand.txt,tForecast3.txt,"?",9
- //tF3Icon
- spstr strCommand.txt,tTmp.txt,"?",10
- covx tTmp.txt,sys0,0,0
- substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
- //tForecast3Val
- spstr strCommand.txt,tForecast3Val.txt,"?",11
- //tForecast4
- spstr strCommand.txt,tForecast4.txt,"?",12
- //tF4Icon
- spstr strCommand.txt,tTmp.txt,"?",13
+ spstr strCommand.txt,tForecast2Val.txt,"?",10
+ }
+ if(tInstruction.txt=="page")
+ {
+ //pagenumber
+ spstr strCommand.txt,tTmp.txt,",",1
covx tTmp.txt,sys0,0,0
- substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
- //tForecast4Val
- spstr strCommand.txt,tForecast4Val.txt,"?",14
+ nPage=sys0
+ //don't send current page number, wake will do
}
if(tInstruction.txt=="pageType")
{
@@ -535,10 +464,12 @@
Events
Touch Press Event
- dim=100
- vaTap.val+=1
- covx vaTap.val,tTmp.txt,0,0
- tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+ //page open event
+ // event,pageOpen,cardEntities,pageNumber
+ // craft command
+ // convert pageNumber and write to tTmp
+ covx nPage,tTmp.txt,0,0
+ tSend.txt="event,pageOpen,"+tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
Reference in New Issue View Git Blame Copy Permalink