h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-11 23:57:42 +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-03 16:17:17 +00:00
committed by github-actions[bot]
parent b3669156a5
commit 9ae260693d
12 changed files with 95 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-03 16:17:11.076230727 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-03 16:17:12.100247628 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardEntities.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-03 16:17:12.104247694 +0000
@@ -1925,10 +1925,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardGrid.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-03 16:17:12.104247694 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -37,8 +37,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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardMedia.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-03 16:17:12.104247694 +0000
@@ -45,12 +45,6 @@
Scope: local
Value: 0
@@ -99,8 +99,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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-03 16:17:12.104247694 +0000
@@ -1170,10 +1170,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -113,8 +113,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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-03 16:17:12.104247694 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupLight.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-03 16:17:12.104247694 +0000
@@ -561,10 +561,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -150,8 +150,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
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-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-03 16:17:11.076230727 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-03 16:17:12.104247694 +0000
@@ -311,10 +311,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -164,8 +164,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/popupShutter.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-03 16:17:12.104247694 +0000
@@ -406,10 +406,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -178,8 +178,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-03 10:28:27.418108334 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-03 10:28:28.302121944 +0000
--- HMI/n2t-out/screensaver.txt 2022-06-03 16:17:11.080230793 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-03 16:17:12.104247694 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0