h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-10-08 23:36:27 +02:00
parent 98a35af622 9c57c96647
commit d21d929444
16 changed files with 4597 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/nextion2text.yml vendored
View File

@@ -56,7 +56,7 @@ jobs:
echo portrait
python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out
diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
diffoscope --exclude=pageTest.txt --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
#diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt
- name: Run n2t US P DIFF DIFF
@@ -71,7 +71,7 @@ jobs:
echo landscape
python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out
#diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
diffoscope --exclude=pageTest.txt --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt
- name: Display txt files
continue-on-error: true

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

@@ -1,20 +1,5 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardMedia.txt
│ -cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ pageTest.txt
│ popupFan.txt
│ popupLight.txt
├── Program.s.txt
│ @@ -10,10 +10,7 @@
│ int sleepValue=0
@@ -176,7 +161,23 @@
│ }
│ }
├── cardQR.txt
│ @@ -702,18 +702,14 @@
│ @@ -653,15 +653,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //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
│ }
│ @@ -703,18 +702,14 @@
│ {
│ page cardAlarm
│ }
@@ -233,154 +234,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
├── pageTest.txt
│ @@ -9,45 +9,15 @@
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID : disabled
│
│ 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
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│
│ @@ -216,100 +186,7 @@
│ Text : qr
│ Max. Text Size : 10
│
│ Events
│ 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++
│ - }
│ - }
│ -
├── popupFan.txt
│ @@ -623,18 +623,14 @@
│ {

1378
HMI/US/landscape/n2t-out-visual/cardPower.txt Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -50,6 +50,10 @@ cardThermo
52 Component(s)
580 Line(s) of event code
303 Unique line(s) of event code
cardPower
43 Component(s)
420 Line(s) of event code
292 Unique line(s) of event code
cardAlarm
40 Component(s)
422 Line(s) of event code
@@ -60,7 +64,7 @@ cardEntities
519 Unique line(s) of event code
Total
14 Page(s)
439 Component(s)
5264 Line(s) of event code
1412 Unique line(s) of event code
15 Page(s)
482 Component(s)
5684 Line(s) of event code
1546 Unique line(s) of event code

870
HMI/US/landscape/n2t-out/cardPower.txt Normal file
View File

@@ -0,0 +1,870 @@
Page cardPower
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Events
Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis bPrev,0
vis bNext,0
tsw h0,0
tsw h1,0
tsw h2,0
tsw h3,0
tsw h4,0
tsw h5,0
vis h0,0
vis h1,0
vis h2,0
vis h3,0
vis h4,0
vis h5,0
vis t0Icon,0
vis t1Icon,0
vis t2Icon,0
vis t3Icon,0
vis t4Icon,0
vis t5Icon,0
cardPower.bco=defaultBcoColor
for(sys0=0;sys0<43;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
}
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 275
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 10
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (int32) t0Speed
Attributes
Scope: local
Value: 0
Variable (int32) t1Speed
Attributes
Scope: local
Value: 0
Variable (int32) t3Speed
Attributes
Scope: local
Value: 0
Variable (int32) t4Speed
Attributes
Scope: local
Value: 0
Variable (int32) t5Speed
Attributes
Scope: local
Value: 0
Variable (int32) t2Speed
Attributes
Scope: local
Value: 0
Text tHeading
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Text t4Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î´½
Max. Text Size : 5
Text t5Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t0Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t2Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î °
Max. Text Size : 5
Text t1Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t3Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î °
Max. Text Size : 5
Text t0u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t1u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t2u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t5u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t4u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t3u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tHome
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
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Slider h1
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
Slider h4
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
Slider h0
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
Slider h2
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
Slider h5
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
Slider h3
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
Button bNext
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,cardAlarm,bNext"
//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 bPrev
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,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//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 mSwipeNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bNext,1
Hotspot mSwipeUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
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=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",4
// text home
spstr strCommand.txt,tHome.txt,"~",5
// iconColor
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",7
// speed
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,t0Speed.val,0,0
// lower text
spstr strCommand.txt,t0u.txt,"~",9
if(t0Icon.txt!="")
{
vis t0Icon,1
vis t0u,1
vis h0,1
}else
{
vis t0Icon,0
vis t0u,0
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",11
// speed
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,t1Speed.val,0,0
// lower text
spstr strCommand.txt,t1u.txt,"~",13
if(t1Icon.txt!="")
{
vis t1Icon,1
vis t1u,1
vis h1,1
}else
{
vis t1Icon,0
vis t1u,0
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",15
// speed
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,t2Speed.val,0,0
// lower text
spstr strCommand.txt,t2u.txt,"~",17
if(t2Icon.txt!="")
{
vis t2Icon,1
vis t2u,1
vis h2,1
}else
{
vis t2Icon,0
vis t2u,0
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",19
// speed
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,t3Speed.val,0,0
// lower text
spstr strCommand.txt,t3u.txt,"~",21
if(t3Icon.txt!="")
{
vis t3Icon,1
vis t3u,1
vis h3,1
}else
{
vis t3Icon,0
vis t3u,0
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",23
// speed
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,t4Speed.val,0,0
// lower text
spstr strCommand.txt,t4u.txt,"~",25
if(t4Icon.txt!="")
{
vis t4Icon,1
vis t4u,1
vis h4,1
}else
{
vis t4Icon,0
vis t4u,0
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",27
// speed
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,t5Speed.val,0,0
// lower text
spstr strCommand.txt,t5u.txt,"~",29
if(t5Icon.txt!="")
{
vis t5Icon,1
vis t5u,1
vis h5,1
}else
{
vis t5Icon,0
vis t5u,0
vis h5,0
}
}
if(tInstruction.txt=="pageType")
{
sleepValue=0
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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")
{
page cardEntities
}
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//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
}
}
Timer tm0
Attributes
Scope : local
Period (ms): 100
Enabled : yes
Events
Timer Event
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

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

@@ -1,20 +1,5 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardEntities.txt
│ cardGrid.txt
│ cardMedia.txt
│ -cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ pageTest.txt
│ popupFan.txt
│ popupLight.txt
├── Program.s.txt
│ @@ -10,10 +10,10 @@
│ int sleepValue=0
@@ -627,7 +612,23 @@
│ }
│ }
├── cardQR.txt
│ @@ -702,18 +702,14 @@
│ @@ -653,15 +653,14 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ //save second arg if there's one
│ spstr strCommand.txt,tTmp.txt,"~",2
│ //save third arg if there's one
│ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
│ - spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
│ //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
│ }
│ @@ -703,18 +702,14 @@
│ {
│ page cardAlarm
│ }
@@ -719,154 +720,6 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
├── pageTest.txt
│ @@ -9,45 +9,15 @@
│ Swide down page ID : disabled
│ Swide left page ID : disabled
│ Swide right page ID : disabled
│
│ 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
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│
│ @@ -216,100 +186,7 @@
│ Text : qr
│ Max. Text Size : 10
│
│ Events
│ 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++
│ - }
│ - }
│ -
├── popupFan.txt
│ @@ -78,31 +78,31 @@
│ Value: 1

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-08 14:12:50.745832486 +0000
+++ /dev/fd/62 2022-10-08 21:22:56.668959488 +0000
+rdAlarm.txt
+18 +833,14 @@
+ {
@@ -79,6 +79,22 @@
+ }
+ }
+rdQR.txt
+15 +653,14 @@
+ //command format pageType,specialPageName
+ //write name of speical page to tId
+ spstr strCommand.txt,tId.txt,"~",1
+ //save second arg if there's one
+ spstr strCommand.txt,tTmp.txt,"~",2
+ //save third arg if there's one
+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
+ spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
+ //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
+ }
+18 +702,14 @@
+ {
+ page cardAlarm
@@ -136,154 +152,6 @@
+ Scope : global
+ Dragging : 0
+ Disable release event after dragging: 0
+geTest.txt
+ +9,15 @@
+ Swide down page ID : disabled
+ Swide left page ID : disabled
+ Swide right page ID : disabled
+
+nts
+ Preinitialize Event
+ vis p0,0
+ recmod=1
+ bauds=115200
+
+e (string) tInstruction
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 30
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+
+e (string) tSend
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 40
+
+ench
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 20
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+
+100 +186,7 @@
+ Text : qr
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ page cardQR
+
+b12
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ State : unpressed
+ Text : power
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ page cardPower
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+
+nts
+ 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++
+ }
+ }
+
+18 +623,14 @@
+ {
+ page cardAlarm

1378
HMI/US/portrait/n2t-out-visual/cardPower.txt Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -597,9 +597,9 @@ Hotspot mSwipeNext
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 311
x coordinate : 310
y coordinate : 5
Width : 9
Width : 8
Height : 475
Effect : load
Effect Priority : 0

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

@@ -30,6 +30,10 @@ popupShutter
25 Component(s)
389 Line(s) of event code
213 Unique line(s) of event code
cardPower
43 Component(s)
420 Line(s) of event code
292 Unique line(s) of event code
cardGrid
42 Component(s)
469 Line(s) of event code
@@ -60,7 +64,7 @@ cardEntities
605 Unique line(s) of event code
Total
14 Page(s)
451 Component(s)
5487 Line(s) of event code
1486 Unique line(s) of event code
15 Page(s)
494 Component(s)
5907 Line(s) of event code
1620 Unique line(s) of event code

870
HMI/US/portrait/n2t-out/cardPower.txt Normal file
View File

@@ -0,0 +1,870 @@
Page cardPower
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Events
Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis bPrev,0
vis bNext,0
tsw h0,0
tsw h1,0
tsw h2,0
tsw h3,0
tsw h4,0
tsw h5,0
vis h0,0
vis h1,0
vis h2,0
vis h3,0
vis h4,0
vis h5,0
vis t0Icon,0
vis t1Icon,0
vis t2Icon,0
vis t3Icon,0
vis t4Icon,0
vis t5Icon,0
cardPower.bco=defaultBcoColor
for(sys0=0;sys0<43;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
}
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 275
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 10
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (int32) t0Speed
Attributes
Scope: local
Value: 0
Variable (int32) t1Speed
Attributes
Scope: local
Value: 0
Variable (int32) t3Speed
Attributes
Scope: local
Value: 0
Variable (int32) t4Speed
Attributes
Scope: local
Value: 0
Variable (int32) t5Speed
Attributes
Scope: local
Value: 0
Variable (int32) t2Speed
Attributes
Scope: local
Value: 0
Text tHeading
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Text t4Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î´½
Max. Text Size : 5
Text t5Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t0Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t2Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î °
Max. Text Size : 5
Text t1Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 5
Text t3Icon
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : î °
Max. Text Size : 5
Text t0u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t1u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t2u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t5u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t4u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text t3u
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tHome
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
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Slider h1
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
Slider h4
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
Slider h0
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
Slider h2
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
Slider h5
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
Slider h3
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
Button bNext
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,cardAlarm,bNext"
//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 bPrev
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,cardAlarm,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//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 mSwipeNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bNext,1
Hotspot mSwipeUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
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=="entityUpd")
{
// command format: entityUpd,heading,navigation,colorHome,iconHome[,iconColor,icon,speed,valueUp,valueDown]x6
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
// icon color home
spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",4
// text home
spstr strCommand.txt,tHome.txt,"~",5
// iconColor
spstr strCommand.txt,tTmp.txt,"~",6
covx tTmp.txt,t0Icon.pco,0,0
// icon
spstr strCommand.txt,t0Icon.txt,"~",7
// speed
spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,t0Speed.val,0,0
// lower text
spstr strCommand.txt,t0u.txt,"~",9
if(t0Icon.txt!="")
{
vis t0Icon,1
vis t0u,1
vis h0,1
}else
{
vis t0Icon,0
vis t0u,0
vis h0,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",10
covx tTmp.txt,t1Icon.pco,0,0
// icon
spstr strCommand.txt,t1Icon.txt,"~",11
// speed
spstr strCommand.txt,tTmp.txt,"~",12
covx tTmp.txt,t1Speed.val,0,0
// lower text
spstr strCommand.txt,t1u.txt,"~",13
if(t1Icon.txt!="")
{
vis t1Icon,1
vis t1u,1
vis h1,1
}else
{
vis t1Icon,0
vis t1u,0
vis h1,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,t2Icon.pco,0,0
// icon
spstr strCommand.txt,t2Icon.txt,"~",15
// speed
spstr strCommand.txt,tTmp.txt,"~",16
covx tTmp.txt,t2Speed.val,0,0
// lower text
spstr strCommand.txt,t2u.txt,"~",17
if(t2Icon.txt!="")
{
vis t2Icon,1
vis t2u,1
vis h2,1
}else
{
vis t2Icon,0
vis t2u,0
vis h2,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",18
covx tTmp.txt,t3Icon.pco,0,0
// icon
spstr strCommand.txt,t3Icon.txt,"~",19
// speed
spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,t3Speed.val,0,0
// lower text
spstr strCommand.txt,t3u.txt,"~",21
if(t3Icon.txt!="")
{
vis t3Icon,1
vis t3u,1
vis h3,1
}else
{
vis t3Icon,0
vis t3u,0
vis h3,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,t4Icon.pco,0,0
// icon
spstr strCommand.txt,t4Icon.txt,"~",23
// speed
spstr strCommand.txt,tTmp.txt,"~",24
covx tTmp.txt,t4Speed.val,0,0
// lower text
spstr strCommand.txt,t4u.txt,"~",25
if(t4Icon.txt!="")
{
vis t4Icon,1
vis t4u,1
vis h4,1
}else
{
vis t4Icon,0
vis t4u,0
vis h4,0
}
// iconColor
spstr strCommand.txt,tTmp.txt,"~",26
covx tTmp.txt,t5Icon.pco,0,0
// icon
spstr strCommand.txt,t5Icon.txt,"~",27
// speed
spstr strCommand.txt,tTmp.txt,"~",28
covx tTmp.txt,t5Speed.val,0,0
// lower text
spstr strCommand.txt,t5u.txt,"~",29
if(t5Icon.txt!="")
{
vis t5Icon,1
vis t5u,1
vis h5,1
}else
{
vis t5Icon,0
vis t5u,0
vis h5,0
}
}
if(tInstruction.txt=="pageType")
{
sleepValue=0
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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")
{
page cardEntities
}
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//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
}
}
Timer tm0
Attributes
Scope : local
Period (ms): 100
Enabled : yes
Events
Timer Event
sys0=h0.val+t0Speed.val
if(sys0>h0.maxval)
{
h0.val=h0.minval
}
if(sys0<h0.minval)
{
h0.val=h0.maxval
}
h0.val+=t0Speed.val
sys0=h1.val+t1Speed.val
if(sys0>h1.maxval)
{
h1.val=h1.minval
}
if(sys0<h1.minval)
{
h1.val=h1.maxval
}
h1.val+=t1Speed.val
sys0=h2.val+t2Speed.val
if(sys0>h2.maxval)
{
h2.val=h2.minval
}
if(sys0<h2.minval)
{
h2.val=h2.maxval
}
h2.val+=t2Speed.val
sys0=h3.val+t3Speed.val
if(sys0>h3.maxval)
{
h3.val=h3.minval
}
if(sys0<h3.minval)
{
h3.val=h3.maxval
}
h3.val+=t3Speed.val
sys0=h4.val+t4Speed.val
if(sys0>h4.maxval)
{
h4.val=h4.minval
}
if(sys0<h4.minval)
{
h4.val=h4.maxval
}
h4.val+=t4Speed.val
sys0=h5.val+t5Speed.val
if(sys0>h5.maxval)
{
h5.val=h5.minval
}
if(sys0<h5.minval)
{
h5.val=h5.maxval
}
h5.val+=t5Speed.val
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

11
HMI/n2t-out-visual/cardPower.txt
View File

@@ -54,6 +54,12 @@ Page cardPower
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
}
Variable (string) strCommand
@@ -1154,6 +1160,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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
@@ -1203,6 +1210,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

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

@@ -956,6 +956,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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

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

@@ -44,8 +44,8 @@ popupShutter
215 Unique line(s) of event code
cardQR
32 Component(s)
408 Line(s) of event code
237 Unique line(s) of event code
409 Line(s) of event code
238 Unique line(s) of event code
cardAlarm
40 Component(s)
426 Line(s) of event code
@@ -60,11 +60,11 @@ cardEntities
521 Unique line(s) of event code
cardPower
43 Component(s)
409 Line(s) of event code
285 Unique line(s) of event code
420 Line(s) of event code
292 Unique line(s) of event code
Total
15 Page(s)
488 Component(s)
5770 Line(s) of event code
1557 Unique line(s) of event code
5782 Line(s) of event code
1561 Unique line(s) of event code

11
HMI/n2t-out/cardPower.txt
View File

@@ -46,6 +46,12 @@ Page cardPower
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==1)
{
b[sys0].pic=19
b[sys0].pic1=19
b[sys0].pic2=15
}
}
Variable (string) strCommand
@@ -649,6 +655,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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
@@ -698,6 +705,10 @@ Timer tmSerial
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
}
if(tInstruction.txt=="time")
{

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

@@ -657,6 +657,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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