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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-14 15:34:36 +00:00
committed by github-actions[bot]
parent 24906f6ed8
commit 9ac2a98305
6 changed files with 237 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
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 14:51:20.255641436 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 15:34:35.634269489 +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 14:51:20.259641424 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.634269489 +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 14:51:20.259641424 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 15:34:35.634269489 +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 14:51:20.259641424 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 15:34:35.634269489 +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 14:51:20.255641436 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 15:34:35.634269489 +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 14:51:20.259641424 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 15:34:35.634269489 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -425,11 +425,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
vis bt5,0
vis bt6,0
vis bt7,0
- vis t0,0
- vis tCF2,0
- vis bUp2,0
- vis bDown2,0
- vis xTempDest2,0
- vis t2,0
- vis tCF1,0
- vis btUp1,0
- vis btDown1,0
- vis xTempDest1,0
@@ -568,10 +568,20 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Text tHeading
Attributes
@@ -248,56 +215,6 @@
Text : 
@@ -238,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
@@ -592,7 +602,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- Text : State
- Max. Text Size : 30
-
-Text t0
-Text tCF2
- Attributes
- Scope : local
- Dragging : 0
@@ -612,19 +622,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- 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
-Text tCF
+Text t2
Attributes
Scope : local
Dragging : 0
@@ -389,7 +306,7 @@
prints tSend.txt,0
prints crcval,2
@@ -745,12 +747,11 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
prints crcval,2
-Dual-state Button btUp1
+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
@@ -782,11 +783,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- prints crcval,2
-
-Dual-state Button btDown1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
+Dual-state Button bt8
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : unpressed
- Text : 
- Max. Text Size : 10
@@ -837,7 +839,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- tSend.txt+="tempUpd2,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -875,7 +877,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- tSend.txt+="tempUpd2,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1049,7 +1051,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!="")
@@ -1109,12 +825,21 @@
@@ -1109,33 +825,20 @@
//enable
vis bt7,1
}
@@ -1059,6 +1061,27 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- 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!="")
@@ -1073,13 +1096,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
+ 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 14:51:20.255641436 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 14:51:21.091644277 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 15:34:35.634269489 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200