h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-03 13:24: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:
joBr99
2022-05-06 18:01:26 +02:00
parent f3587044f8 a9fc6d8772
commit 8aca995c55
12 changed files with 164 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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-06 15:41:32.946509062 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:41:33.754518633 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:56:23.748980554 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:41:32.946509062 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:41:33.754518633 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:56:23.748980554 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:41:32.950509110 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 15:41:33.754518633 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 15:56:23.748980554 +0000
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15

83
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-06 15:41:32.946509062 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:56:23.168978602 +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-06 15:41:32.950509110 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:56:23.168978602 +0000
@@ -46,7 +46,7 @@
Attributes
Scope : local
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:41:32.950509110 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:56:23.168978602 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:41:32.946509062 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:56:23.168978602 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:41:32.946509062 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:56:23.168978602 +0000
@@ -25,19 +25,19 @@
Attributes
Scope : local
@@ -657,9 +657,30 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:56:23.168978602 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Text tTmp2
Attributes
@@ -40,7 +40,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Picture p0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:41:32.946509062 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:56:23.168978602 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -678,9 +699,34 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:56:23.168978602 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:41:32.950509110 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:41:33.326513564 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:56:23.168978602 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
Scope : local
- Text :
- Max. Text Size: 80
+ Text : newtxt
+ Max. Text Size: 50
Text tEntity
Attributes
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
@@ -698,6 +744,15 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Picture p0
Attributes
Scope : local
@@ -157,7 +147,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -341,8 +331,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:41:33.366514037 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:41:32.946509062 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:41:33.326513564 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:56:23.268978938 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:56:23.168978602 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:41:32.950509110 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:41:33.326513564 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -46,7 +46,7 @@
+ Attributes
+ Scope : local
@@ -67,8 +67,8 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:41:32.950509110 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:41:33.326513564 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -91,8 +91,8 @@
+ if(tInstruction.txt=="pageType")
+ {
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:41:32.946509062 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:41:33.326513564 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
@@ -140,8 +140,8 @@
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:41:32.946509062 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:41:33.326513564 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -25,19 +25,19 @@
+ Attributes
+ Scope : local
@@ -255,11 +255,57 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:41:32.946509062 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:41:33.326513564 +0000
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+- Max. Text Size : 80
++ Max. Text Size : 50
+
+ Text tTmp2
+ Attributes
+@@ -40,7 +40,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+- Max. Text Size : 80
++ Max. Text Size : 50
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:56:23.168978602 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Variable (int32) mode
+ Attributes
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:41:32.950509110 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:41:33.326513564 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:56:23.168978602 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
+ Scope : local
+- Text :
+- Max. Text Size: 80
++ Text : newtxt
++ Max. Text Size: 50
+
+ Text tEntity
+ Attributes
+@@ -119,16 +119,6 @@
+ Text : Position
+ Max. Text Size : 15
@@ -277,6 +323,15 @@
+ Picture p0
+ Attributes
+ Scope : local
+@@ -157,7 +147,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -341,8 +331,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sys0,0,0

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

@@ -17,7 +17,7 @@ popupNotify
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
108 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
@@ -38,14 +38,14 @@ cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardEntities
74 Component(s)
1159 Line(s) of event code

4
HMI/US/portrait/n2t-out-visual/pageIcons.txt
View File

@@ -57,7 +57,7 @@ Text tTmp1
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
@@ -87,7 +87,7 @@ Text tTmp2
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

4
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -69,8 +69,8 @@ Variable (string) entn
Attributes
ID : 21
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Variable (int32) mode
Attributes

6
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -56,8 +56,8 @@ Variable (string) entn
Attributes
ID : 18
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Text tEntity
Attributes
@@ -322,7 +322,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

4
HMI/US/portrait/n2t-out/pageIcons.txt
View File

@@ -30,7 +30,7 @@ Text tTmp1
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 80
Max. Text Size : 50
Text tTmp2
Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 80
Max. Text Size : 50
Picture p0
Attributes

4
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -59,8 +59,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Variable (int32) mode
Attributes

6
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -46,8 +46,8 @@ Variable (string) strCommand
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Text : newtxt
Max. Text Size: 50
Text tEntity
Attributes
@@ -147,7 +147,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

BIN
HMI/US/portrait/nspanel_US_P.HMI
View File

Binary file not shown.

BIN
HMI/US/portrait/nspanel_US_P.tft
View File

Binary file not shown.