h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-01 12:24:21 +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-03-29 22:31:05 +00:00
committed by GitHub Actions
parent e12319d487
commit cde479e1cc
4 changed files with 76 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
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-03-29 22:12:23.291612091 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 22:12:23.795618184 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-29 22:31:04.197072937 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 22:31:04.597077152 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-29 22:12:23.291612091 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 22:12:23.799618232 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-29 22:31:04.197072937 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 22:31:04.601077192 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -780,9 +780,36 @@ 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-03-29 22:31:04.197072937 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 22:31:04.597077152 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
vis tId,0
+ vis nPageDisp,0
vis xTempMin,0
vis xTempMax,0
vis xTempStep,0
@@ -98,6 +99,15 @@
Text :
Max. Text Size: 10
+Number nPageDisp
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
XFloat xTempCurr
Attributes
Scope : local
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 22:12:23.291612091 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 22:12:23.795618184 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-29 22:31:04.197072937 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 22:31:04.597077152 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled