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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-07 08:40:24 +00:00
committed by github-actions[bot]
parent cef1289579
commit 479b80caa4
16 changed files with 124 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
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-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 08:29:47.118962012 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 08:40:24.122300547 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -8,71 +8,3 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- // fix touch offset
- 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-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 08:29:47.118962012 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
- tSend.txt="event,startup,"+tVersion.txt+",eu"
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc
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-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-07 08:29:47.118962012 +0000
@@ -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/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-07 08:29:47.118962012 +0000
@@ -109,7 +109,7 @@
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
-
Picture p0
Attributes
Scope : local
@@ -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")
{

54
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,34 +10,18 @@ pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
popupLight
27 Component(s)
338 Line(s) of event code
182 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
171 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
cardEntities
62 Component(s)
966 Line(s) of event code
412 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
109 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
popupNotify
17 Component(s)
196 Line(s) of event code
@@ -46,13 +30,29 @@ cardThermo
41 Component(s)
444 Line(s) of event code
249 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
171 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
216 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
cardEntities
62 Component(s)
966 Line(s) of event code
412 Unique line(s) of event code
Total
12 Page(s)
343 Component(s)
3696 Line(s) of event code
1019 Unique line(s) of event code
344 Component(s)
3701 Line(s) of event code
1024 Unique line(s) of event code

8
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 32
Text : 33
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -418,8 +418,8 @@ Picture p0
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 479
Height : 319
Width : 480
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt+",us-l"
tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

6
HMI/US/landscape/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")
{

40
HMI/US/landscape/n2t-out-visual/popupShutter.txt
View File

@@ -68,7 +68,7 @@ Text tEntity
Send Component ID : disabled
Opacity : 127
x coordinate : 80
y coordinate : 108
y coordinate : 94
Width : 195
Height : 30
Effect : load
@@ -98,7 +98,7 @@ Text tIcon1
Send Component ID : disabled
Opacity : 127
x coordinate : 27
y coordinate : 109
y coordinate : 108
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 : 80
y coordinate : 122
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 : 40
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/landscape/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 32
Text : 33
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt+",us-l"
tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

6
HMI/US/landscape/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/landscape/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 : 40
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")
{

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
--- HMI/n2t-out/Program.s.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:29:46.698968636 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +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-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +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/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,7 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:29:46.734968068 +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-07 08:29:46.698968636 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:29:46.318974628 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:29:46.698968636 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:29:46.318974628 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:29:46.698968636 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 08:40:23.730293612 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-07 08:40:23.298285970 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 08:40:23.678292692 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 08:40:23.298285970 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 08:40:23.682292763 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 08:40:23.298285970 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 08:40:23.678292692 +0000

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

@@ -14,6 +14,10 @@ popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
@@ -22,10 +26,6 @@ cardGrid
39 Component(s)
420 Line(s) of event code
246 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
screensaver
35 Component(s)
292 Line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 32
Text : 33
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 32
Text : 33
Max. Text Size : 10
Picture p0

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

@@ -30,14 +30,14 @@ popupNotify
17 Component(s)
196 Line(s) of event code
123 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
109 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 32
Text : 33
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/n2t-out/pageStartup.txt
View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 32
Text : 33
Max. Text Size : 10
Picture p0