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

Browse Source
This commit is contained in:
Johannes
2022-05-28 10:32:59 +02:00
parent 1847ef4cc0 8fa1c4b19f
commit 9d34caaca6
5 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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-28 05:16:59.957876007 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:17:01.093876698 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 08:26:24.560334500 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:17:01.093876698 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 08:26:24.564334501 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-28 05:16:59.957876007 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:17:01.093876698 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 08:26:24.564334501 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -33,8 +33,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-28 05:16:59.957876007 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:17:01.093876698 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 08:26:24.564334501 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.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/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-05-28 05:16:59.961876009 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:17:01.093876698 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 08:26:24.564334501 +0000
@@ -62,12 +62,6 @@ @@ -62,12 +62,6 @@
Text : Text :
Max. Text Size: 50 Max. Text Size: 50

24
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-28 05:16:59.957876007 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 08:26:23.988334344 +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-28 05:16:59.961876009 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 08:26:23.988334344 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 08:26:23.988334344 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-28 05:16:59.957876007 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 08:26:23.988334344 +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
@@ -501,8 +501,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 08:26:23.988334344 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -514,8 +514,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.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-05-28 05:16:59.961876009 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 08:26:23.480334206 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 08:26:23.988334344 +0000
@@ -471,22 +471,6 @@ @@ -471,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,15 +1,15 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:17:00.521876350 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 08:26:24.036334357 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-28 05:16:59.957876007 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:17:00.497876336 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 08:26:23.988334344 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:16:59.961876009 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:17:00.501876338 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 08:26:23.988334344 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-28 05:16:59.961876009 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:17:00.501876338 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 08:26:23.988334344 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:16:59.957876007 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:17:00.501876338 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 08:26:23.988334344 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-28 05:16:59.957876007 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:17:00.501876338 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 08:26:23.988334344 +0000
+@@ -209,9 +209,6 @@ +@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y + sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0 + covx sys0,tTmp.txt,0,0
@@ -20,6 +20,6 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:16:59.961876009 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 08:26:23.480334206 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:17:00.501876338 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 08:26:23.988334344 +0000
+@@ -471,22 +471,6 @@ +@@ -471,22 +471,6 @@

12
HMI/n2t-out-visual/cardThermo.txt
View File

@@ -459,9 +459,9 @@ Text tStatus
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 11 x coordinate : 11
y coordinate : 200 y coordinate : 190
Width : 97 Width : 97
Height : 30 Height : 54
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -472,11 +472,11 @@ Text tStatus
Back. Color : 6371 Back. Color : 6371
Font Color : 50712 Font Color : 50712
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : enabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -549,7 +549,7 @@ Text tStateLbl
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 12
y coordinate : 162 y coordinate : 156
Width : 95 Width : 95
Height : 30 Height : 30
Effect : load Effect : load
@@ -669,7 +669,7 @@ Text tCurTemp
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 13 x coordinate : 13
y coordinate : 121 y coordinate : 119
Width : 95 Width : 95
Height : 30 Height : 30
Effect : load Effect : load

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -26,6 +26,10 @@ popupLight
27 Component(s) 27 Component(s)
348 Line(s) of event code 348 Line(s) of event code
188 Unique line(s) of event code 188 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -46,10 +50,6 @@ cardAlarm
38 Component(s) 38 Component(s)
364 Line(s) of event code 364 Line(s) of event code
224 Unique line(s) of event code 224 Unique line(s) of event code
cardThermo
56 Component(s)
546 Line(s) of event code
290 Unique line(s) of event code
cardEntities cardEntities
65 Component(s) 65 Component(s)
1133 Line(s) of event code 1133 Line(s) of event code