h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-31 20:04:19 +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 19:06:44 +00:00
committed by github-actions[bot]
parent 89d8ed73e2
commit c079401572
6 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-14 19:06:44.348510686 +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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-14 19:06:44.348510686 +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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-14 19:06:44.348510686 +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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-14 19:06:44.348510686 +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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-14 19:06:44.348510686 +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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-14 19:06:44.348510686 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -766,7 +766,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+="tempUpdHigh,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -783,12 +783,11 @@ 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
@@ -803,7 +802,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+="tempUpdHigh,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -839,7 +838,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+="tempUpd2,"
- tSend.txt+="tempUpdLow,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -856,11 +855,12 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
- 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 bt8
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
- State : unpressed
- Text : 
+ State : pressed
@@ -877,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+="tempUpd2,"
- tSend.txt+="tempUpdLow,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1100,8 +1100,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 15:34:34.762258765 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 15:34:35.634269489 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-14 19:06:44.348510686 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

28
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 15:34:34.762258765 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 15:34:35.170263783 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 19:06:43.988494910 +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 15:34:34.762258765 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.170263783 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 19:06:43.988494910 +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 15:34:34.762258765 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 15:34:35.170263783 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 19:06:43.992495085 +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 15:34:34.762258765 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 15:34:35.170263783 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 19:06:43.992495085 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -964,7 +964,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- tSend.txt+="tempUpdHigh,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1000,7 +1000,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd,"
- tSend.txt+="tempUpdHigh,"
- //convert temperature
- covx xTempDest1.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1036,7 +1036,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
- //craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd2,"
- tSend.txt+="tempUpdLow,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1071,7 +1071,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
//craft command
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+="tempUpd2,"
- tSend.txt+="tempUpdLow,"
- //convert temperature
- covx xTempDest2.val,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
@@ -1233,8 +1233,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 15:34:34.762258765 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 15:34:35.170263783 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-14 19:06:43.648480010 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 19:06:43.988494910 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 15:34:35.238264619 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 15:34:34.762258765 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 15:34:35.170263783 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-14 19:06:44.004495611 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-14 19:06:43.648480010 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-14 19:06:43.988494910 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 15:34:34.762258765 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 15:34:35.170263783 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-14 19:06:43.648480010 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-14 19:06:43.988494910 +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 15:34:34.762258765 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 15:34:35.170263783 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-14 19:06:43.648480010 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-14 19:06:43.992495085 +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 15:34:34.762258765 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 15:34:35.170263783 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-14 19:06:43.648480010 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-14 19:06:43.992495085 +0000
+@@ -17,12 +17,9 @@
+ vis tInstruction,0
+ vis tTmp,0
@@ -544,7 +544,7 @@
+- //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- tSend.txt+="tempUpdHigh,"
+- //convert temperature
+- covx xTempDest1.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
@@ -580,7 +580,7 @@
+- //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd,"
+- tSend.txt+="tempUpdHigh,"
+- //convert temperature
+- covx xTempDest1.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
@@ -616,7 +616,7 @@
+- //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd2,"
+- tSend.txt+="tempUpdLow,"
+- //convert temperature
+- covx xTempDest2.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
@@ -651,7 +651,7 @@
+ //craft command
+- tSend.txt="event,buttonPress2,"
+- tSend.txt+=entn.txt+","
+- tSend.txt+="tempUpd2,"
+- tSend.txt+="tempUpdLow,"
+- //convert temperature
+- covx xTempDest2.val,tTmp.txt,0,0
+- tSend.txt+=tTmp.txt
@@ -812,8 +812,8 @@
+ }
+ }
+ if(tInstruction.txt=="pageType")
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 15:34:34.762258765 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 15:34:35.170263783 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-14 19:06:43.648480010 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-14 19:06:43.988494910 +0000
+@@ -351,7 +351,7 @@
+
+ Events

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

@@ -1242,7 +1242,7 @@ Dual-state Button btUp1
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpdHigh,"
//convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -1300,7 +1300,7 @@ Dual-state Button btDown1
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpdHigh,"
//convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -1358,7 +1358,7 @@ Dual-state Button bUp2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd2,"
tSend.txt+="tempUpdLow,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -1416,7 +1416,7 @@ Dual-state Button bDown2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd2,"
tSend.txt+="tempUpdLow,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt

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

@@ -45,7 +45,7 @@ cardAlarm
cardThermo
56 Component(s)
543 Line(s) of event code
288 Unique line(s) of event code
289 Unique line(s) of event code
cardEntities
65 Component(s)
981 Line(s) of event code
@@ -55,4 +55,4 @@ Total
12 Page(s)
371 Component(s)
3861 Line(s) of event code
1060 Unique line(s) of event code
1061 Unique line(s) of event code

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

@@ -598,7 +598,7 @@ Dual-state Button btUp1
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpdHigh,"
//convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -634,7 +634,7 @@ Dual-state Button btDown1
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd,"
tSend.txt+="tempUpdHigh,"
//convert temperature
covx xTempDest1.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -670,7 +670,7 @@ Dual-state Button bUp2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd2,"
tSend.txt+="tempUpdLow,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt
@@ -706,7 +706,7 @@ Dual-state Button bDown2
//craft command
tSend.txt="event,buttonPress2,"
tSend.txt+=entn.txt+","
tSend.txt+="tempUpd2,"
tSend.txt+="tempUpdLow,"
//convert temperature
covx xTempDest2.val,tTmp.txt,0,0
tSend.txt+=tTmp.txt