mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 23:44:25 +01:00
Update nextion2text.yml (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
6d1c02b2bc
commit
45c9ea64d0
@@ -1,199 +0,0 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -14,6 +14,3 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
int defaultBcoColor=6371
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
- page pageStartup
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -786,7 +786,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
Text :
|
||||
- Max. Text Size : 45
|
||||
+ Max. Text Size : 40
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -811,7 +811,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
Text :
|
||||
- Max. Text Size : 45
|
||||
+ Max. Text Size : 40
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -836,7 +836,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
Text :
|
||||
- Max. Text Size : 45
|
||||
+ Max. Text Size : 40
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
@@ -861,7 +861,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
Text :
|
||||
- Max. Text Size : 45
|
||||
+ Max. Text Size : 40
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
Only in HMI/n2t-out: cardPower.txt
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
// startup event
|
||||
- tSend.txt="event,startup,"+tVersion.txt+",eu"
|
||||
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 20:25:03.348580431 +0000
|
||||
@@ -13,36 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
vis p0,0
|
||||
- recmod=1
|
||||
- bauds=115200
|
||||
-
|
||||
-Variable (string) tInstruction
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 30
|
||||
-
|
||||
-Variable (string) strCommand
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 20
|
||||
-
|
||||
-Variable (string) tSend
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 40
|
||||
-
|
||||
-Text tBench
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Dragging : 0
|
||||
- Disable release event after dragging: 0
|
||||
- Send Component ID : disabled
|
||||
- Associated Keyboard : none
|
||||
- Text :
|
||||
- Max. Text Size : 20
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
@@ -220,96 +190,3 @@
|
||||
Touch Press Event
|
||||
page cardQR
|
||||
|
||||
-Button b12
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Dragging : 0
|
||||
- Disable release event after dragging: 0
|
||||
- Send Component ID : disabled
|
||||
- State : unpressed
|
||||
- Text : power
|
||||
- Max. Text Size : 10
|
||||
-
|
||||
- Events
|
||||
- Touch Press Event
|
||||
- page cardPower
|
||||
-
|
||||
-Timer tmSerial
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Period (ms): 50
|
||||
- Enabled : yes
|
||||
-
|
||||
- Events
|
||||
- Timer Event
|
||||
- // data available
|
||||
- if(usize>1)
|
||||
- {
|
||||
- bufferPos=0
|
||||
- while(bufferPos<usize)
|
||||
- {
|
||||
- // check for 0x55 0xBB - Command Init Secuence
|
||||
- if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||
- {
|
||||
- //remove garbage at the start of the buffer if there's any to free buffer for command
|
||||
- if(u[bufferPos]!=1)
|
||||
- {
|
||||
- udelete bufferPos-1
|
||||
- }
|
||||
- //instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||
- //get length after init sequence (check if there are more than to bytes in buffer)
|
||||
- if(3<usize)
|
||||
- {
|
||||
- // check if serial buffer has reached the announced length
|
||||
- ucopy payloadLength,2,2,0
|
||||
- // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||
- payloadLength+=3
|
||||
- // payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||
- payloadLength+=2
|
||||
- if(payloadLength<usize)
|
||||
- {
|
||||
- // calculate crc
|
||||
- crcrest 1,0xFFFF
|
||||
- // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||
- //crcputu 3,u[2]
|
||||
- // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||
- crcputu 0,payloadLength-1
|
||||
- // get recived crc to be able to compare it
|
||||
- ucopy recvCrc,payloadLength-1,2,0
|
||||
- // compare crc with recived value
|
||||
- if(crcval==recvCrc)
|
||||
- {
|
||||
- // crc is okay
|
||||
- // here is the location where acual code should be
|
||||
- // write command to variable strCommand
|
||||
- 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=="ping")
|
||||
- {
|
||||
- spstr strCommand.txt,tBench.txt,"~",1
|
||||
- tSend.txt="pong,"+tBench.txt
|
||||
- //send calc crc
|
||||
- btlen tSend.txt,sys0
|
||||
- crcrest 1,0xffff // reset CRC
|
||||
- crcputh 55 bb
|
||||
- crcputs sys0,2
|
||||
- crcputs tSend.txt,0
|
||||
- //send cmd
|
||||
- printh 55 bb
|
||||
- prints sys0,2
|
||||
- prints tSend.txt,0
|
||||
- prints crcval,2
|
||||
- }
|
||||
- // end of user code
|
||||
- udelete payloadLength-1
|
||||
- bufferPos=0
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- // next character
|
||||
- bufferPos++
|
||||
- }
|
||||
- }
|
||||
-
|
||||
|
||||
@@ -1,689 +0,0 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
@@ -14,6 +14,6 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
int defaultBcoColor=6371
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
+ // fix touch offset (Removed for US version)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
@@ -65,6 +65,16 @@
|
||||
vis nNum4,0
|
||||
vis bPrev,0
|
||||
vis bNext,0
|
||||
+ //ui e5
|
||||
+ vis btOnOff5,0
|
||||
+ vis bUp5,0
|
||||
+ vis bStop5,0
|
||||
+ vis bDown5,0
|
||||
+ vis tIcon5,0
|
||||
+ vis tEntity5,0
|
||||
+ vis bText5,0
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
cardEntities.bco=defaultBcoColor
|
||||
for(sys0=0;sys0<65;sys0++)
|
||||
{
|
||||
@@ -140,6 +150,18 @@
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
+Variable (string) entn5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 80
|
||||
+
|
||||
+Variable (string) type5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 10
|
||||
+
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -182,6 +204,15 @@
|
||||
Associated Keyboard : none
|
||||
Value : 0
|
||||
|
||||
+Number nNum5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Value : 0
|
||||
+
|
||||
Text tHeading
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -302,6 +333,26 @@
|
||||
Text :
|
||||
Max. Text Size : 50
|
||||
|
||||
+Text tEntity5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Text : tEntity5
|
||||
+ Max. Text Size : 30
|
||||
+
|
||||
+Text tIcon5
|
||||
+ 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
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -421,6 +472,34 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
+Slider hSlider5
|
||||
+ 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
|
||||
+ nNum5.val=hSlider5.val
|
||||
+ tSend.txt="event,buttonPress2,"+entn5.txt+",number-set,"
|
||||
+ covx nNum5.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,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Button bDown1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -878,6 +957,106 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
+Button bStop5
|
||||
+ 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,"+entn5.txt+",stop"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bDown5
|
||||
+ 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,"+entn5.txt+",down"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bUp5
|
||||
+ 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,"+entn5.txt+",up"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bText5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ State : unpressed
|
||||
+ Text :
|
||||
+ Max. Text Size : 45
|
||||
+
|
||||
+ 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,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Dual-state Button btOnOff1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -986,6 +1165,33 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
+Dual-state Button btOnOff5
|
||||
+ 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,"+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,2
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1111,6 +1317,33 @@
|
||||
page popupFan
|
||||
}
|
||||
|
||||
+Hotspot m4
|
||||
+ Attributes
|
||||
+ 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
|
||||
+ pageIcons.tTmp3.txt=tIcon5.txt
|
||||
+ if(type5.txt=="shutter")
|
||||
+ {
|
||||
+ //popupShutter.tHeading.txt=tEntity5.txt
|
||||
+ page popupShutter
|
||||
+ }
|
||||
+ if(type5.txt=="light")
|
||||
+ {
|
||||
+ //popupLight.tEntity.txt=tEntity5.txt
|
||||
+ page popupLight
|
||||
+ }
|
||||
+ if(type5.txt=="fan")
|
||||
+ {
|
||||
+ page popupFan
|
||||
+ }
|
||||
+
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1830,6 +2063,155 @@
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.maxval=sys0
|
||||
}
|
||||
+ // get Type
|
||||
+ spstr strCommand.txt,type5.txt,"~",27
|
||||
+ // get internal name
|
||||
+ spstr strCommand.txt,entn5.txt,"~",28
|
||||
+ if(type5.txt=="delete"||type5.txt=="")
|
||||
+ {
|
||||
+ vis bUp5,0
|
||||
+ vis bStop5,0
|
||||
+ vis bDown5,0
|
||||
+ vis btOnOff5,0
|
||||
+ vis tEntity5,0
|
||||
+ vis tIcon5,0
|
||||
+ vis bText5,0
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
+ }else
|
||||
+ {
|
||||
+ // change icon
|
||||
+ spstr strCommand.txt,tIcon5.txt,"~",29
|
||||
+ vis tIcon5,1
|
||||
+ // change icon color
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",30
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ tIcon5.pco=sys0
|
||||
+ // set name
|
||||
+ spstr strCommand.txt,tEntity5.txt,"~",31
|
||||
+ vis tEntity5,1
|
||||
+ }
|
||||
+ if(type5.txt=="shutter")
|
||||
+ {
|
||||
+ vis bUp5,1
|
||||
+ vis bStop5,1
|
||||
+ vis bDown5,1
|
||||
+ vis btOnOff5,0
|
||||
+ vis bText5,0
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tId.txt,"~",32
|
||||
+ // up button
|
||||
+ spstr tId.txt,tTmp.txt,"|",3
|
||||
+ if(tTmp.txt=="disable")
|
||||
+ {
|
||||
+ bUp5.pco=27501
|
||||
+ spstr tId.txt,bUp5.txt,"|",0
|
||||
+ tsw bUp5,0
|
||||
+ }else if(tTmp.txt=="enable")
|
||||
+ {
|
||||
+ bUp5.pco=65535
|
||||
+ spstr tId.txt,bUp5.txt,"|",0
|
||||
+ tsw bUp5,1
|
||||
+ }
|
||||
+ // stop button
|
||||
+ spstr tId.txt,tTmp.txt,"|",4
|
||||
+ if(tTmp.txt=="disable")
|
||||
+ {
|
||||
+ bStop5.pco=27501
|
||||
+ spstr tId.txt,bStop5.txt,"|",1
|
||||
+ tsw bStop5,0
|
||||
+ }else if(tTmp.txt=="enable")
|
||||
+ {
|
||||
+ bStop5.pco=65535
|
||||
+ spstr tId.txt,bStop5.txt,"|",1
|
||||
+ tsw bStop5,1
|
||||
+ }
|
||||
+ // down button
|
||||
+ spstr tId.txt,tTmp.txt,"|",5
|
||||
+ if(tTmp.txt=="disable")
|
||||
+ {
|
||||
+ bDown5.pco=27501
|
||||
+ spstr tId.txt,bDown5.txt,"|",2
|
||||
+ tsw bDown5,0
|
||||
+ }else if(tTmp.txt=="enable")
|
||||
+ {
|
||||
+ bDown5.pco=65535
|
||||
+ spstr tId.txt,bDown5.txt,"|",2
|
||||
+ tsw bDown5,1
|
||||
+ }
|
||||
+ }
|
||||
+ if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan")
|
||||
+ {
|
||||
+ vis bUp5,0
|
||||
+ vis bStop5,0
|
||||
+ vis bDown5,0
|
||||
+ vis btOnOff5,1
|
||||
+ vis bText5,0
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",32
|
||||
+ 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
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
+ bText5.pco=65535
|
||||
+ bText5.pco2=65535
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||
+ }
|
||||
+ if(type5.txt=="button")
|
||||
+ {
|
||||
+ vis bUp5,0
|
||||
+ vis bStop5,0
|
||||
+ vis bDown5,0
|
||||
+ vis btOnOff5,0
|
||||
+ vis bText5,1
|
||||
+ tsw bText5,1
|
||||
+ vis hSlider5,0
|
||||
+ vis nNum5,0
|
||||
+ bText5.pco=1374
|
||||
+ bText5.pco2=1374
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||
+ }
|
||||
+ if(type5.txt=="number")
|
||||
+ {
|
||||
+ vis bUp5,0
|
||||
+ vis bStop5,0
|
||||
+ vis bDown5,0
|
||||
+ vis btOnOff5,0
|
||||
+ vis bText5,0
|
||||
+ tsw bText5,0
|
||||
+ vis hSlider5,1
|
||||
+ vis nNum5,1
|
||||
+ // get config (optional Value) (use bText as variable)
|
||||
+ spstr strCommand.txt,bText5.txt,"~",32
|
||||
+ //first value is current value
|
||||
+ spstr bText5.txt,tTmp.txt,"|",0
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider5.val=sys0
|
||||
+ nNum5.val=sys0
|
||||
+ //second value is min value
|
||||
+ spstr bText5.txt,tTmp.txt,"|",1
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider5.minval=sys0
|
||||
+ //third value is max value
|
||||
+ spstr bText5.txt,tTmp.txt,"|",2
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider5.maxval=sys0
|
||||
+ }
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
Only in HMI/n2t-out: cardPower.txt
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
@@ -142,7 +142,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
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
// startup event
|
||||
- tSend.txt="event,startup,"+tVersion.txt+",eu"
|
||||
+ tSend.txt="event,startup,"+tVersion.txt+",us-p"
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
@@ -13,36 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
vis p0,0
|
||||
- recmod=1
|
||||
- bauds=115200
|
||||
-
|
||||
-Variable (string) tInstruction
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 30
|
||||
-
|
||||
-Variable (string) strCommand
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 20
|
||||
-
|
||||
-Variable (string) tSend
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Text :
|
||||
- Max. Text Size: 40
|
||||
-
|
||||
-Text tBench
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Dragging : 0
|
||||
- Disable release event after dragging: 0
|
||||
- Send Component ID : disabled
|
||||
- Associated Keyboard : none
|
||||
- Text :
|
||||
- Max. Text Size : 20
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
@@ -220,96 +190,3 @@
|
||||
Touch Press Event
|
||||
page cardQR
|
||||
|
||||
-Button b12
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Dragging : 0
|
||||
- Disable release event after dragging: 0
|
||||
- Send Component ID : disabled
|
||||
- State : unpressed
|
||||
- Text : power
|
||||
- Max. Text Size : 10
|
||||
-
|
||||
- Events
|
||||
- Touch Press Event
|
||||
- page cardPower
|
||||
-
|
||||
-Timer tmSerial
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Period (ms): 50
|
||||
- Enabled : yes
|
||||
-
|
||||
- Events
|
||||
- Timer Event
|
||||
- // data available
|
||||
- if(usize>1)
|
||||
- {
|
||||
- bufferPos=0
|
||||
- while(bufferPos<usize)
|
||||
- {
|
||||
- // check for 0x55 0xBB - Command Init Secuence
|
||||
- if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||
- {
|
||||
- //remove garbage at the start of the buffer if there's any to free buffer for command
|
||||
- if(u[bufferPos]!=1)
|
||||
- {
|
||||
- udelete bufferPos-1
|
||||
- }
|
||||
- //instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||
- //get length after init sequence (check if there are more than to bytes in buffer)
|
||||
- if(3<usize)
|
||||
- {
|
||||
- // check if serial buffer has reached the announced length
|
||||
- ucopy payloadLength,2,2,0
|
||||
- // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||
- payloadLength+=3
|
||||
- // payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||
- payloadLength+=2
|
||||
- if(payloadLength<usize)
|
||||
- {
|
||||
- // calculate crc
|
||||
- crcrest 1,0xFFFF
|
||||
- // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||
- //crcputu 3,u[2]
|
||||
- // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||
- crcputu 0,payloadLength-1
|
||||
- // get recived crc to be able to compare it
|
||||
- ucopy recvCrc,payloadLength-1,2,0
|
||||
- // compare crc with recived value
|
||||
- if(crcval==recvCrc)
|
||||
- {
|
||||
- // crc is okay
|
||||
- // here is the location where acual code should be
|
||||
- // write command to variable strCommand
|
||||
- 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=="ping")
|
||||
- {
|
||||
- spstr strCommand.txt,tBench.txt,"~",1
|
||||
- tSend.txt="pong,"+tBench.txt
|
||||
- //send calc crc
|
||||
- btlen tSend.txt,sys0
|
||||
- crcrest 1,0xffff // reset CRC
|
||||
- crcputh 55 bb
|
||||
- crcputs sys0,2
|
||||
- crcputs tSend.txt,0
|
||||
- //send cmd
|
||||
- printh 55 bb
|
||||
- prints sys0,2
|
||||
- prints tSend.txt,0
|
||||
- prints crcval,2
|
||||
- }
|
||||
- // end of user code
|
||||
- udelete payloadLength-1
|
||||
- bufferPos=0
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- // next character
|
||||
- bufferPos++
|
||||
- }
|
||||
- }
|
||||
-
|
||||
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
||||
--- HMI/n2t-out/popupFan.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
@@ -82,23 +82,23 @@
|
||||
Scope: local
|
||||
Value: 0
|
||||
|
||||
-Variable (int32) vaModePos
|
||||
- Attributes
|
||||
- Scope: local
|
||||
- Value: 0
|
||||
-
|
||||
-Variable (string) vaModeList
|
||||
+Variable (string) vaModeCur
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 400
|
||||
|
||||
-Variable (string) vaModeCur
|
||||
+Variable (string) vaModeList
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 400
|
||||
|
||||
+Variable (int32) vaModePos
|
||||
+ Attributes
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
Variable (string) tSend
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -257,7 +257,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Button bMode3
|
||||
+Button bMode2
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -272,7 +272,7 @@
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"
|
||||
tSend.txt+=entn.txt+","
|
||||
- sys2=vaModePos.val-1
|
||||
+ sys2=vaModePos.val-2
|
||||
covx sys2,tTmp.txt,0,0
|
||||
tSend.txt+="mode-sel,"+tTmp.txt
|
||||
//send calc crc
|
||||
@@ -287,7 +287,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Button bMode2
|
||||
+Button bMode3
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -302,7 +302,7 @@
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"
|
||||
tSend.txt+=entn.txt+","
|
||||
- sys2=vaModePos.val-2
|
||||
+ sys2=vaModePos.val-1
|
||||
covx sys2,tTmp.txt,0,0
|
||||
tSend.txt+="mode-sel,"+tTmp.txt
|
||||
//send calc crc
|
||||
|
||||
@@ -1,249 +0,0 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 20:25:02.888571201 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
+@@ -14,6 +14,6 @@
|
||||
+ //color vars
|
||||
+ int defaultFontColor=65535
|
||||
+ int defaultBcoColor=6371
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
+@@ -65,6 +65,16 @@
|
||||
+ vis bPrev,0
|
||||
+ vis bNext,0
|
||||
+ cardEntities.bco=defaultBcoColor
|
||||
+ for(sys0=0;sys0<65;sys0++)
|
||||
+ {
|
||||
+@@ -140,6 +150,18 @@
|
||||
+ Variable (string) tSend
|
||||
+ Scope : local
|
||||
+@@ -182,6 +204,15 @@
|
||||
+@@ -302,6 +333,26 @@
|
||||
+@@ -421,6 +472,34 @@
|
||||
+@@ -878,6 +957,106 @@
|
||||
++ Max. Text Size : 45
|
||||
+@@ -986,6 +1165,33 @@
|
||||
+@@ -1111,6 +1317,33 @@
|
||||
+ page popupFan
|
||||
++ pageIcons.tTmp3.txt=tIcon5.txt
|
||||
+@@ -1830,6 +2063,155 @@
|
||||
++ vis bUp5,0
|
||||
++ vis bStop5,0
|
||||
++ vis bDown5,0
|
||||
++ vis btOnOff5,1
|
||||
++ vis bText5,0
|
||||
++ vis hSlider5,0
|
||||
++ vis nNum5,0
|
||||
++ // get Button State (optional Value)
|
||||
++ spstr strCommand.txt,tTmp.txt,"~",32
|
||||
++ covx tTmp.txt,sys0,0,0
|
||||
++ btOnOff5.val=sys0
|
||||
+Only in HMI/n2t-out: cardPower.txt
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||
+--- HMI/n2t-out/pageTest.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
+@@ -13,36 +13,6 @@
|
||||
+ Events
|
||||
+ Preinitialize Event
|
||||
+ vis p0,0
|
||||
+- recmod=1
|
||||
+- bauds=115200
|
||||
+-
|
||||
+-Variable (string) tInstruction
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Text :
|
||||
+- Max. Text Size: 30
|
||||
+-
|
||||
+-Variable (string) strCommand
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Text :
|
||||
+- Max. Text Size: 20
|
||||
+-
|
||||
+-Variable (string) tSend
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Text :
|
||||
+- Max. Text Size: 40
|
||||
+-
|
||||
+-Text tBench
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Dragging : 0
|
||||
+- Disable release event after dragging: 0
|
||||
+- Send Component ID : disabled
|
||||
+- Associated Keyboard : none
|
||||
+- Text :
|
||||
+- Max. Text Size : 20
|
||||
+
|
||||
+ Picture p0
|
||||
+ Attributes
|
||||
+@@ -220,96 +190,3 @@
|
||||
+ Touch Press Event
|
||||
+ page cardQR
|
||||
+
|
||||
+-Button b12
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Dragging : 0
|
||||
+- Disable release event after dragging: 0
|
||||
+- Send Component ID : disabled
|
||||
+- State : unpressed
|
||||
+- Text : power
|
||||
+- Max. Text Size : 10
|
||||
+-
|
||||
+- Events
|
||||
+- Touch Press Event
|
||||
+- page cardPower
|
||||
+-
|
||||
+-Timer tmSerial
|
||||
+- Attributes
|
||||
+- Scope : local
|
||||
+- Period (ms): 50
|
||||
+- Enabled : yes
|
||||
+-
|
||||
+- Events
|
||||
+- Timer Event
|
||||
+- // data available
|
||||
+- if(usize>1)
|
||||
+- {
|
||||
+- bufferPos=0
|
||||
+- while(bufferPos<usize)
|
||||
+- {
|
||||
+- // check for 0x55 0xBB - Command Init Secuence
|
||||
+- if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
||||
+- {
|
||||
+- //remove garbage at the start of the buffer if there's any to free buffer for command
|
||||
+- if(u[bufferPos]!=1)
|
||||
+- {
|
||||
+- udelete bufferPos-1
|
||||
+- }
|
||||
+- //instruction is now aligned with buffer, because we deleted garbage before instrcution
|
||||
+- //get length after init sequence (check if there are more than to bytes in buffer)
|
||||
+- if(3<usize)
|
||||
+- {
|
||||
+- // check if serial buffer has reached the announced length
|
||||
+- ucopy payloadLength,2,2,0
|
||||
+- // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
||||
+- payloadLength+=3
|
||||
+- // payload length does also not contain crc, so we are adding another 2 bytes for crc
|
||||
+- payloadLength+=2
|
||||
+- if(payloadLength<usize)
|
||||
+- {
|
||||
+- // calculate crc
|
||||
+- crcrest 1,0xFFFF
|
||||
+- // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
||||
+- //crcputu 3,u[2]
|
||||
+- // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
||||
+- crcputu 0,payloadLength-1
|
||||
+- // get recived crc to be able to compare it
|
||||
+- ucopy recvCrc,payloadLength-1,2,0
|
||||
+- // compare crc with recived value
|
||||
+- if(crcval==recvCrc)
|
||||
+- {
|
||||
+- // crc is okay
|
||||
+- // here is the location where acual code should be
|
||||
+- // write command to variable strCommand
|
||||
+- 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=="ping")
|
||||
+- {
|
||||
+- spstr strCommand.txt,tBench.txt,"~",1
|
||||
+- tSend.txt="pong,"+tBench.txt
|
||||
+- //send calc crc
|
||||
+- btlen tSend.txt,sys0
|
||||
+- crcrest 1,0xffff // reset CRC
|
||||
+- crcputh 55 bb
|
||||
+- crcputs sys0,2
|
||||
+- crcputs tSend.txt,0
|
||||
+- //send cmd
|
||||
+- printh 55 bb
|
||||
+- prints sys0,2
|
||||
+- prints tSend.txt,0
|
||||
+- prints crcval,2
|
||||
+- }
|
||||
+- // end of user code
|
||||
+- udelete payloadLength-1
|
||||
+- bufferPos=0
|
||||
+- }
|
||||
+- }
|
||||
+- }
|
||||
+- }
|
||||
+- // next character
|
||||
+- bufferPos++
|
||||
+- }
|
||||
+- }
|
||||
+-
|
||||
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
||||
+--- HMI/n2t-out/popupFan.txt 2022-09-17 20:25:02.380561007 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 20:25:02.840570238 +0000
|
||||
+@@ -82,23 +82,23 @@
|
||||
+ Scope: local
|
||||
+ Value: 0
|
||||
+
|
||||
+-Variable (int32) vaModePos
|
||||
+- Attributes
|
||||
+- Scope: local
|
||||
+- Value: 0
|
||||
+-
|
||||
+-Variable (string) vaModeList
|
||||
++Variable (string) vaModeCur
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 400
|
||||
+
|
||||
+-Variable (string) vaModeCur
|
||||
++Variable (string) vaModeList
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 400
|
||||
+
|
||||
++Variable (int32) vaModePos
|
||||
++ Attributes
|
||||
++ Scope: local
|
||||
++ Value: 0
|
||||
++
|
||||
+ Variable (string) tSend
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+@@ -257,7 +257,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Button bMode3
|
||||
++Button bMode2
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -272,7 +272,7 @@
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"
|
||||
+ tSend.txt+=entn.txt+","
|
||||
+- sys2=vaModePos.val-1
|
||||
++ sys2=vaModePos.val-2
|
||||
+ covx sys2,tTmp.txt,0,0
|
||||
+ tSend.txt+="mode-sel,"+tTmp.txt
|
||||
+ //send calc crc
|
||||
+@@ -287,7 +287,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Button bMode2
|
||||
++Button bMode3
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -302,7 +302,7 @@
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"
|
||||
+ tSend.txt+=entn.txt+","
|
||||
+- sys2=vaModePos.val-2
|
||||
++ sys2=vaModePos.val-1
|
||||
+ covx sys2,tTmp.txt,0,0
|
||||
+ tSend.txt+="mode-sel,"+tTmp.txt
|
||||
+ //send calc crc
|
||||
|
||||
Reference in New Issue
Block a user