h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-18 10:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync US-p (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-21 06:10:31 +00:00
committed by github-actions[bot]
parent 73dcc25a2b
commit 1aba8238b6
8 changed files with 3106 additions and 2271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

846
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-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-19 17:45:30.176249529 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +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-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-19 17:45:30.176249529 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +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-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-19 17:45:30.176249529 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -492,765 +492,127 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-19 17:45:30.176249529 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
- vis xTempMin1,0
- vis xTempMax1,0
- vis xTempStep1,0
- vis xTempMin2,0
- vis xTempMax2,0
- vis xTempStep2,0
+ vis xTempMin,0
+ vis xTempMax,0
+ vis xTempStep,0
//tEntity.txt=tHeading.txt
// disable all buttons
vis bt0,0
@@ -33,14 +30,7 @@
vis bt5,0
vis bt6,0
vis bt7,0
- vis tCF2,0
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
- vis tCF1,0
- vis btUp1,0
- vis btDown1,0
- vis xTempDest1,0
+ vis bt8,0
vis bPrev,0
vis bNext,0
@@ -104,31 +94,13 @@
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 xTempDest1
+XFloat xTempCurr
Attributes
Scope : local
Dragging : 0
@@ -137,7 +109,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin1
+XFloat xTempDest
Attributes
Scope : local
Dragging : 0
@@ -146,7 +118,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMax1
+XFloat xTempMin
Attributes
Scope : local
Dragging : 0
@@ -155,7 +127,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempStep1
+XFloat xTempMax
Attributes
Scope : local
Dragging : 0
@@ -164,7 +136,7 @@
Associated Keyboard : none
Value : 0
-XFloat xTempDest2
+XFloat xTempStep
Attributes
Scope : local
Dragging : 0
@@ -173,41 +145,45 @@
Associated Keyboard : none
Value : 0
-XFloat xTempMin2
+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 xTempMax2
+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 xTempStep2
+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 xTempDest
+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
@@ -229,57 +205,7 @@
Text :
Max. Text Size : 10
-Text tCF1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 10
-
-Text tCurTempLbl
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : Currently
- Max. Text Size : 30
-
-Text tStateLbl
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : State
- Max. Text Size : 30
-
-Text tCF2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- 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
-
-Text tCF
+Text t2
Attributes
Scope : local
Dragging : 0
@@ -289,16 +215,6 @@
Text : 
Max. Text Size : 10
-Text tCurTemp
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 30
-
Picture p0
Attributes
Scope : local
@@ -331,26 +247,30 @@
prints tSend.txt,0
prints crcval,2
-Button bPrev
+Button bDown
Attributes
Scope : local
Dragging : 0
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000
@@ -198,7 +198,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : 
- Text : newtxt
+ Text :
Max. Text Size : 10
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardThermo,"
- if(bPrev.txt=="")
+ if(xTempDest.val>xTempMin.val)
@@ -223,7 +223,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : newtxt
+ Text :
Max. Text Size : 10
Events
@@ -295,7 +295,7 @@
prints tSend.txt,0
prints crcval,2
-Hotspot mSwipeNext
+Hotspot mSwipeUp
Attributes
Scope : local
Dragging : 0
@@ -315,15 +315,15 @@
//x & y coordinates where the swipe is first detected.)
//---------------------------
//The navigation text is stored as local variable within tld.txt
- //Pressing right button if swiped on the right side of the screen
+ //Pressing up button if swiped on the top side of the screen
//
- spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="1")
+ spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt=="2")
{
- tSend.txt+="bUp"
- }else
- {
- tSend.txt+="bPrev"
+ xTempDest.val=xTempDest.val-xTempStep.val
- click bNext,1
+ click bPrev,1
}
+ // 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
@@ -363,21 +283,30 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt0
+Button bUp
-Hotspot mSwipeUp
+Hotspot mSwipeNext
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
@@ -390,21 +319,26 @@
@@ -343,12 +343,12 @@
//x & y coordinates where the swipe is first detected.)
//---------------------------
//The navigation text is stored as local variable within tld.txt
- //Pressing up button if swiped on the top side of the screen
+ //Pressing right button if swiped on the right side of the screen
//
- spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="2")
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="1")
{
- click bPrev,1
+ click bNext,1
}
Hotspot mSwipePrev
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:10:30.539845715 +0000
@@ -795,7 +795,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt2
+Button bPrev
-Hotspot mSwipeNext
+Hotspot mSwipeUp
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,"+va2.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
@@ -417,7 +351,7 @@
prints tSend.txt,0
prints crcval,2
@@ -815,15 +815,15 @@
//x & y coordinates where the swipe is first detected.)
//---------------------------
//The navigation text is stored as local variable within tld.txt
- //Pressing right button if swiped on the right side of the screen
+ //Pressing up button if swiped on the top side of the screen
//
- spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="1")
+ spstr tId.txt,tTmp.txt,"|",0
+ if(tTmp.txt=="2")
{
- click bNext,1
+ click bPrev,1
}
-Dual-state Button bt4
+Dual-state Button bt0
-Hotspot mSwipeUp
+Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
@@ -431,7 +365,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.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
@@ -444,7 +378,7 @@
prints tSend.txt,0
prints crcval,2
@@ -843,12 +843,12 @@
//x & y coordinates where the swipe is first detected.)
//---------------------------
//The navigation text is stored as local variable within tld.txt
- //Pressing up button if swiped on the top side of the screen
+ //Pressing right button if swiped on the right side of the screen
//
- spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="2")
+ spstr tId.txt,tTmp.txt,"|",1
+ if(tTmp.txt=="1")
{
- click bPrev,1
+ click bNext,1
}
-Dual-state Button bt6
+Dual-state Button bt1
Attributes
Scope : local
Dragging : 0
@@ -458,7 +392,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.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
@@ -471,13 +405,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt1
+Dual-state Button bt2
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -485,7 +419,7 @@
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
@@ -504,7 +438,7 @@
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : pressed
+ State : unpressed
Text : 
Max. Text Size : 10
@@ -525,13 +459,13 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt5
+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
@@ -539,7 +473,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.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
@@ -552,7 +486,7 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bt7
+Dual-state Button bt5
Attributes
Scope : local
Dragging : 0
@@ -566,115 +500,7 @@
Touch Press Event
//craft command
tSend.txt="event,buttonPress2,"+entn.txt
- tSend.txt+=",hvac_action,"+va7.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
- 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<xTempMax1.val)
- {
- xTempDest1.val=xTempDest1.val+xTempStep1.val
- }
- // event,buttonPress2,entn,tempUpd,X
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpdHigh,"
- //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 btDown1
- 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+="tempUpdHigh,"
- //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+="tempUpdLow,"
- //convert temperature
- covx xTempDest2.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
@@ -687,30 +513,21 @@
prints tSend.txt,0
prints crcval,2
-Dual-state Button bDown2
+Dual-state Button bt6
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(xTempDest2.val>xTempMin2.val)
- {
- xTempDest2.val=xTempDest2.val-xTempStep2.val
- }
- // event,buttonPress2,entn,tempUpd,X
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpdLow,"
- //convert temperature
- 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
@@ -723,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
@@ -759,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
@@ -964,22 +763,22 @@
//entity name
spstr strCommand.txt,entn.txt,"~",3
//currentTemp
- spstr strCommand.txt,tCurTemp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,"~",5
- covx tTmp.txt,xTempDest1.val,0,0
- xTempDest.val=xTempDest1.val
+ covx tTmp.txt,xTempDest.val,0,0
//status
spstr strCommand.txt,tStatus.txt,"~",6
//minTemp
spstr strCommand.txt,tTmp.txt,"~",7
- covx tTmp.txt,xTempMin1.val,0,0
+ covx tTmp.txt,xTempMin.val,0,0
//maxTemp
spstr strCommand.txt,tTmp.txt,"~",8
- covx tTmp.txt,xTempMax1.val,0,0
+ covx tTmp.txt,xTempMax.val,0,0
//tempStep
spstr strCommand.txt,tTmp.txt,"~",9
- covx tTmp.txt,xTempStep1.val,0,0
+ covx tTmp.txt,xTempStep.val,0,0
// disable all buttons
vis bt0,0
vis bt1,0
@@ -989,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!="")
@@ -1109,33 +909,20 @@
//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
- //Text tCF
- spstr strCommand.txt,tCF.txt,"~",45
- tCF1.txt=tCF.txt
- tCF2.txt=tCF.txt
- //Second Temperature
- spstr strCommand.txt,tTmp.txt,"~",46
- if(tTmp.txt!="")
- {
- covx tTmp.txt,xTempDest2.val,0,0
- vis btUp,0
- vis xTempDest,0
- vis btDown,0
- vis tCF,0
- vis btUp1,1
- vis xTempDest1,1
- vis btDown1,1
- vis tCF1,1
- vis bUp2,1
- vis xTempDest2,1
- vis bDown2,1
- vis tCF2,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
}
}
if(tInstruction.txt=="pageType")
Hotspot mSwipePrev
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-19 17:45:30.176249529 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1279,8 +641,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820)
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-19 17:45:30.176249529 +0000
--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200