h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 05:04:44 +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

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