h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 23:44:25 +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:
joBr99
2022-06-02 18:18:43 +02:00
parent 35f4c281cf 107bdd4580
commit b80366ad9f
3 changed files with 41 additions and 41 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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 16:20:54.039107896 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 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 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 15:45:47.760510844 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 16:20:54.039107896 +0000
@@ -1925,10 +1925,6 @@ @@ -1925,10 +1925,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardGrid.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 16:20:54.039107896 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 16:20:54.039107896 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -99,8 +99,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardThermo.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 15:45:47.760510844 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 16:20:54.039107896 +0000
@@ -1170,10 +1170,6 @@ @@ -1170,10 +1170,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 16:20:54.039107896 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -136,8 +136,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/popupLight.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 16:20:54.039107896 +0000
@@ -561,10 +561,6 @@ @@ -561,10 +561,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/popupNotify.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 16:20:54.039107896 +0000
@@ -311,10 +311,6 @@ @@ -311,10 +311,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/popupShutter.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 15:45:47.756510818 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 16:20:54.039107896 +0000
@@ -406,10 +406,6 @@ @@ -406,10 +406,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 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") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 15:45:47.760510844 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 16:20:54.039107896 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

20
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/Program.s.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:45:47.256507572 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 16:20:53.475102767 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardEntities.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:45:47.256507572 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 16:20:53.475102767 +0000
@@ -63,6 +63,16 @@ @@ -63,6 +63,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/cardMedia.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 15:45:47.256507572 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 16:20:53.479102832 +0000
@@ -45,12 +45,6 @@ @@ -45,12 +45,6 @@
Scope: local Scope: local
Value: 0 Value: 0
@@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/pageStartup.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:45:47.256507572 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 16:20:53.479102832 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -539,8 +539,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000 --- HMI/n2t-out/screensaver.txt 2022-06-01 16:20:52.963094388 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:45:47.256507572 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 16:20:53.479102832 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 15:45:47.308507910 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 16:20:53.523103552 +0000
+--- HMI/n2t-out/Program.s.txt 2022-06-01 15:45:46.816504716 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 15:45:47.256507572 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 16:20:53.475102767 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-06-01 15:45:46.816504716 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 15:45:47.256507572 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 16:20:53.475102767 +0000
+@@ -63,6 +63,16 @@ +@@ -63,6 +63,16 @@
+@@ -120,6 +130,18 @@ +@@ -120,6 +130,18 @@
+@@ -156,6 +178,15 @@ +@@ -156,6 +178,15 @@
@@ -13,8 +13,8 @@
+@@ -1075,6 +1281,28 @@ +@@ -1075,6 +1281,28 @@
+@@ -1850,6 +2078,169 @@ +@@ -1850,6 +2078,169 @@
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-06-01 15:45:46.816504716 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 15:45:47.256507572 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-01 16:20:53.479102832 +0000
+@@ -45,12 +45,6 @@ +@@ -45,12 +45,6 @@
+ Scope: local + Scope: local
+ Value: 0 + Value: 0
@@ -59,10 +59,10 @@
+ } + }
+ if(tInstruction.txt=="time") + if(tInstruction.txt=="time")
+ { + {
+--- HMI/n2t-out/pageStartup.txt 2022-06-01 15:45:46.816504716 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 15:45:47.256507572 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 16:20:53.479102832 +0000
+--- HMI/n2t-out/screensaver.txt 2022-06-01 15:45:46.816504716 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 16:20:52.963094388 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 15:45:47.256507572 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 16:20:53.479102832 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@
+@@ -501,14 +485,6 @@ +@@ -501,14 +485,6 @@
+ spstr strCommand.txt,tIcon2.txt,"~",19 + spstr strCommand.txt,tIcon2.txt,"~",19