h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-14 08:58:17 +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-06-06 20:37:29 +00:00
committed by github-actions[bot]
parent 7eea343bef
commit 69a2a431cb
12 changed files with 72 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
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-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:32:17.830992218 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:37:24.258297598 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -8,23 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-06 20:32:17.834992421 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:32:17.834992421 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:37:24.258297598 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +23,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:32:17.830992218 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:37:24.258297598 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -99,8 +85,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:32:17.834992421 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:37:24.258297598 +0000
@@ -1152,10 +1152,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -113,8 +99,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:32:17.830992218 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:37:24.258297598 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -124,42 +110,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -273,10 +273,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-06 20:32:17.830992218 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-06 20:32:16.934946602 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-06 20:32:17.830992218 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{