h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
Johannes
2022-05-30 19:02:20 +02:00
parent 82aeb47216 850785be84
commit b3612f97bf
5 changed files with 74 additions and 1916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nextion2text.yml vendored
View File

@@ -75,7 +75,7 @@ jobs:
continue-on-error: true
run: |
find -name "**.txt"
rm Nextion2Text.py
rm Nextion2Text.py*
- uses: stefanzweifel/git-auto-commit-action@v4
with:

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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.179400399 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.179400399 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -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 14:13:25.175400380 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 14:13:26.063404678 +0000
--- 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
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0

48
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-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 16:19:34.246527918 +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-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.246527918 +0000
@@ -683,10 +683,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -26,8 +26,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 14:13:25.179400399 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 16:19:34.246527918 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -494,8 +494,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 16:19:34.246527918 +0000
@@ -846,10 +846,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -508,8 +508,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 16:19:34.246527918 +0000
@@ -635,10 +635,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -523,8 +523,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 14:13:25.179400399 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 16:19:34.246527918 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -547,8 +547,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 16:19:34.246527918 +0000
@@ -1169,10 +1169,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -561,8 +561,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 16:19:34.246527918 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -593,8 +593,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 16:19:34.246527918 +0000
@@ -560,10 +560,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -607,8 +607,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/popupNotify.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 16:19:34.246527918 +0000
@@ -310,10 +310,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -621,8 +621,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 16:19:34.246527918 +0000
@@ -405,10 +405,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
@@ -635,8 +635,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 14:13:25.175400380 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 14:13:25.595402413 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 16:19:34.246527918 +0000
@@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0

50
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 14:13:25.627402567 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 14:13:25.595402413 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 16:19:34.258528143 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-30 16:19:33.814519820 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 16:19:34.246527918 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -683,10 +683,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -16,8 +16,8 @@
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 14:13:25.179400399 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -1849,6 +2077,169 @@
+@@ -1924,10 +2315,6 @@
+ // get value
@@ -31,8 +31,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -846,10 +846,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -45,8 +45,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -635,10 +635,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -59,8 +59,8 @@
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardQR.txt 2022-05-30 14:13:25.179400399 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -581,10 +581,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -74,8 +74,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -1169,10 +1169,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -87,8 +87,8 @@
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -273,10 +273,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -101,8 +101,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -560,10 +560,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -115,8 +115,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-05-30 16:19:33.814519820 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -310,10 +310,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -129,8 +129,8 @@
+ if(tInstruction.txt=="timeout")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-30 16:19:33.814519820 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -405,10 +405,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
@@ -142,8 +142,8 @@
+ }
+ if(tInstruction.txt=="time")
+ {
+--- HMI/n2t-out/screensaver.txt 2022-05-30 14:13:25.175400380 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 14:13:25.595402413 +0000
+--- HMI/n2t-out/screensaver.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -397,9 +397,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0

1842
Nextion2Text.py.2
View File

File diff suppressed because it is too large Load Diff