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

centered temp in single mode (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-14 14:38:00 +00:00
committed by github-actions[bot]
parent 0b858b732f
commit 08f45974f0
6 changed files with 838 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
HMI/US/landscape/diff-eu-version.txt
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 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 14:37:59.678399277 +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 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.678399277 +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 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 14:37:59.678399277 +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 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 14:37:59.678399277 +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 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 14:37:59.678399277 +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 12:54:21.203132813 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 14:37:59.678399277 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -421,7 +421,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -33,10 +30,7 @@
@@ -33,14 +30,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
@@ -429,11 +429,15 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
- vis t2,0
- vis btUp1,0
- vis btDown1,0
- vis xTempDest1,0
+ vis bt8,0
vis bPrev,0
vis bNext,0
@@ -100,30 +94,12 @@
@@ -104,30 +94,12 @@
Text :
Max. Text Size: 10
@@ -465,47 +469,56 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
XFloat xTempCurr
Attributes
Scope : local
@@ -133,7 +109,7 @@
@@ -137,16 +109,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin1
+XFloat xTempDest
Attributes
Scope : local
Dragging : 0
@@ -142,7 +118,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin1
+XFloat xTempMin
Attributes
Scope : local
Dragging : 0
@@ -151,7 +127,7 @@
@@ -155,7 +118,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMax1
+XFloat xTempMax
+XFloat xTempMin
Attributes
Scope : local
Dragging : 0
@@ -160,7 +136,7 @@
@@ -164,7 +127,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempStep1
+XFloat xTempStep
+XFloat xTempMax
Attributes
Scope : local
Dragging : 0
@@ -169,41 +145,45 @@
@@ -173,7 +136,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest2
+XFloat xTempStep
Attributes
Scope : local
Dragging : 0
@@ -182,41 +145,45 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin2
+Text tSend
Attributes
Scope : local
@@ -517,7 +530,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
+ Text : newtxt
+ Max. Text Size : 100
-XFloat xTempMin2
-XFloat xTempMax2
+Text tTmp
Attributes
Scope : local
@@ -529,7 +542,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
+ Text :
+ Max. Text Size : 10
-XFloat xTempMax2
-XFloat xTempStep2
+Text tInstruction
Attributes
Scope : local
@@ -541,7 +554,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
+ Text :
+ Max. Text Size : 20
-XFloat xTempStep2
-XFloat xTempDest
+Text tId
Attributes
Scope : local
@@ -555,7 +568,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Text tHeading
Attributes
@@ -235,46 +215,6 @@
@@ -248,56 +215,6 @@
Text : 
Max. Text Size : 10
@@ -598,11 +611,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Associated Keyboard : none
- Text : Action
- Max. Text Size : 30
-
-Text t1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
Picture p0
Attributes
Scope : local
@@ -366,7 +306,7 @@
@@ -389,7 +306,7 @@
prints tSend.txt,0
prints crcval,2
@@ -611,7 +634,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -380,7 +320,7 @@
@@ -403,7 +320,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -620,7 +643,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -393,7 +333,7 @@
@@ -416,7 +333,7 @@
prints tSend.txt,0
prints crcval,2
@@ -629,7 +652,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -407,7 +347,7 @@
@@ -430,7 +347,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -638,7 +661,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -420,7 +360,7 @@
@@ -443,7 +360,7 @@
prints tSend.txt,0
prints crcval,2
@@ -647,7 +670,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -434,7 +374,7 @@
@@ -457,7 +374,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -656,7 +679,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -447,13 +387,13 @@
@@ -470,13 +387,13 @@
prints tSend.txt,0
prints crcval,2
@@ -672,7 +695,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -461,7 +401,7 @@
@@ -484,7 +401,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -681,7 +704,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -474,7 +414,7 @@
@@ -497,7 +414,7 @@
prints tSend.txt,0
prints crcval,2
@@ -690,7 +713,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -488,7 +428,7 @@
@@ -511,7 +428,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -699,7 +722,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -501,7 +441,7 @@
@@ -524,7 +441,7 @@
prints tSend.txt,0
prints crcval,2
@@ -708,7 +731,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -515,7 +455,7 @@
@@ -538,7 +455,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -717,16 +740,17 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -555,66 +495,21 @@
@@ -578,138 +495,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btUp1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
+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
@@ -758,12 +782,83 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- 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
- 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(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
- 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<xTempMax2.val)
- {
- xTempDest2.val=xTempDest2.val+xTempStep2.val
- }
- // event,buttonPress2,entn,tempUpd,X
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest2.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 bDown2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : 
+ State : pressed
@@ -772,9 +867,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Events
Touch Press Event
- if(xTempDest1.val>xTempMin1.val)
- if(xTempDest2.val>xTempMin2.val)
- {
- xTempDest1.val=xTempDest1.val-xTempStep1.val
- xTempDest2.val=xTempDest2.val-xTempStep2.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
@@ -782,74 +877,56 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- covx xTempDest2.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 @@
@@ -722,7 +522,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bUp2
-Dual-state Button btUp
+Dual-state Button btUp1
Attributes
Scope : local
Dragging : 0
@@ -639,9 +534,9 @@
@@ -734,9 +534,9 @@
Events
Touch Press Event
- if(xTempDest2.val<xTempMax2.val)
- if(xTempDest.val<xTempMax1.val)
+ if(xTempDest.val<xTempMax.val)
{
- xTempDest2.val=xTempDest2.val+xTempStep2.val
- xTempDest.val=xTempDest.val+xTempStep1.val
+ xTempDest.val=xTempDest.val+xTempStep.val
}
// event,buttonPress2,entn,tempUpd,X
//craft command
@@ -649,7 +544,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
@@ -663,7 +558,7 @@
@@ -758,7 +558,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bDown2
-Dual-state Button btDown
+Dual-state Button btDown1
Attributes
Scope : local
Dragging : 0
@@ -675,9 +570,9 @@
@@ -770,9 +570,9 @@
Events
Touch Press Event
- if(xTempDest2.val>xTempMin2.val)
- if(xTempDest.val>xTempMin1.val)
+ if(xTempDest.val>xTempMin.val)
{
- xTempDest2.val=xTempDest2.val-xTempStep2.val
- xTempDest.val=xTempDest.val-xTempStep1.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 @@
@@ -794,90 +594,6 @@
prints tSend.txt,0
prints crcval,2
@@ -940,11 +1017,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Timer tmSerial
Attributes
Scope : local
@@ -872,18 +683,18 @@
@@ -967,19 +683,18 @@
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0
- xTempDest1.val=xTempDest.val
+ covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6
@@ -963,7 +1041,7 @@ 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 @@
@@ -989,6 +704,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
@@ -971,7 +1049,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1013,12 +825,21 @@
@@ -1109,12 +825,21 @@
//enable
vis bt7,1
}
@@ -1000,8 +1078,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
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 12:54:21.199132759 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 12:54:22.003143502 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 14:37:59.678399277 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

286
HMI/US/portrait/diff-eu-version.txt
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 12:54:21.199132759 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 12:54:21.591137995 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +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 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 12:54:21.591137995 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +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 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 12:54:21.591137995 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +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 12:54:21.203132813 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 12:54:21.591137995 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -511,7 +511,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -33,10 +30,7 @@
@@ -33,14 +30,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
@@ -519,11 +519,15 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
- vis t2,0
- vis btUp1,0
- vis btDown1,0
- vis xTempDest1,0
+ vis bt8,0
vis bPrev,0
vis bNext,0
@@ -100,30 +94,12 @@
@@ -104,30 +94,12 @@
Text :
Max. Text Size: 10
@@ -555,47 +559,56 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
XFloat xTempCurr
Attributes
Scope : local
@@ -133,7 +109,7 @@
@@ -137,16 +109,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
-XFloat xTempMin1
+XFloat xTempDest
Attributes
Scope : local
Dragging : 0
@@ -142,7 +118,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin1
+XFloat xTempMin
Attributes
Scope : local
Dragging : 0
@@ -151,7 +127,7 @@
@@ -155,7 +118,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMax1
+XFloat xTempMax
+XFloat xTempMin
Attributes
Scope : local
Dragging : 0
@@ -160,7 +136,7 @@
@@ -164,7 +127,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempStep1
+XFloat xTempStep
+XFloat xTempMax
Attributes
Scope : local
Dragging : 0
@@ -169,41 +145,45 @@
@@ -173,7 +136,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest2
+XFloat xTempStep
Attributes
Scope : local
Dragging : 0
@@ -182,41 +145,45 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin2
+Text tSend
Attributes
Scope : local
@@ -607,7 +620,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+ Text : newtxt
+ Max. Text Size : 100
-XFloat xTempMin2
-XFloat xTempMax2
+Text tTmp
Attributes
Scope : local
@@ -619,7 +632,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+ Text :
+ Max. Text Size : 10
-XFloat xTempMax2
-XFloat xTempStep2
+Text tInstruction
Attributes
Scope : local
@@ -631,7 +644,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+ Text :
+ Max. Text Size : 20
-XFloat xTempStep2
-XFloat xTempDest
+Text tId
Attributes
Scope : local
@@ -645,7 +658,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text tHeading
Attributes
@@ -235,46 +215,6 @@
@@ -248,56 +215,6 @@
Text : 
Max. Text Size : 10
@@ -688,11 +701,21 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- Associated Keyboard : none
- Text : Action
- Max. Text Size : 30
-
-Text t1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
Picture p0
Attributes
Scope : local
@@ -307,26 +247,30 @@
@@ -330,26 +247,30 @@
prints tSend.txt,0
prints crcval,2
@@ -731,7 +754,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
@@ -339,21 +283,30 @@
@@ -362,21 +283,30 @@
prints tSend.txt,0
prints crcval,2
@@ -766,7 +789,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
@@ -366,21 +319,26 @@
@@ -389,21 +319,26 @@
prints tSend.txt,0
prints crcval,2
@@ -798,7 +821,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
@@ -393,7 +351,7 @@
@@ -416,7 +351,7 @@
prints tSend.txt,0
prints crcval,2
@@ -807,7 +830,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -407,7 +365,7 @@
@@ -430,7 +365,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -816,7 +839,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
@@ -420,7 +378,7 @@
@@ -443,7 +378,7 @@
prints tSend.txt,0
prints crcval,2
@@ -825,7 +848,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -434,7 +392,7 @@
@@ -457,7 +392,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -834,7 +857,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
@@ -447,13 +405,13 @@
@@ -470,13 +405,13 @@
prints tSend.txt,0
prints crcval,2
@@ -850,7 +873,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -461,7 +419,7 @@
@@ -484,7 +419,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -859,7 +882,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
@@ -480,7 +438,7 @@
@@ -503,7 +438,7 @@
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
@@ -868,7 +891,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -501,13 +459,13 @@
@@ -524,13 +459,13 @@
prints tSend.txt,0
prints crcval,2
@@ -884,7 +907,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Text : 
Max. Text Size : 10
@@ -515,7 +473,7 @@
@@ -538,7 +473,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -893,7 +916,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
@@ -528,7 +486,7 @@
@@ -551,7 +486,7 @@
prints tSend.txt,0
prints crcval,2
@@ -902,7 +925,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
Dragging : 0
@@ -542,43 +500,7 @@
@@ -565,115 +500,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
@@ -943,88 +966,88 @@ 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
+ 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
- //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 btDown1
+Dual-state Button bt6
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- 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
- 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
@@ -627,30 +540,21 @@
prints tSend.txt,0
prints crcval,2
- //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 bt7
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- 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
- Max. Text Size : 10
-
- Events
- Touch Press Event
- if(xTempDest2.val<xTempMax2.val)
- {
- xTempDest2.val=xTempDest2.val+xTempStep2.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
+ 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
@@ -663,30 +567,21 @@
@@ -686,30 +513,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bDown2
+Dual-state Button bt8
+Dual-state Button bt6
Attributes
Scope : local
Dragging : 0
@@ -1051,15 +1074,88 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- covx xTempDest2.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
@@ -722,30 +540,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btUp
+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<xTempMax1.val)
- {
- xTempDest.val=xTempDest.val+xTempStep1.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
@@ -758,30 +567,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button btDown
+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>xTempMin1.val)
- {
- xTempDest.val=xTempDest.val-xTempStep1.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
@@ -872,18 +767,18 @@
@@ -967,19 +767,18 @@
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0
- xTempDest1.val=xTempDest.val
+ covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6
@@ -1078,7 +1174,7 @@ 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 @@
@@ -989,6 +788,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
@@ -1086,7 +1182,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//bt0
spstr strCommand.txt,bt0.txt,"~",10
if(bt0.txt!="")
@@ -1013,12 +909,21 @@
@@ -1109,12 +909,21 @@
//enable
vis bt7,1
}
@@ -1115,8 +1211,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
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 12:54:21.199132759 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 12:54:21.591137995 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,9 +1,9 @@
+++ 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
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 14:37:59.286394006 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 14:37:59.270393790 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- 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
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 14:37:59.274393844 +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 12:54:21.203132813 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 12:54:21.591137995 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 14:37:59.274393844 +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 12:54:21.203132813 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 12:54:21.591137995 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 14:37:59.274393844 +0000
+@@ -17,12 +17,9 @@
+ vis tInstruction,0
+ vis tTmp,0
@@ -91,7 +91,7 @@
+ //tEntity.txt=tHeading.txt
+ // disable all buttons
+ vis bt0,0
+@@ -33,10 +30,7 @@
+@@ -33,14 +30,7 @@
+ vis bt5,0
+ vis bt6,0
+ vis bt7,0
@@ -99,11 +99,15 @@
+- vis bUp2,0
+- vis bDown2,0
+- vis xTempDest2,0
+- vis t2,0
+- vis btUp1,0
+- vis btDown1,0
+- vis xTempDest1,0
++ vis bt8,0
+ vis bPrev,0
+ vis bNext,0
+
+@@ -100,30 +94,12 @@
+@@ -104,30 +94,12 @@
+ Text :
+ Max. Text Size: 10
+
@@ -135,47 +139,56 @@
+ XFloat xTempCurr
+ Attributes
+ Scope : local
+@@ -133,7 +109,7 @@
+@@ -137,16 +109,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempDest1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Value : 0
+-
+-XFloat xTempMin1
++XFloat xTempDest
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -142,7 +118,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempMin1
++XFloat xTempMin
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -151,7 +127,7 @@
+@@ -155,7 +118,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempMax1
++XFloat xTempMax
++XFloat xTempMin
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -160,7 +136,7 @@
+@@ -164,7 +127,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempStep1
++XFloat xTempStep
++XFloat xTempMax
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -169,41 +145,45 @@
+@@ -173,7 +136,7 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempDest2
++XFloat xTempStep
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -182,41 +145,45 @@
+ Associated Keyboard : none
+ Value : 0
+
+-XFloat xTempMin2
++Text tSend
+ Attributes
+ Scope : local
@@ -187,7 +200,7 @@
++ Text : newtxt
++ Max. Text Size : 100
+
+-XFloat xTempMin2
+-XFloat xTempMax2
++Text tTmp
+ Attributes
+ Scope : local
@@ -199,7 +212,7 @@
++ Text :
++ Max. Text Size : 10
+
+-XFloat xTempMax2
+-XFloat xTempStep2
++Text tInstruction
+ Attributes
+ Scope : local
@@ -211,7 +224,7 @@
++ Text :
++ Max. Text Size : 20
+
+-XFloat xTempStep2
+-XFloat xTempDest
++Text tId
+ Attributes
+ Scope : local
@@ -225,7 +238,7 @@
+
+ Text tHeading
+ Attributes
+@@ -235,46 +215,6 @@
+@@ -248,56 +215,6 @@
+ Text : 
+ Max. Text Size : 10
+
@@ -269,10 +282,20 @@
+- Text : Action
+- Max. Text Size : 30
+-
+-Text t1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text : 
+- Max. Text Size : 10
+-
+ Picture p0
+ Attributes
+ Scope : local
+@@ -307,26 +247,30 @@
+@@ -330,26 +247,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -311,7 +334,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -339,21 +283,30 @@
+@@ -362,21 +283,30 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -346,7 +369,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -366,21 +319,26 @@
+@@ -389,21 +319,26 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -378,7 +401,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -393,7 +351,7 @@
+@@ -416,7 +351,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -387,7 +410,7 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -407,7 +365,7 @@
+@@ -430,7 +365,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
@@ -396,7 +419,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -420,7 +378,7 @@
+@@ -443,7 +378,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -405,7 +428,7 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -434,7 +392,7 @@
+@@ -457,7 +392,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
@@ -414,7 +437,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -447,13 +405,13 @@
+@@ -470,13 +405,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -430,7 +453,7 @@
+ Text : 
+ Max. Text Size : 10
+
+@@ -461,7 +419,7 @@
+@@ -484,7 +419,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
@@ -439,7 +462,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -480,7 +438,7 @@
+@@ -503,7 +438,7 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
@@ -448,7 +471,7 @@
+ Text : 
+ Max. Text Size : 10
+
+@@ -501,13 +459,13 @@
+@@ -524,13 +459,13 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -464,7 +487,7 @@
+ Text : 
+ Max. Text Size : 10
+
+@@ -515,7 +473,7 @@
+@@ -538,7 +473,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
@@ -473,7 +496,7 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+@@ -528,7 +486,7 @@
+@@ -551,7 +486,7 @@
+ prints tSend.txt,0
+ prints crcval,2
+
@@ -482,7 +505,7 @@
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -542,43 +500,7 @@
+@@ -565,115 +500,7 @@
+ Touch Press Event
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt
@@ -523,88 +546,88 @@
+- //convert temperature
+- covx xTempDest1.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
++ 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
+
+- //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 btDown1
++Dual-state Button bt6
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- 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
+- 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
+@@ -627,30 +540,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+- //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 bt7
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+- 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
+- Max. Text Size : 10
+-
+- Events
+- Touch Press Event
+- if(xTempDest2.val<xTempMax2.val)
+- {
+- xTempDest2.val=xTempDest2.val+xTempStep2.val
+- }
+- // event,buttonPress2,entn,tempUpd,X
+ //craft command
+- //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- //convert temperature
+- covx xTempDest2.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
++ 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
+@@ -663,30 +567,21 @@
+@@ -686,30 +513,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button bDown2
++Dual-state Button bt8
++Dual-state Button bt6
+ Attributes
+ Scope : local
+ Dragging : 0
@@ -631,15 +654,88 @@
+- covx xTempDest2.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
+@@ -722,30 +540,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button btUp
++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<xTempMax1.val)
+- {
+- xTempDest.val=xTempDest.val+xTempStep1.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
+@@ -758,30 +567,21 @@
+ prints tSend.txt,0
+ prints crcval,2
+
+-Dual-state Button btDown
++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>xTempMin1.val)
+- {
+- xTempDest.val=xTempDest.val-xTempStep1.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
+@@ -872,18 +767,18 @@
+@@ -967,19 +767,18 @@
+ covx tTmp.txt,xTempCurr.val,0,0
+ //dstTemp
+ spstr strCommand.txt,tTmp.txt,"~",5
+- covx tTmp.txt,xTempDest1.val,0,0
+- xTempDest1.val=xTempDest.val
++ covx tTmp.txt,xTempDest.val,0,0
+ //status
+ spstr strCommand.txt,tStatus.txt,"~",6
@@ -658,7 +754,7 @@
+ // disable all buttons
+ vis bt0,0
+ vis bt1,0
+@@ -893,6 +788,7 @@
+@@ -989,6 +788,7 @@
+ vis bt5,0
+ vis bt6,0
+ vis bt7,0
@@ -666,7 +762,7 @@
+ //bt0
+ spstr strCommand.txt,bt0.txt,"~",10
+ if(bt0.txt!="")
+@@ -1013,12 +909,21 @@
+@@ -1109,12 +909,21 @@
+ //enable
+ vis bt7,1
+ }
@@ -694,8 +790,8 @@
+ }
+ 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
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 14:37:58.882388573 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 14:37:59.274393844 +0000
+@@ -351,7 +351,7 @@
+
+ Events

181
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -45,6 +45,10 @@ Page cardThermo
vis bUp2,0
vis bDown2,0
vis xTempDest2,0
vis t2,0
vis btUp1,0
vis btDown1,0
vis xTempDest1,0
vis bPrev,0
vis bNext,0
@@ -416,6 +420,36 @@ XFloat xTempStep2
Horizontal Spacing : 0
Vertical Spacing : 0
XFloat xTempDest
Attributes
ID : 53
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 221
y coordinate : 119
Width : 120
Height : 60
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 4
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Value : 0
Significant digits left : 0
Significant digits right : 1
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tHeading
Attributes
ID : 5
@@ -626,6 +660,36 @@ Text tALbl
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 55
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 342
y coordinate : 137
Width : 25
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -1368,6 +1432,122 @@ Dual-state Button bDown2
prints tSend.txt,0
prints crcval,2
Dual-state Button btUp
Attributes
ID : 52
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 257
y coordinate : 68
Width : 50
Height : 50
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) : 50712
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
if(xTempDest.val<xTempMax1.val)
{
xTempDest.val=xTempDest.val+xTempStep1.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
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 btDown
Attributes
ID : 54
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 257
y coordinate : 180
Width : 50
Height : 50
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) : 50712
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
if(xTempDest.val>xTempMin1.val)
{
xTempDest.val=xTempDest.val-xTempStep1.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
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
ID : 35
@@ -1570,6 +1750,7 @@ Timer tmSerial
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest1.val,0,0
xTempDest1.val=xTempDest.val
//status
spstr strCommand.txt,tStatus.txt,"~",6
//minTemp

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

@@ -35,9 +35,9 @@ popupLight
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
56 Component(s)
523 Line(s) of event code
269 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code
@@ -53,6 +53,6 @@ cardEntities
Total
12 Page(s)
367 Component(s)
3800 Line(s) of event code
1032 Unique line(s) of event code
371 Component(s)
3841 Line(s) of event code
1041 Unique line(s) of event code

96
HMI/n2t-out/cardThermo.txt
View File

@@ -37,6 +37,10 @@ Page cardThermo
vis bUp2,0
vis bDown2,0
vis xTempDest2,0
vis t2,0
vis btUp1,0
vis btDown1,0
vis xTempDest1,0
vis bPrev,0
vis bNext,0
@@ -205,6 +209,15 @@ XFloat xTempStep2
Associated Keyboard : none
Value : 0
XFloat xTempDest
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Value : 0
Text tHeading
Attributes
Scope : local
@@ -275,6 +288,16 @@ Text tALbl
Text : Action
Max. Text Size : 30
Text t1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 10
Picture p0
Attributes
Scope : local
@@ -699,6 +722,78 @@ Dual-state Button bDown2
prints tSend.txt,0
prints crcval,2
Dual-state Button btUp
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(xTempDest.val<xTempMax1.val)
{
xTempDest.val=xTempDest.val+xTempStep1.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
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 btDown
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(xTempDest.val>xTempMin1.val)
{
xTempDest.val=xTempDest.val-xTempStep1.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
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
@@ -873,6 +968,7 @@ Timer tmSerial
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
covx tTmp.txt,xTempDest1.val,0,0
xTempDest1.val=xTempDest.val
//status
spstr strCommand.txt,tStatus.txt,"~",6
//minTemp