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-05-30 17:02:53 +00:00
committed by github-actions[bot]
parent db1d8a285b
commit eeb05a1e96
16 changed files with 129 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
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-05-30 16:19:33.814519820 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:02:49.331805698 +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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:02:49.331805698 +0000
@@ -683,10 +683,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -24,8 +24,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:02:49.343806991 +0000
@@ -1924,10 +1924,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -38,8 +38,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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:02:49.331805698 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,8 +52,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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:02:49.331805698 +0000
@@ -635,10 +635,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:02:49.331805698 +0000
@@ -581,10 +581,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -82,8 +82,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:02:49.331805698 +0000
@@ -1169,10 +1169,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -96,8 +96,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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:02:49.331805698 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -119,8 +119,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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:02:49.331805698 +0000
@@ -560,10 +560,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -133,8 +133,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-05-30 16:19:33.814519820 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:02:49.331805698 +0000
@@ -310,10 +310,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -147,8 +147,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-05-30 16:19:33.814519820 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:02:49.331805698 +0000
@@ -405,10 +405,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -161,8 +161,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-05-30 16:19:33.818519895 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 16:19:34.706536541 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:02:49.343806991 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0