h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 01:18: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-03-31 18:35:25 +00:00
committed by GitHub Actions
parent 32f8ce5db7
commit 4ecef8e3d2
5 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
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-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 18:35:24.787445085 +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-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-31 18:35:24.787445085 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -134,8 +134,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
{
tmFlash.en=1
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:31:20.316572994 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 18:35:24.387440559 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 18:35:24.787445085 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -938,8 +938,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/cardGrid.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-31 18:35:24.787445085 +0000
@@ -568,33 +568,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
@@ -975,8 +975,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/cardMedia.txt 2022-03-31 18:35:24.387440559 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 18:35:24.787445085 +0000
@@ -501,55 +501,28 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
@@ -1060,8 +1060,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
{
vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 18:35:24.787445085 +0000
@@ -638,53 +638,26 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
@@ -1105,7 +1105,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+ spstr strCommand.txt,tTmp.txt,",",3
covx tTmp.txt,xTempCurr.val,0,0
//dstTemp
spstr strCommand.txt,tTmp.txt,",",4
- spstr strCommand.txt,tTmp.txt,",",5
+ spstr strCommand.txt,tTmp.txt,",",4
covx tTmp.txt,xTempDest.val,0,0
//status
- spstr strCommand.txt,tStatus.txt,",",6
@@ -1389,8 +1390,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:31:19.852564647 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:31:20.312572922 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 18:35:24.383440514 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 18:35:24.787445085 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled