mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-17 10:27:00 +01:00
redesign thermostat page (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
912f92cc7a
commit
66da48538c
@@ -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-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -426,9 +426,330 @@ 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-07 23:31:11.388705442 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000
|
||||
@@ -247,26 +247,30 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Button bPrev
|
||||
+Button bDown
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
- Text : î°
|
||||
+ Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
- tSend.txt="event,buttonPress2,cardThermo,"
|
||||
- if(bPrev.txt=="î¶")
|
||||
- {
|
||||
- tSend.txt+="bUp"
|
||||
- }else
|
||||
+ if(xTempDest.val>xTempMin.val)
|
||||
{
|
||||
- tSend.txt+="bPrev"
|
||||
+ xTempDest.val=xTempDest.val-xTempStep.val
|
||||
}
|
||||
+ // event,buttonPress2,entn,tempUpd,X
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"
|
||||
+ tSend.txt+=entn.txt+","
|
||||
+ tSend.txt+="tempUpd,"
|
||||
+ //convert temperature
|
||||
+ covx xTempDest.val,tTmp.txt,0,0
|
||||
+ tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -279,21 +283,30 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt0
|
||||
+Button bUp
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
- Text : î
|
||||
+ Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
+ if(xTempDest.val<xTempMax.val)
|
||||
+ {
|
||||
+ xTempDest.val=xTempDest.val+xTempStep.val
|
||||
+ }
|
||||
+ // event,buttonPress2,entn,tempUpd,X
|
||||
//craft command
|
||||
- tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va0.txt
|
||||
+ tSend.txt="event,buttonPress2,"
|
||||
+ tSend.txt+=entn.txt+","
|
||||
+ tSend.txt+="tempUpd,"
|
||||
+ //convert temperature
|
||||
+ covx xTempDest.val,tTmp.txt,0,0
|
||||
+ tSend.txt+=tTmp.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -306,21 +319,26 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt1
|
||||
+Button bPrev
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
- Text : î
|
||||
+ Text : î°
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
- //craft command
|
||||
- tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va1.txt
|
||||
+ tSend.txt="event,buttonPress2,cardThermo,"
|
||||
+ if(bPrev.txt=="î¶")
|
||||
+ {
|
||||
+ tSend.txt+="bUp"
|
||||
+ }else
|
||||
+ {
|
||||
+ tSend.txt+="bPrev"
|
||||
+ }
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -333,7 +351,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt2
|
||||
+Dual-state Button bt0
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -347,7 +365,7 @@
|
||||
Touch Press Event
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va2.txt
|
||||
+ tSend.txt+=",hvac_action,"+va0.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -360,7 +378,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt3
|
||||
+Dual-state Button bt1
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -374,7 +392,7 @@
|
||||
Touch Press Event
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va3.txt
|
||||
+ tSend.txt+=",hvac_action,"+va1.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -387,7 +405,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt4
|
||||
+Dual-state Button bt2
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -401,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
|
||||
@@ -414,13 +432,13 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt5
|
||||
+Dual-state Button bt3
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
- State : pressed
|
||||
+ State : unpressed
|
||||
Text : î
|
||||
Max. Text Size : 10
|
||||
|
||||
@@ -428,7 +446,7 @@
|
||||
Touch Press Event
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va5.txt
|
||||
+ tSend.txt+=",hvac_action,"+va3.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -441,13 +459,13 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt6
|
||||
+Dual-state Button bt4
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
- State : pressed
|
||||
+ State : unpressed
|
||||
Text : î
|
||||
Max. Text Size : 10
|
||||
|
||||
@@ -455,7 +473,7 @@
|
||||
Touch Press Event
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va6.txt
|
||||
+ tSend.txt+=",hvac_action,"+va4.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -468,7 +486,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt7
|
||||
+Dual-state Button bt5
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -482,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
|
||||
@@ -495,7 +513,7 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button bt8
|
||||
+Dual-state Button bt6
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
@@ -509,7 +527,7 @@
|
||||
Touch Press Event
|
||||
//craft command
|
||||
tSend.txt="event,buttonPress2,"+entn.txt
|
||||
- tSend.txt+=",hvac_action,"+va8.txt
|
||||
+ tSend.txt+=",hvac_action,"+va6.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -522,30 +540,21 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-Dual-state Button btUp1
|
||||
+Dual-state Button bt7
|
||||
Attributes
|
||||
Scope : local
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
- State : unpressed
|
||||
- Text : î
|
||||
+ State : pressed
|
||||
+ Text : î
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
- if(xTempDest.val<xTempMax.val)
|
||||
- {
|
||||
- xTempDest.val=xTempDest.val+xTempStep.val
|
||||
- }
|
||||
- // event,buttonPress2,entn,tempUpd,X
|
||||
//craft command
|
||||
- tSend.txt="event,buttonPress2,"
|
||||
- tSend.txt+=entn.txt+","
|
||||
- tSend.txt+="tempUpd,"
|
||||
- //convert temperature
|
||||
- covx xTempDest.val,tTmp.txt,0,0
|
||||
- tSend.txt+=tTmp.txt
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+ tSend.txt+=",hvac_action,"+va7.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -558,30 +567,21 @@
|
||||
prints tSend.txt,0
|
||||
prints crcval,2
|
||||
|
||||
-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 : î¿
|
||||
+ State : pressed
|
||||
+ Text : î
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
- if(xTempDest.val>xTempMin.val)
|
||||
- {
|
||||
- xTempDest.val=xTempDest.val-xTempStep.val
|
||||
- }
|
||||
- // event,buttonPress2,entn,tempUpd,X
|
||||
//craft command
|
||||
- tSend.txt="event,buttonPress2,"
|
||||
- tSend.txt+=entn.txt+","
|
||||
- tSend.txt+="tempUpd,"
|
||||
- //convert temperature
|
||||
- covx xTempDest.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
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -447,3 +768,12 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -351,7 +351,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
|
||||
+ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
|
||||
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
|
||||
doevents // finish drawing before next timer event triggers
|
||||
if(frame_ptr.val==1820)
|
||||
|
||||
@@ -1,7 +1,337 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:43:32.599998538 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:43:32.587998479 +0000
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:43:32.155996375 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:43:32.583998460 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 23:31:11.916705803 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000
|
||||
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000
|
||||
+@@ -247,26 +247,30 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Button bPrev
|
||||
++Button bDown
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ State : unpressed
|
||||
+- Text : î°
|
||||
++ Text :
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+- tSend.txt="event,buttonPress2,cardThermo,"
|
||||
+- if(bPrev.txt=="î¶")
|
||||
+- {
|
||||
+- tSend.txt+="bUp"
|
||||
+- }else
|
||||
++ if(xTempDest.val>xTempMin.val)
|
||||
+ {
|
||||
+- tSend.txt+="bPrev"
|
||||
++ xTempDest.val=xTempDest.val-xTempStep.val
|
||||
+ }
|
||||
++ // event,buttonPress2,entn,tempUpd,X
|
||||
++ //craft command
|
||||
++ tSend.txt="event,buttonPress2,"
|
||||
++ tSend.txt+=entn.txt+","
|
||||
++ tSend.txt+="tempUpd,"
|
||||
++ //convert temperature
|
||||
++ covx xTempDest.val,tTmp.txt,0,0
|
||||
++ tSend.txt+=tTmp.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -279,21 +283,30 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt0
|
||||
++Button bUp
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ State : unpressed
|
||||
+- Text : î
|
||||
++ Text :
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
++ if(xTempDest.val<xTempMax.val)
|
||||
++ {
|
||||
++ xTempDest.val=xTempDest.val+xTempStep.val
|
||||
++ }
|
||||
++ // event,buttonPress2,entn,tempUpd,X
|
||||
+ //craft command
|
||||
+- tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va0.txt
|
||||
++ tSend.txt="event,buttonPress2,"
|
||||
++ tSend.txt+=entn.txt+","
|
||||
++ tSend.txt+="tempUpd,"
|
||||
++ //convert temperature
|
||||
++ covx xTempDest.val,tTmp.txt,0,0
|
||||
++ tSend.txt+=tTmp.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -306,21 +319,26 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt1
|
||||
++Button bPrev
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ State : unpressed
|
||||
+- Text : î
|
||||
++ Text : î°
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+- //craft command
|
||||
+- tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va1.txt
|
||||
++ tSend.txt="event,buttonPress2,cardThermo,"
|
||||
++ if(bPrev.txt=="î¶")
|
||||
++ {
|
||||
++ tSend.txt+="bUp"
|
||||
++ }else
|
||||
++ {
|
||||
++ tSend.txt+="bPrev"
|
||||
++ }
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -333,7 +351,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt2
|
||||
++Dual-state Button bt0
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -347,7 +365,7 @@
|
||||
+ Touch Press Event
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va2.txt
|
||||
++ tSend.txt+=",hvac_action,"+va0.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -360,7 +378,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt3
|
||||
++Dual-state Button bt1
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -374,7 +392,7 @@
|
||||
+ Touch Press Event
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va3.txt
|
||||
++ tSend.txt+=",hvac_action,"+va1.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -387,7 +405,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt4
|
||||
++Dual-state Button bt2
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -401,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
|
||||
+@@ -414,13 +432,13 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt5
|
||||
++Dual-state Button bt3
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+- State : pressed
|
||||
++ State : unpressed
|
||||
+ Text : î
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+@@ -428,7 +446,7 @@
|
||||
+ Touch Press Event
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va5.txt
|
||||
++ tSend.txt+=",hvac_action,"+va3.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -441,13 +459,13 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt6
|
||||
++Dual-state Button bt4
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+- State : pressed
|
||||
++ State : unpressed
|
||||
+ Text : î
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+@@ -455,7 +473,7 @@
|
||||
+ Touch Press Event
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va6.txt
|
||||
++ tSend.txt+=",hvac_action,"+va4.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -468,7 +486,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt7
|
||||
++Dual-state Button bt5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -482,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
|
||||
+@@ -495,7 +513,7 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button bt8
|
||||
++Dual-state Button bt6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+@@ -509,7 +527,7 @@
|
||||
+ Touch Press Event
|
||||
+ //craft command
|
||||
+ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
+- tSend.txt+=",hvac_action,"+va8.txt
|
||||
++ tSend.txt+=",hvac_action,"+va6.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -522,30 +540,21 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-Dual-state Button btUp1
|
||||
++Dual-state Button bt7
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+- State : unpressed
|
||||
+- Text : î
|
||||
++ State : pressed
|
||||
++ Text : î
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+- if(xTempDest.val<xTempMax.val)
|
||||
+- {
|
||||
+- xTempDest.val=xTempDest.val+xTempStep.val
|
||||
+- }
|
||||
+- // event,buttonPress2,entn,tempUpd,X
|
||||
+ //craft command
|
||||
+- tSend.txt="event,buttonPress2,"
|
||||
+- tSend.txt+=entn.txt+","
|
||||
+- tSend.txt+="tempUpd,"
|
||||
+- //convert temperature
|
||||
+- covx xTempDest.val,tTmp.txt,0,0
|
||||
+- tSend.txt+=tTmp.txt
|
||||
++ tSend.txt="event,buttonPress2,"+entn.txt
|
||||
++ tSend.txt+=",hvac_action,"+va7.txt
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+@@ -558,30 +567,21 @@
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+-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 : î¿
|
||||
++ State : pressed
|
||||
++ Text : î
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+- if(xTempDest.val>xTempMin.val)
|
||||
+- {
|
||||
+- xTempDest.val=xTempDest.val-xTempStep.val
|
||||
+- }
|
||||
+- // event,buttonPress2,entn,tempUpd,X
|
||||
+ //craft command
|
||||
+- tSend.txt="event,buttonPress2,"
|
||||
+- tSend.txt+=entn.txt+","
|
||||
+- tSend.txt+="tempUpd,"
|
||||
+- //convert temperature
|
||||
+- covx xTempDest.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
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000
|
||||
+@@ -351,7 +351,7 @@
|
||||
+
|
||||
+ Events
|
||||
+ Timer Event
|
||||
+- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
|
||||
++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
|
||||
+ frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
|
||||
+ doevents // finish drawing before next timer event triggers
|
||||
+ if(frame_ptr.val==1820)
|
||||
|
||||
Reference in New Issue
Block a user