add loc para (add nextion2text)

This commit is contained in:
joBr99
2022-05-14 12:54:22 +00:00
committed by github-actions[bot]
parent 5d5f565ece
commit 8f45d3ca78
6 changed files with 1048 additions and 911 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 12:54:22.003143502 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 12:54:22.003143502 +0000
@@ -466,90 +466,6 @@
prints crcval,2
tCode.txt=""
@@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 12:54:22.003143502 +0000
@@ -1074,90 +1074,6 @@
page popupLight
}
@@ -197,8 +197,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 12:54:22.003143502 +0000
@@ -522,90 +522,6 @@
page pageTest
}
@@ -291,8 +291,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-14 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 12:54:22.003143502 +0000
@@ -223,7 +223,7 @@
Events
@@ -403,8 +403,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 12:54:22.003143502 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -421,18 +421,51 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -34,10 +31,6 @@
@@ -33,10 +30,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
- vis t0,0
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
+ vis bt8,0
vis bPrev,0
vis bNext,0
@@ -116,7 +109,7 @@
@@ -100,30 +94,12 @@
Text :
Max. Text Size: 10
-Variable (string) tInstruction
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tId
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tTmp
+Variable (string) va8
Attributes
Scope : local
Text :
Max. Text Size: 10
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 100
-
XFloat xTempCurr
Attributes
Scope : local
@@ -133,7 +109,7 @@
Associated Keyboard : none
Value : 0
@@ -441,7 +474,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -125,7 +118,7 @@
@@ -142,7 +118,7 @@
Associated Keyboard : none
Value : 0
@@ -450,7 +483,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -134,7 +127,7 @@
@@ -151,7 +127,7 @@
Associated Keyboard : none
Value : 0
@@ -459,52 +492,70 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -143,43 +136,7 @@
@@ -160,7 +136,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempStep1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempDest2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMax2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempStep2
+XFloat xTempStep
Attributes
Scope : local
Dragging : 0
@@ -258,36 +215,6 @@
@@ -169,41 +145,45 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest2
+Text tSend
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text : newtxt
+ Max. Text Size : 100
-XFloat xTempMin2
+Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 10
-XFloat xTempMax2
+Text tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 20
-XFloat xTempStep2
+Text tId
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 20
Text tHeading
Attributes
@@ -235,46 +215,6 @@
Text : 
Max. Text Size : 10
@@ -537,11 +588,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
-Text tALbl
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : Action
- Max. Text Size : 30
-
Picture p0
Attributes
Scope : local
@@ -379,7 +306,7 @@
@@ -366,7 +306,7 @@
prints tSend.txt,0
prints crcval,2
@@ -550,7 +611,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -406,7 +333,7 @@
@@ -380,7 +320,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va2.txt
+ tSend.txt+=",hvac_action,"+va1.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -393,7 +333,7 @@
prints tSend.txt,0
prints crcval,2
@@ -559,7 +629,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -433,7 +360,7 @@
@@ -407,7 +347,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va4.txt
+ tSend.txt+=",hvac_action,"+va2.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -420,7 +360,7 @@
prints tSend.txt,0
prints crcval,2
@@ -568,101 +647,81 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -460,7 +387,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt8
+Dual-state Button bt4
Attributes
Scope : local
Dragging : 0
@@ -487,7 +414,7 @@
@@ -434,7 +374,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va6.txt
+ tSend.txt+=",hvac_action,"+va3.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -447,13 +387,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt1
+Dual-state Button bt5
+Dual-state Button bt4
Attributes
Scope : local
Dragging : 0
@@ -514,7 +441,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -461,7 +401,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va1.txt
+ tSend.txt+=",hvac_action,"+va4.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -474,7 +414,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt3
+Dual-state Button bt6
+Dual-state Button bt5
Attributes
Scope : local
Dragging : 0
@@ -541,7 +468,7 @@
@@ -488,7 +428,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va3.txt
+ tSend.txt+=",hvac_action,"+va5.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -501,7 +441,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt5
+Dual-state Button bt7
+Dual-state Button bt6
Attributes
Scope : local
Dragging : 0
@@ -568,7 +495,7 @@
@@ -515,7 +455,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va5.txt
+ tSend.txt+=",hvac_action,"+va6.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -555,66 +495,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt7
+Dual-state Button bt8
Attributes
Scope : local
Dragging : 0
@@ -607,9 +534,9 @@
Events
Touch Press Event
- if(xTempDest1.val<xTempMax1.val)
+ if(xTempDest.val<xTempMax.val)
{
- xTempDest1.val=xTempDest1.val+xTempStep1.val
+ xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
@@ -617,7 +544,7 @@
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
+ covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -643,81 +570,9 @@
Events
Touch Press Event
- if(xTempDest1.val>xTempMin1.val)
- {
- xTempDest1.val=xTempDest1.val-xTempStep1.val
- }
- // event,buttonPress2,entn,tempUpd,X
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest1.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
-
-Dual-state Button bUp2
-Dual-state Button btUp1
- Attributes
- Scope : local
- Dragging : 0
@@ -674,9 +733,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
-
- Events
- Touch Press Event
- if(xTempDest2.val<xTempMax2.val)
- if(xTempDest1.val<xTempMax1.val)
- {
- xTempDest2.val=xTempDest2.val+xTempStep2.val
- xTempDest1.val=xTempDest1.val+xTempStep1.val
- }
- // event,buttonPress2,entn,tempUpd,X
- //craft command
@@ -684,7 +743,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
- //send calc crc
- btlen tSend.txt,sys0
@@ -698,27 +757,60 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- prints tSend.txt,0
- prints crcval,2
-
-Dual-state Button bDown2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
-Dual-state Button btDown1
+Dual-state Button bt8
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
- if(xTempDest2.val>xTempMin2.val)
+ if(xTempDest.val>xTempMin.val)
+ State : pressed
+ Text : 
Max. Text Size : 10
Events
Touch Press Event
- if(xTempDest1.val>xTempMin1.val)
- {
- xTempDest1.val=xTempDest1.val-xTempStep1.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
+ tSend.txt="event,buttonPress2,"+entn.txt
+ tSend.txt+=",hvac_action,"+va8.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -627,7 +522,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bUp2
+Dual-state Button btUp1
Attributes
Scope : local
Dragging : 0
@@ -639,9 +534,9 @@
Events
Touch Press Event
- if(xTempDest2.val<xTempMax2.val)
+ if(xTempDest.val<xTempMax.val)
{
- xTempDest2.val=xTempDest2.val-xTempStep2.val
+ xTempDest.val=xTempDest.val-xTempStep.val
- xTempDest2.val=xTempDest2.val+xTempStep2.val
+ xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
@@ -725,7 +580,7 @@
@@ -649,7 +544,7 @@
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
@@ -727,7 +819,37 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -739,90 +594,6 @@
@@ -663,7 +558,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bDown2
+Dual-state Button btDown1
Attributes
Scope : local
Dragging : 0
@@ -675,9 +570,9 @@
Events
Touch Press Event
- if(xTempDest2.val>xTempMin2.val)
+ if(xTempDest.val>xTempMin.val)
{
- xTempDest2.val=xTempDest2.val-xTempStep2.val
+ xTempDest.val=xTempDest.val-xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
@@ -685,7 +580,7 @@
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
//convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
+ covx xTempDest.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
@@ -699,90 +594,6 @@
prints tSend.txt,0
prints crcval,2
@@ -818,7 +940,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Timer tmSerial
Attributes
Scope : local
@@ -912,18 +683,18 @@
@@ -872,18 +683,18 @@
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
@@ -841,9 +963,45 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
// disable all buttons
vis bt0,0
vis bt1,0
@@ -893,6 +704,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
+ vis bt8,0
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1013,12 +825,21 @@
//enable
vis bt7,1
}
- //Text tCurTempLbl
- spstr strCommand.txt,tCurTempLbl.txt,"~",42
- //Text tStateLbl
- spstr strCommand.txt,tStateLbl.txt,"~",43
- //Text tALbl
- spstr strCommand.txt,tALbl.txt,"~",44
+ //bt8
+ spstr strCommand.txt,bt8.txt,"~",42
+ if(bt8.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",43
+ covx tTmp.txt,bt8.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",44
+ covx tTmp.txt,bt8.val,0,0
+ // save action
+ spstr strCommand.txt,va8.txt,"~",45
+ //enable
+ vis bt8,1
+ }
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 09:57:29.289737932 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 12:54:22.003143502 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:57:28.881731791 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 12:54:21.199132759 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 12:54:21.591137995 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //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-05-14 09:57:28.485725830 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.881731791 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.591137995 +0000
@@ -466,7 +466,7 @@
prints crcval,2
tCode.txt=""
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:57:28.881731791 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 12:54:21.591137995 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:57:28.881731791 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 12:54:21.591137995 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -511,18 +511,51 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -34,10 +31,6 @@
@@ -33,10 +30,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
- vis t0,0
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
+ vis bt8,0
vis bPrev,0
vis bNext,0
@@ -116,7 +109,7 @@
@@ -100,30 +94,12 @@
Text :
Max. Text Size: 10
-Variable (string) tInstruction
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tId
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
-Variable (string) tTmp
+Variable (string) va8
Attributes
Scope : local
Text :
Max. Text Size: 10
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 100
-
XFloat xTempCurr
Attributes
Scope : local
@@ -133,7 +109,7 @@
Associated Keyboard : none
Value : 0
@@ -531,7 +564,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -125,7 +118,7 @@
@@ -142,7 +118,7 @@
Associated Keyboard : none
Value : 0
@@ -540,7 +573,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -134,7 +127,7 @@
@@ -151,7 +127,7 @@
Associated Keyboard : none
Value : 0
@@ -549,52 +582,70 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -143,43 +136,7 @@
@@ -160,7 +136,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempStep1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempDest2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMax2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempStep2
+XFloat xTempStep
Attributes
Scope : local
Dragging : 0
@@ -258,36 +215,6 @@
@@ -169,41 +145,45 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest2
+Text tSend
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text : newtxt
+ Max. Text Size : 100
-XFloat xTempMin2
+Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 10
-XFloat xTempMax2
+Text tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 20
-XFloat xTempStep2
+Text tId
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Value : 0
+ Text :
+ Max. Text Size : 20
Text tHeading
Attributes
@@ -235,46 +215,6 @@
Text : 
Max. Text Size : 10
@@ -627,11 +678,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
-Text tALbl
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : Action
- Max. Text Size : 30
-
Picture p0
Attributes
Scope : local
@@ -320,26 +247,30 @@
@@ -307,26 +247,30 @@
prints tSend.txt,0
prints crcval,2
@@ -651,11 +712,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
- {
- tSend.txt+="bUp"
- }else
+ if(xTempDest.val>xTempMin.val)
{
- tSend.txt+="bUp"
- }else
- {
- tSend.txt+="bPrev"
+ xTempDest.val=xTempDest.val-xTempStep.val
}
@@ -670,7 +731,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -352,21 +283,30 @@
@@ -339,21 +283,30 @@
prints tSend.txt,0
prints crcval,2
@@ -705,7 +766,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -379,21 +319,26 @@
@@ -366,21 +319,26 @@
prints tSend.txt,0
prints crcval,2
@@ -725,7 +786,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Touch Press Event
- //craft command
- tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va1.txt
- tSend.txt+=",hvac_action,"+va2.txt
+ tSend.txt="event,buttonPress2,cardThermo,"
+ if(bPrev.txt=="")
+ {
@@ -737,7 +798,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -406,7 +351,7 @@
@@ -393,7 +351,7 @@
prints tSend.txt,0
prints crcval,2
@@ -746,16 +807,16 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -420,7 +365,7 @@
@@ -407,7 +365,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va2.txt
- tSend.txt+=",hvac_action,"+va4.txt
+ tSend.txt+=",hvac_action,"+va0.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -433,7 +378,7 @@
@@ -420,7 +378,7 @@
prints tSend.txt,0
prints crcval,2
@@ -764,39 +825,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -447,7 +392,7 @@
@@ -434,7 +392,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va3.txt
- tSend.txt+=",hvac_action,"+va6.txt
+ tSend.txt+=",hvac_action,"+va1.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -460,7 +405,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt8
+Dual-state Button bt2
Attributes
Scope : local
Dragging : 0
@@ -474,7 +419,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va4.txt
+ tSend.txt+=",hvac_action,"+va2.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -487,13 +432,13 @@
@@ -447,13 +405,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt1
+Dual-state Button bt3
+Dual-state Button bt2
Attributes
Scope : local
Dragging : 0
@@ -807,20 +850,29 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -501,7 +446,7 @@
@@ -461,7 +419,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va5.txt
+ tSend.txt+=",hvac_action,"+va3.txt
- tSend.txt+=",hvac_action,"+va1.txt
+ tSend.txt+=",hvac_action,"+va2.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -514,13 +459,13 @@
@@ -480,7 +438,7 @@
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -501,13 +459,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt3
-Dual-state Button bt5
+Dual-state Button bt4
Attributes
Scope : local
@@ -832,38 +884,29 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -528,7 +473,7 @@
@@ -515,7 +473,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va6.txt
- tSend.txt+=",hvac_action,"+va5.txt
+ tSend.txt+=",hvac_action,"+va4.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -555,7 +500,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va7.txt
+ tSend.txt+=",hvac_action,"+va5.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -568,7 +513,7 @@
@@ -528,7 +486,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt7
+Dual-state Button bt6
+Dual-state Button bt5
Attributes
Scope : local
Dragging : 0
@@ -582,79 +527,7 @@
@@ -542,43 +500,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va8.txt
- tSend.txt+=",hvac_action,"+va7.txt
- //send calc crc
- btlen tSend.txt,sys0
- crcrest 1,0xffff // reset CRC
@@ -900,47 +943,47 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- //convert temperature
- covx xTempDest1.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
-
+ tSend.txt+=",hvac_action,"+va5.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -591,30 +513,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btDown1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
+Dual-state Button bt6
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
+ State : pressed
+ Text : 
Max. Text Size : 10
Events
Touch Press Event
- if(xTempDest1.val>xTempMin1.val)
- {
- xTempDest1.val=xTempDest1.val-xTempStep1.val
- }
- // event,buttonPress2,entn,tempUpd,X
- //craft command
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
+ tSend.txt="event,buttonPress2,"+entn.txt
+ tSend.txt+=",hvac_action,"+va6.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -667,30 +540,21 @@
@@ -627,30 +540,21 @@
prints tSend.txt,0
prints crcval,2
@@ -976,7 +1019,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -703,30 +567,21 @@
@@ -663,30 +567,21 @@
prints tSend.txt,0
prints crcval,2
@@ -1012,7 +1055,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -912,18 +767,18 @@
@@ -872,18 +767,18 @@
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
@@ -1035,9 +1078,45 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
// disable all buttons
vis bt0,0
vis bt1,0
@@ -893,6 +788,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
+ vis bt8,0
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1013,12 +909,21 @@
//enable
vis bt7,1
}
- //Text tCurTempLbl
- spstr strCommand.txt,tCurTempLbl.txt,"~",42
- //Text tStateLbl
- spstr strCommand.txt,tStateLbl.txt,"~",43
- //Text tALbl
- spstr strCommand.txt,tALbl.txt,"~",44
+ //bt8
+ spstr strCommand.txt,bt8.txt,"~",42
+ if(bt8.txt!="")
+ {
+ // set text color on active state
+ spstr strCommand.txt,tTmp.txt,"~",43
+ covx tTmp.txt,bt8.pco2,0,0
+ // set state
+ spstr strCommand.txt,tTmp.txt,"~",44
+ covx tTmp.txt,bt8.val,0,0
+ // save action
+ spstr strCommand.txt,va8.txt,"~",45
+ //enable
+ vis bt8,1
+ }
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:57:28.881731791 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 12:54:21.199132759 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 12:54:21.591137995 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 09:57:28.897732032 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 09:57:28.485725830 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 09:57:28.881731791 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 12:54:21.607138209 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 12:54:21.199132759 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 12:54:21.591137995 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.485725830 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 09:57:28.881731791 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.203132813 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.591137995 +0000
+@@ -466,7 +466,7 @@
+ prints crcval,2
+ tCode.txt=""
@@ -67,14 +67,14 @@
+ {
+ click bPrev,1
+ }
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 09:57:28.489725890 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 09:57:28.881731791 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 12:54:21.203132813 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 12:54:21.591137995 +0000
+ Hotspot mSwipeNext
+ Scope : local
+@@ -1728,6 +1956,128 @@
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 09:57:28.489725890 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 09:57:28.881731791 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 12:54:21.203132813 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 12:54:21.591137995 +0000
+@@ -17,12 +17,9 @@
+ vis tInstruction,0
+ vis tTmp,0
@@ -91,18 +91,51 @@
+ //tEntity.txt=tHeading.txt
+ // disable all buttons
+ vis bt0,0
+@@ -34,10 +31,6 @@
+@@ -33,10 +30,7 @@
+ vis bt5,0
+ vis bt6,0
+ vis bt7,0
+ vis bt8,0
+- vis t0,0
+- vis bUp2,0
+- vis bDown2,0
+- vis xTempDest2,0
++ vis bt8,0
+ vis bPrev,0
+ vis bNext,0
+
+@@ -116,7 +109,7 @@
+@@ -100,30 +94,12 @@
+ Text :
+ Max. Text Size: 10
+
+-Variable (string) tInstruction
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 20
+-
+-Variable (string) tId
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 20
+-
+-Variable (string) tTmp
++Variable (string) va8
+ Attributes
+ Scope : local
+ Text :
+ Max. Text Size: 10
+
+-Variable (string) tSend
+- Attributes
+- Scope : local
+- Text :
+- Max. Text Size: 100
+-
+ XFloat xTempCurr
+ Attributes
+ Scope : local
+@@ -133,7 +109,7 @@
+ Associated Keyboard : none
+ Value : 0
+
@@ -111,7 +144,7 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -125,7 +118,7 @@
+@@ -142,7 +118,7 @@
+ Associated Keyboard : none
+ Value : 0
+
@@ -120,7 +153,7 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -134,7 +127,7 @@
+@@ -151,7 +127,7 @@
+ Associated Keyboard : none
+ Value : 0
+
@@ -129,52 +162,70 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -143,43 +136,7 @@
+@@ -160,7 +136,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempStep1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempDest2
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempMin2
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempMax2
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempStep2
++XFloat xTempStep
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -258,36 +215,6 @@
+@@ -169,41 +145,45 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempDest2
++Text tSend
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Value : 0
++ Text : newtxt
++ Max. Text Size : 100
+
+-XFloat xTempMin2
++Text tTmp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Value : 0
++ Text :
++ Max. Text Size : 10
+
+-XFloat xTempMax2
++Text tInstruction
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Value : 0
++ Text :
++ Max. Text Size : 20
+
+-XFloat xTempStep2
++Text tId
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+- Value : 0
++ Text :
++ Max. Text Size : 20
+
+ Text tHeading
+ Attributes
+@@ -235,46 +215,6 @@
+ Text : 
+ Max. Text Size : 10
+
@@ -208,10 +259,20 @@
+- Text : 
+- Max. Text Size : 10
+-
+-Text tALbl
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text : Action
+- Max. Text Size : 30
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -320,26 +247,30 @@
+@@ -307,26 +247,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -231,11 +292,11 @@
+ Touch Press Event
+- tSend.txt="event,buttonPress2,cardThermo,"
+- if(bPrev.txt=="")
+- {
+- tSend.txt+="bUp"
+- }else
++ if(xTempDest.val>xTempMin.val)
+ {
+- tSend.txt+="bUp"
+- }else
+- {
+- tSend.txt+="bPrev"
++ xTempDest.val=xTempDest.val-xTempStep.val
+ }
@@ -250,7 +311,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -352,21 +283,30 @@
+@@ -339,21 +283,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -285,7 +346,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -379,21 +319,26 @@
+@@ -366,21 +319,26 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -305,7 +366,7 @@
+ Touch Press Event
+- //craft command
+- tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va1.txt
+- tSend.txt+=",hvac_action,"+va2.txt
++ tSend.txt="event,buttonPress2,cardThermo,"
++ if(bPrev.txt=="")
++ {
@@ -317,7 +378,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -406,7 +351,7 @@
+@@ -393,7 +351,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -326,16 +387,16 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -420,7 +365,7 @@
+@@ -407,7 +365,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va2.txt
+- tSend.txt+=",hvac_action,"+va4.txt
++ tSend.txt+=",hvac_action,"+va0.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -433,7 +378,7 @@
+@@ -420,7 +378,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -344,39 +405,21 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -447,7 +392,7 @@
+@@ -434,7 +392,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va3.txt
+- tSend.txt+=",hvac_action,"+va6.txt
++ tSend.txt+=",hvac_action,"+va1.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -460,7 +405,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt8
++Dual-state Button bt2
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -474,7 +419,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va4.txt
++ tSend.txt+=",hvac_action,"+va2.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -487,13 +432,13 @@
+@@ -447,13 +405,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt1
++Dual-state Button bt3
++Dual-state Button bt2
+ Attributes
+ Scope : local
+ Dragging : 0
@@ -387,20 +430,29 @@
+ Text : 
+ Max. Text Size : 10
+
+@@ -501,7 +446,7 @@
+@@ -461,7 +419,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va5.txt
++ tSend.txt+=",hvac_action,"+va3.txt
+- tSend.txt+=",hvac_action,"+va1.txt
++ tSend.txt+=",hvac_action,"+va2.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -514,13 +459,13 @@
+@@ -480,7 +438,7 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- State : pressed
++ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+@@ -501,13 +459,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt3
+-Dual-state Button bt5
++Dual-state Button bt4
+ Attributes
+ Scope : local
@@ -412,38 +464,29 @@
+ Text : 
+ Max. Text Size : 10
+
+@@ -528,7 +473,7 @@
+@@ -515,7 +473,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va6.txt
+- tSend.txt+=",hvac_action,"+va5.txt
++ tSend.txt+=",hvac_action,"+va4.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -555,7 +500,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va7.txt
++ tSend.txt+=",hvac_action,"+va5.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -568,7 +513,7 @@
+@@ -528,7 +486,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bt7
++Dual-state Button bt6
++Dual-state Button bt5
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -582,79 +527,7 @@
+@@ -542,43 +500,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
+- tSend.txt+=",hvac_action,"+va8.txt
+- tSend.txt+=",hvac_action,"+va7.txt
+- //send calc crc
+- btlen tSend.txt,sys0
+- crcrest 1,0xffff // reset CRC
@@ -480,47 +523,47 @@
+- //convert temperature
+- covx xTempDest1.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
+-
++ tSend.txt+=",hvac_action,"+va5.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -591,30 +513,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button btDown1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
++Dual-state Button bt6
+ 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
++ State : pressed
++ Text : 
+ Max. Text Size : 10
+
+ Events
+ Touch Press Event
+- if(xTempDest1.val>xTempMin1.val)
+- {
+- xTempDest1.val=xTempDest1.val-xTempStep1.val
+- }
+- // event,buttonPress2,entn,tempUpd,X
+- //craft command
+ //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- //convert temperature
+- covx xTempDest1.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
++ tSend.txt="event,buttonPress2,"+entn.txt
++ tSend.txt+=",hvac_action,"+va6.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -667,30 +540,21 @@
+@@ -627,30 +540,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -556,7 +599,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -703,30 +567,21 @@
+@@ -663,30 +567,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -592,7 +635,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -912,18 +767,18 @@
+@@ -872,18 +767,18 @@
+ covx tTmp.txt,xTempCurr.val,0,0
+ //dstTemp
+ spstr strCommand.txt,tTmp.txt,"~",5
@@ -615,8 +658,44 @@
+ // disable all buttons
+ vis bt0,0
+ vis bt1,0
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 09:57:28.485725830 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 09:57:28.881731791 +0000
+@@ -893,6 +788,7 @@
+ vis bt5,0
+ vis bt6,0
+ vis bt7,0
++ vis bt8,0
+ //bt0
+ spstr strCommand.txt,bt0.txt,"~",10
+ if(bt0.txt!="")
+@@ -1013,12 +909,21 @@
+ //enable
+ vis bt7,1
+ }
+- //Text tCurTempLbl
+- spstr strCommand.txt,tCurTempLbl.txt,"~",42
+- //Text tStateLbl
+- spstr strCommand.txt,tStateLbl.txt,"~",43
+- //Text tALbl
+- spstr strCommand.txt,tALbl.txt,"~",44
++ //bt8
++ spstr strCommand.txt,bt8.txt,"~",42
++ if(bt8.txt!="")
++ {
++ // set text color on active state
++ spstr strCommand.txt,tTmp.txt,"~",43
++ covx tTmp.txt,bt8.pco2,0,0
++ // set state
++ spstr strCommand.txt,tTmp.txt,"~",44
++ covx tTmp.txt,bt8.val,0,0
++ // save action
++ spstr strCommand.txt,va8.txt,"~",45
++ //enable
++ vis bt8,1
++ }
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 12:54:21.199132759 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 12:54:21.591137995 +0000
+@@ -351,7 +351,7 @@
+
+ Events

View File

@@ -41,7 +41,6 @@ Page cardThermo
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
vis t0,0
vis bUp2,0
vis bDown2,0
@@ -51,84 +50,105 @@ Page cardThermo
Variable (string) strCommand
Attributes
ID : 6
ID : 4
Scope : local
Text :
Max. Text Size: 250
Variable (string) entn
Attributes
ID : 19
ID : 15
Scope : local
Text :
Max. Text Size: 80
Variable (string) va0
Attributes
ID : 30
ID : 25
Scope : local
Text :
Max. Text Size: 10
Variable (string) va1
Attributes
ID : 31
ID : 26
Scope : local
Text :
Max. Text Size: 10
Variable (string) va2
Attributes
ID : 32
ID : 27
Scope : local
Text :
Max. Text Size: 10
Variable (string) va3
Attributes
ID : 33
ID : 28
Scope : local
Text :
Max. Text Size: 10
Variable (string) va4
Attributes
ID : 34
ID : 29
Scope : local
Text :
Max. Text Size: 10
Variable (string) va5
Attributes
ID : 35
ID : 30
Scope : local
Text :
Max. Text Size: 10
Variable (string) va6
Attributes
ID : 36
ID : 31
Scope : local
Text :
Max. Text Size: 10
Variable (string) va7
Attributes
ID : 37
ID : 32
Scope : local
Text :
Max. Text Size: 10
Variable (string) va8
Variable (string) tInstruction
Attributes
ID : 38
ID : 47
Scope : local
Text :
Max. Text Size: 20
Variable (string) tId
Attributes
ID : 48
Scope : local
Text :
Max. Text Size: 20
Variable (string) tTmp
Attributes
ID : 49
Scope : local
Text :
Max. Text Size: 10
Variable (string) tSend
Attributes
ID : 50
Scope : local
Text :
Max. Text Size: 100
XFloat xTempCurr
Attributes
ID : 11
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -158,7 +178,7 @@ XFloat xTempCurr
XFloat xTempDest1
Attributes
ID : 13
ID : 9
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -188,7 +208,7 @@ XFloat xTempDest1
XFloat xTempMin1
Attributes
ID : 14
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -218,7 +238,7 @@ XFloat xTempMin1
XFloat xTempMax1
Attributes
ID : 15
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -248,7 +268,7 @@ XFloat xTempMax1
XFloat xTempStep1
Attributes
ID : 16
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -278,7 +298,7 @@ XFloat xTempStep1
XFloat xTempDest2
Attributes
ID : 48
ID : 42
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -308,7 +328,7 @@ XFloat xTempDest2
XFloat xTempMin2
Attributes
ID : 50
ID : 44
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -338,7 +358,7 @@ XFloat xTempMin2
XFloat xTempMax2
Attributes
ID : 51
ID : 45
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -368,7 +388,7 @@ XFloat xTempMax2
XFloat xTempStep2
Attributes
ID : 52
ID : 46
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -396,129 +416,9 @@ XFloat xTempStep2
Horizontal Spacing : 0
Vertical Spacing : 0
Text tSend
Attributes
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 0
Width : 230
Height : 23
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : newtxt
Max. Text Size : 100
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 421
y coordinate : 277
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 7
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 15
y coordinate : 290
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 114
y coordinate : 290
Width : 39
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHeading
Attributes
ID : 9
ID : 5
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -548,7 +448,7 @@ Text tHeading
Text tStatus
Attributes
ID : 10
ID : 6
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -567,7 +467,7 @@ Text tStatus
Font ID : 0
Back. Color : 6371
Font Color : 50712
Horizontal Alignment : left
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
@@ -578,7 +478,7 @@ Text tStatus
Text t2
Attributes
ID : 12
ID : 8
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -608,7 +508,7 @@ Text t2
Text tCurTempLbl
Attributes
ID : 44
ID : 38
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -638,7 +538,7 @@ Text tCurTempLbl
Text tStateLbl
Attributes
ID : 45
ID : 39
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -668,7 +568,7 @@ Text tStateLbl
Text t0
Attributes
ID : 47
ID : 41
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -696,6 +596,36 @@ Text t0
Horizontal Spacing : 0
Vertical Spacing : 0
Text tALbl
Attributes
ID : 51
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 7
y coordinate : 260
Width : 67
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : Action
Max. Text Size : 30
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -715,7 +645,7 @@ Picture p0
Button bNext
Attributes
ID : 4
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -762,7 +692,7 @@ Button bNext
Button bPrev
Attributes
ID : 20
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -816,14 +746,14 @@ Button bPrev
Dual-state Button bt0
Attributes
ID : 21
ID : 17
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 27
y coordinate : 241
x coordinate : 82
y coordinate : 255
Width : 40
Height : 40
Effect : load
@@ -865,63 +795,14 @@ Dual-state Button bt0
Dual-state Button bt2
Attributes
ID : 22
ID : 18
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 117
y coordinate : 241
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va1.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
Dual-state Button bt4
Attributes
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 207
y coordinate : 241
x coordinate : 172
y coordinate : 255
Width : 40
Height : 40
Effect : load
@@ -961,65 +842,16 @@ Dual-state Button bt4
prints tSend.txt,0
prints crcval,2
Dual-state Button bt6
Dual-state Button bt4
Attributes
ID : 24
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 297
y coordinate : 241
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va3.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
Dual-state Button bt8
Attributes
ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 386
y coordinate : 240
x coordinate : 262
y coordinate : 255
Width : 40
Height : 40
Effect : load
@@ -1059,16 +891,163 @@ Dual-state Button bt8
prints tSend.txt,0
prints crcval,2
Dual-state Button bt1
Dual-state Button bt6
Attributes
ID : 26
ID : 20
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 72
y coordinate : 241
x coordinate : 352
y coordinate : 255
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va6.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
Dual-state Button bt1
Attributes
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 127
y coordinate : 255
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : pressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va1.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
Dual-state Button bt3
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 217
y coordinate : 255
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : pressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va3.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
Dual-state Button bt5
Attributes
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 307
y coordinate : 255
Width : 40
Height : 40
Effect : load
@@ -1108,65 +1087,16 @@ Dual-state Button bt1
prints tSend.txt,0
prints crcval,2
Dual-state Button bt3
Dual-state Button bt7
Attributes
ID : 27
ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 162
y coordinate : 241
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : pressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va6.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
Dual-state Button bt5
Attributes
ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 252
y coordinate : 241
x coordinate : 397
y coordinate : 255
Width : 40
Height : 40
Effect : load
@@ -1206,58 +1136,9 @@ Dual-state Button bt5
prints tSend.txt,0
prints crcval,2
Dual-state Button bt7
Attributes
ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 342
y coordinate : 241
Width : 40
Height : 40
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 1
Back. Color (Unpressed) : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Horizontal Alignment : center
Vertical Alignment : center
State : pressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va8.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
Dual-state Button btUp1
Attributes
ID : 39
ID : 33
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1277,7 +1158,7 @@ Dual-state Button btUp1
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Font Color (Pressed) : 50712
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
@@ -1315,7 +1196,7 @@ Dual-state Button btUp1
Dual-state Button btDown1
Attributes
ID : 40
ID : 34
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1335,7 +1216,7 @@ Dual-state Button btDown1
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Font Color (Pressed) : 50712
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
@@ -1373,7 +1254,7 @@ Dual-state Button btDown1
Dual-state Button bUp2
Attributes
ID : 46
ID : 40
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1431,7 +1312,7 @@ Dual-state Button bUp2
Dual-state Button bDown2
Attributes
ID : 49
ID : 43
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1451,7 +1332,7 @@ Dual-state Button bDown2
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 6371
Font Color (Unpressed) : 50712
Font Color (Pressed) : 64512
Font Color (Pressed) : 50712
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
@@ -1489,7 +1370,7 @@ Dual-state Button bDown2
Hotspot mSwipeNext
Attributes
ID : 41
ID : 35
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1526,7 +1407,7 @@ Hotspot mSwipeNext
Hotspot mSwipeUp
Attributes
ID : 42
ID : 36
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1563,7 +1444,7 @@ Hotspot mSwipeUp
Hotspot mSwipePrev
Attributes
ID : 43
ID : 37
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -1600,7 +1481,7 @@ Hotspot mSwipePrev
Timer tmSerial
Attributes
ID : 5
ID : 3
Scope : local
Period (ms): 50
Enabled : yes
@@ -1709,7 +1590,6 @@ Timer tmSerial
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1830,21 +1710,12 @@ Timer tmSerial
//enable
vis bt7,1
}
//bt8
spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0
// set state
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0
// save action
spstr strCommand.txt,va8.txt,"~",45
//enable
vis bt8,1
}
//Text tCurTempLbl
spstr strCommand.txt,tCurTempLbl.txt,"~",42
//Text tStateLbl
spstr strCommand.txt,tStateLbl.txt,"~",43
//Text tALbl
spstr strCommand.txt,tALbl.txt,"~",44
}
if(tInstruction.txt=="pageType")
{
@@ -1937,7 +1808,7 @@ Timer tmSerial
Timer tmSleep
Attributes
ID : 17
ID : 13
Scope : local
Period (ms): 1000
Enabled : yes
@@ -1968,7 +1839,7 @@ Timer tmSleep
TouchCap tc0
Attributes
ID : 18
ID : 14
Scope: local
Value: 0

View File

@@ -18,14 +18,14 @@ pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
177 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
@@ -34,6 +34,10 @@ popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardThermo
52 Component(s)
482 Line(s) of event code
259 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code
@@ -42,10 +46,6 @@ cardAlarm
38 Component(s)
360 Line(s) of event code
222 Unique line(s) of event code
cardThermo
53 Component(s)
502 Line(s) of event code
267 Unique line(s) of event code
cardEntities
65 Component(s)
981 Line(s) of event code
@@ -53,6 +53,6 @@ cardEntities
Total
12 Page(s)
368 Component(s)
3820 Line(s) of event code
1040 Unique line(s) of event code
367 Component(s)
3800 Line(s) of event code
1032 Unique line(s) of event code

View File

@@ -33,7 +33,6 @@ Page cardThermo
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
vis t0,0
vis bUp2,0
vis bDown2,0
@@ -101,12 +100,30 @@ Variable (string) va7
Text :
Max. Text Size: 10
Variable (string) va8
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 10
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 100
XFloat xTempCurr
Attributes
Scope : local
@@ -188,46 +205,6 @@ XFloat xTempStep2
Associated Keyboard : none
Value : 0
Text tSend
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : newtxt
Max. Text Size : 100
Text tTmp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 10
Text tInstruction
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tId
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
Text tHeading
Attributes
Scope : local
@@ -288,6 +265,16 @@ Text t0
Text : 
Max. Text Size : 10
Text tALbl
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : Action
Max. Text Size : 30
Picture p0
Attributes
Scope : local
@@ -393,7 +380,7 @@ Dual-state Button bt2
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va1.txt
tSend.txt+=",hvac_action,"+va2.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -420,7 +407,7 @@ Dual-state Button bt4
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va2.txt
tSend.txt+=",hvac_action,"+va4.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -447,34 +434,7 @@ Dual-state Button bt6
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va3.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
Dual-state Button bt8
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
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va4.txt
tSend.txt+=",hvac_action,"+va6.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -501,7 +461,7 @@ Dual-state Button bt1
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va5.txt
tSend.txt+=",hvac_action,"+va1.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -528,7 +488,7 @@ Dual-state Button bt3
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va6.txt
tSend.txt+=",hvac_action,"+va3.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -555,7 +515,7 @@ Dual-state Button bt5
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va7.txt
tSend.txt+=",hvac_action,"+va5.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -582,7 +542,7 @@ Dual-state Button bt7
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
tSend.txt+=",hvac_action,"+va8.txt
tSend.txt+=",hvac_action,"+va7.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -933,7 +893,6 @@ Timer tmSerial
vis bt5,0
vis bt6,0
vis bt7,0
vis bt8,0
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1054,21 +1013,12 @@ Timer tmSerial
//enable
vis bt7,1
}
//bt8
spstr strCommand.txt,bt8.txt,"~",42
if(bt8.txt!="")
{
// set text color on active state
spstr strCommand.txt,tTmp.txt,"~",43
covx tTmp.txt,bt8.pco2,0,0
// set state
spstr strCommand.txt,tTmp.txt,"~",44
covx tTmp.txt,bt8.val,0,0
// save action
spstr strCommand.txt,va8.txt,"~",45
//enable
vis bt8,1
}
//Text tCurTempLbl
spstr strCommand.txt,tCurTempLbl.txt,"~",42
//Text tStateLbl
spstr strCommand.txt,tStateLbl.txt,"~",43
//Text tALbl
spstr strCommand.txt,tALbl.txt,"~",44
}
if(tInstruction.txt=="pageType")
{