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

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-06 16:15:47 +00:00
committed by github-actions[bot]
parent d734adefce
commit 7bb069d1e2
10 changed files with 122 additions and 186 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
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:09:55.031738318 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:15:46.858823403 +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 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:09:55.031738318 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:15:46.858823403 +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/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:09:55.031738318 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:15:46.858823403 +0000
@@ -535,12 +535,6 @@
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")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:09:55.031738318 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:15:46.858823403 +0000
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20

98
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 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
@@ -62,6 +62,16 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -475,30 +475,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +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 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -518,8 +497,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -531,22 +510,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
@@ -535,12 +535,6 @@
vis pColorWheel,1
}
}
- // set t0 Color (Localization)
- spstr strCommand.txt,t0.txt,"~",6
- // set t4 Temperature (Localization)
- spstr strCommand.txt,t4.txt,"~",7
- // set t1 Brightness (Localization)
- spstr strCommand.txt,t0.txt,"~",8
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -558,33 +524,16 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
@@ -109,7 +109,7 @@
@@ -127,7 +127,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
-Text tPosHeading
+Text t1
Attributes
Scope : local
Dragging : 0
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
-Text tInfo1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 40
-
+ Max. Text Size : 25
Picture p0
Attributes
Scope : local
@@ -157,7 +147,7 @@
@@ -157,7 +157,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -593,14 +542,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -341,10 +331,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
- // set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",2
- // set tPosHeading (localization)
- spstr strCommand.txt,tPosHeading.txt,"~",3
}
if(tInstruction.txt=="dimmode")
{

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

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:09:54.651733438 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:15:46.478825287 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -25,8 +25,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 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
@@ -73,32 +73,11 @@
+
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +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 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -110,22 +89,9 @@
+
+ Variable (int32) mode
+ Attributes
+@@ -535,12 +535,6 @@
+ vis pColorWheel,1
+ }
+ }
+- // set t0 Color (Localization)
+- spstr strCommand.txt,t0.txt,"~",6
+- // set t4 Temperature (Localization)
+- spstr strCommand.txt,t4.txt,"~",7
+- // set t1 Brightness (Localization)
+- spstr strCommand.txt,t0.txt,"~",8
+ }
+ if(tInstruction.txt=="time")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
@@ -137,33 +103,16 @@
+
+ Text tEntity
+ Attributes
+@@ -109,7 +109,7 @@
+@@ -127,7 +127,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 20
+
+-Text tPosHeading
++Text t1
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -119,16 +119,6 @@
+ Text : Position
+ Max. Text Size : 15
+
+-Text tInfo1
+- Attributes
+- Scope : local
+- Dragging : 0
+- Disable release event after dragging: 0
+- Send Component ID : disabled
+- Associated Keyboard : none
+- Text :
+- Max. Text Size : 40
+-
++ Max. Text Size : 25
+
+ Picture p0
+ Attributes
+ Scope : local
+@@ -157,7 +147,7 @@
+@@ -157,7 +157,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
@@ -172,14 +121,3 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -341,10 +331,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,sys0,0,0
+ hPosition.val=sys0
+- // set tinfo1 text
+- spstr strCommand.txt,tInfo1.txt,"~",2
+- // set tPosHeading (localization)
+- spstr strCommand.txt,tPosHeading.txt,"~",3
+ }
+ if(tInstruction.txt=="dimmode")
+ {

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

@@ -15,13 +15,9 @@ popupNotify
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
108 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
20 Component(s)
193 Line(s) of event code
110 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
@@ -30,6 +26,10 @@ screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
@@ -53,6 +53,6 @@ cardEntities
Total
12 Page(s)
355 Component(s)
3889 Line(s) of event code
1076 Unique line(s) of event code
356 Component(s)
3894 Line(s) of event code
1081 Unique 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 : 50
Max. Text Size : 80
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 : 50
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

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

@@ -881,6 +881,12 @@ Timer tmSerial
vis pColorWheel,1
}
}
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
}
if(tInstruction.txt=="time")
{

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

@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 21
y coordinate : 35
Width : 45
Height : 30
Effect : load
@@ -239,7 +239,7 @@ Text tId
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Text tPosHeading
Attributes
ID : 17
Scope : local
@@ -269,6 +269,36 @@ Text t1
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInfo1
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 61
y coordinate : 51
Width : 195
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 38066
Horizontal Alignment : left
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 25
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
@@ -596,6 +626,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
}
if(tInstruction.txt=="dimmode")
{

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 : 50
Max. Text Size : 80
Text tTmp2
Attributes
@@ -40,7 +40,7 @@ Text tTmp2
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 50
Max. Text Size : 80
Picture p0
Attributes

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

@@ -535,6 +535,12 @@ Timer tmSerial
vis pColorWheel,1
}
}
// set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6
// set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7
// set t1 Brightness (Localization)
spstr strCommand.txt,t0.txt,"~",8
}
if(tInstruction.txt=="time")
{

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

@@ -109,7 +109,7 @@ Text tId
Text :
Max. Text Size : 20
Text t1
Text tPosHeading
Attributes
Scope : local
Dragging : 0
@@ -119,6 +119,16 @@ Text t1
Text : Position
Max. Text Size : 15
Text tInfo1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 25
Picture p0
Attributes
Scope : local
@@ -331,6 +341,10 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
// set tinfo1 text
spstr strCommand.txt,tInfo1.txt,"~",2
// set tPosHeading (localization)
spstr strCommand.txt,tPosHeading.txt,"~",3
}
if(tInstruction.txt=="dimmode")
{