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

add loc para (add nextion2text)

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

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