h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-15 01:18:19 +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-07 10:39:50 +02:00
parent 3193cd089c b19bbe0427
commit e80ae8af43
4 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 19:28:28.586503617 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 08:29:47.118962012 +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/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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 19:28:28.586503617 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 08:29:47.118962012 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/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/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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 19:28:28.586503617 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-07 08:29:47.118962012 +0000
@@ -535,12 +535,6 @@ @@ -535,12 +535,6 @@
vis pColorWheel,1 vis pColorWheel,1
} }
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 19:28:28.586503617 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-07 08:29:47.118962012 +0000
@@ -109,7 +109,7 @@ @@ -109,7 +109,7 @@
Text : Text :
Max. Text Size : 20 Max. Text Size : 20

12
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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:29:46.698968636 +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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -427,8 +427,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/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-05-06 19:28:27.798491086 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +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

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

@@ -1,29 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 19:28:28.194497383 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:29:46.734968068 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 08:29:46.318974628 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:29:46.698968636 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 19:28:27.798491086 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:29:46.318974628 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
+@@ -62,6 +62,16 @@ +--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
+ vis bPrev,0 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +0000
+ vis bNext,0
+@@ -119,6 +129,18 @@
+ Max. Text Size: 80
++ Max. Text Size: 80
+@@ -155,6 +177,15 @@
+@@ -285,6 +316,26 @@
+@@ -404,6 +455,34 @@
++ crcputs sys0,2
+@@ -861,6 +940,106 @@
++ crcputs sys0,2
++ crcputs sys0,2
++ crcputs sys0,2
++ crcputs sys0,2
+@@ -969,6 +1148,33 @@
++ crcputs sys0,2
+@@ -1074,6 +1280,28 @@
+@@ -1644,6 +1872,128 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000

10
HMI/US/portrait/n2t-out-visual/cardEntities.txt
View File

@@ -785,7 +785,7 @@ Slider hSlider1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 100 y coordinate : 100
Width : 100 Width : 100
Height : 43 Height : 43
@@ -828,7 +828,7 @@ Slider hSlider2
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 180 y coordinate : 180
Width : 100 Width : 100
Height : 43 Height : 43
@@ -871,7 +871,7 @@ Slider hSlider3
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 260 y coordinate : 260
Width : 100 Width : 100
Height : 43 Height : 43
@@ -914,7 +914,7 @@ Slider hSlider4
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 340 y coordinate : 340
Width : 100 Width : 100
Height : 43 Height : 43
@@ -957,7 +957,7 @@ Slider hSlider5
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 210 x coordinate : 164
y coordinate : 420 y coordinate : 420
Width : 100 Width : 100
Height : 43 Height : 43