mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-16 01:46:59 +01:00
implement #471 (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
673f4c20da
commit
cd1fecd9f2
@@ -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-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 17:53:21.343850547 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 19:57:24.536216256 +0000
|
||||
@@ -14,6 +14,3 @@
|
||||
//color vars
|
||||
int defaultFontColor=65535
|
||||
@@ -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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 17:53:21.347850562 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 19:57:24.536216256 +0000
|
||||
@@ -786,7 +786,7 @@
|
||||
Send Component ID : disabled
|
||||
State : unpressed
|
||||
@@ -49,8 +49,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
Touch Press Event
|
||||
Only in HMI/n2t-out: cardPower.txt
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 17:53:21.347850562 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 19:57:24.536216256 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -61,8 +61,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/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 17:53:20.407846944 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 17:53:21.347850562 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-09-17 19:57:23.628206782 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 19:57:24.536216256 +0000
|
||||
@@ -13,36 +13,6 @@
|
||||
Events
|
||||
Preinitialize Event
|
||||
|
||||
@@ -1912,6 +1912,7 @@ Hotspot m2
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity3.txt
|
||||
pageIcons.tTmp2.txt=entn3.txt
|
||||
pageIcons.tTmp3.txt=tIcon3.txt
|
||||
if(type3.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity3.txt
|
||||
@@ -1947,6 +1948,7 @@ Hotspot m1
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity2.txt
|
||||
pageIcons.tTmp2.txt=entn2.txt
|
||||
pageIcons.tTmp3.txt=tIcon2.txt
|
||||
if(type2.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity2.txt
|
||||
@@ -1982,6 +1984,7 @@ Hotspot m0
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity1.txt
|
||||
pageIcons.tTmp2.txt=entn1.txt
|
||||
pageIcons.tTmp3.txt=tIcon1.txt
|
||||
if(type1.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity1.txt
|
||||
@@ -2017,6 +2020,7 @@ Hotspot m3
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity4.txt
|
||||
pageIcons.tTmp2.txt=entn4.txt
|
||||
pageIcons.tTmp3.txt=tIcon4.txt
|
||||
if(type4.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity4.txt
|
||||
|
||||
@@ -608,6 +608,7 @@ Button bEntity1
|
||||
tTmp.txt=type1.txt
|
||||
pageIcons.tTmp1.txt=tEntity1.txt
|
||||
pageIcons.tTmp2.txt=entn1.txt
|
||||
pageIcons.tTmp3.txt=bEntity1.txt
|
||||
if(type1.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -666,6 +667,7 @@ Button bEntity2
|
||||
tTmp.txt=type2.txt
|
||||
pageIcons.tTmp1.txt=tEntity2.txt
|
||||
pageIcons.tTmp2.txt=entn2.txt
|
||||
pageIcons.tTmp3.txt=bEntity2.txt
|
||||
if(type2.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -724,6 +726,7 @@ Button bEntity3
|
||||
tTmp.txt=type3.txt
|
||||
pageIcons.tTmp1.txt=tEntity3.txt
|
||||
pageIcons.tTmp2.txt=entn3.txt
|
||||
pageIcons.tTmp3.txt=bEntity3.txt
|
||||
if(type3.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -782,6 +785,7 @@ Button bEntity4
|
||||
tTmp.txt=type4.txt
|
||||
pageIcons.tTmp1.txt=tEntity4.txt
|
||||
pageIcons.tTmp2.txt=entn4.txt
|
||||
pageIcons.tTmp3.txt=bEntity4.txt
|
||||
if(type4.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -840,6 +844,7 @@ Button bEntity5
|
||||
tTmp.txt=type5.txt
|
||||
pageIcons.tTmp1.txt=tEntity5.txt
|
||||
pageIcons.tTmp2.txt=entn5.txt
|
||||
pageIcons.tTmp3.txt=bEntity5.txt
|
||||
if(type5.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -898,6 +903,7 @@ Button bEntity6
|
||||
tTmp.txt=type6.txt
|
||||
pageIcons.tTmp1.txt=tEntity6.txt
|
||||
pageIcons.tTmp2.txt=entn6.txt
|
||||
pageIcons.tTmp3.txt=bEntity6.txt
|
||||
if(type6.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
|
||||
@@ -3,7 +3,7 @@ Program.s
|
||||
11 Line(s) of event code
|
||||
11 Unique line(s) of event code
|
||||
pageIcons
|
||||
6 Component(s)
|
||||
7 Component(s)
|
||||
0 Line(s) of event code
|
||||
0 Unique line(s) of event code
|
||||
popupNotify
|
||||
@@ -14,10 +14,6 @@ pageStartup
|
||||
19 Component(s)
|
||||
167 Line(s) of event code
|
||||
122 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
388 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
cardMedia
|
||||
34 Component(s)
|
||||
389 Line(s) of event code
|
||||
@@ -30,14 +26,18 @@ cardQR
|
||||
32 Component(s)
|
||||
404 Line(s) of event code
|
||||
235 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
386 Line(s) of event code
|
||||
211 Unique line(s) of event code
|
||||
popupShutter
|
||||
25 Component(s)
|
||||
389 Line(s) of event code
|
||||
212 Unique line(s) of event code
|
||||
pageTest
|
||||
14 Component(s)
|
||||
14 Line(s) of event code
|
||||
14 Unique line(s) of event code
|
||||
cardGrid
|
||||
42 Component(s)
|
||||
469 Line(s) of event code
|
||||
278 Unique line(s) of event code
|
||||
screensaver
|
||||
38 Component(s)
|
||||
341 Line(s) of event code
|
||||
@@ -46,21 +46,21 @@ cardThermo
|
||||
52 Component(s)
|
||||
580 Line(s) of event code
|
||||
303 Unique line(s) of event code
|
||||
cardGrid
|
||||
42 Component(s)
|
||||
463 Line(s) of event code
|
||||
272 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1128 Line(s) of event code
|
||||
515 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
387 Line(s) of event code
|
||||
212 Unique line(s) of event code
|
||||
cardAlarm
|
||||
40 Component(s)
|
||||
422 Line(s) of event code
|
||||
255 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
1132 Line(s) of event code
|
||||
519 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
14 Page(s)
|
||||
438 Component(s)
|
||||
5261 Line(s) of event code
|
||||
1405 Unique line(s) of event code
|
||||
439 Component(s)
|
||||
5273 Line(s) of event code
|
||||
1416 Unique line(s) of event code
|
||||
|
||||
@@ -92,6 +92,36 @@ Text tTmp2
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Text tTmp3
|
||||
Attributes
|
||||
ID : 6
|
||||
Scope : global
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 302
|
||||
y coordinate : 152
|
||||
Width : 146
|
||||
Height : 69
|
||||
Effect : load
|
||||
Effect Priority : 0
|
||||
Effect Time : 300
|
||||
Fill : solid color
|
||||
Style : flat
|
||||
Associated Keyboard : none
|
||||
Font ID : 1
|
||||
Back. Color : 65535
|
||||
Font Color : 0
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
ID : 1
|
||||
|
||||
@@ -25,6 +25,7 @@ Page popupLight
|
||||
tEntity.txt=pageIcons.tTmp1.txt
|
||||
//get entity id
|
||||
entn.txt=pageIcons.tTmp2.txt
|
||||
tIcon1.txt=pageIcons.tTmp3.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
vis tTmp,0
|
||||
|
||||
@@ -25,6 +25,7 @@ Page popupShutter
|
||||
tEntity.txt=pageIcons.tTmp1.txt
|
||||
//get entity id
|
||||
entn.txt=pageIcons.tTmp2.txt
|
||||
tIcon1.txt=pageIcons.tTmp3.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
vis tPosHeading,0
|
||||
|
||||
@@ -1014,6 +1014,7 @@ Hotspot m2
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity3.txt
|
||||
pageIcons.tTmp2.txt=entn3.txt
|
||||
pageIcons.tTmp3.txt=tIcon3.txt
|
||||
if(type3.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity3.txt
|
||||
@@ -1040,6 +1041,7 @@ Hotspot m1
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity2.txt
|
||||
pageIcons.tTmp2.txt=entn2.txt
|
||||
pageIcons.tTmp3.txt=tIcon2.txt
|
||||
if(type2.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity2.txt
|
||||
@@ -1066,6 +1068,7 @@ Hotspot m0
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity1.txt
|
||||
pageIcons.tTmp2.txt=entn1.txt
|
||||
pageIcons.tTmp3.txt=tIcon1.txt
|
||||
if(type1.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity1.txt
|
||||
@@ -1092,6 +1095,7 @@ Hotspot m3
|
||||
Touch Press Event
|
||||
pageIcons.tTmp1.txt=tEntity4.txt
|
||||
pageIcons.tTmp2.txt=entn4.txt
|
||||
pageIcons.tTmp3.txt=tIcon4.txt
|
||||
if(type4.txt=="shutter")
|
||||
{
|
||||
//popupShutter.tHeading.txt=tEntity4.txt
|
||||
|
||||
@@ -310,6 +310,7 @@ Button bEntity1
|
||||
tTmp.txt=type1.txt
|
||||
pageIcons.tTmp1.txt=tEntity1.txt
|
||||
pageIcons.tTmp2.txt=entn1.txt
|
||||
pageIcons.tTmp3.txt=bEntity1.txt
|
||||
if(type1.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -346,6 +347,7 @@ Button bEntity2
|
||||
tTmp.txt=type2.txt
|
||||
pageIcons.tTmp1.txt=tEntity2.txt
|
||||
pageIcons.tTmp2.txt=entn2.txt
|
||||
pageIcons.tTmp3.txt=bEntity2.txt
|
||||
if(type2.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -382,6 +384,7 @@ Button bEntity3
|
||||
tTmp.txt=type3.txt
|
||||
pageIcons.tTmp1.txt=tEntity3.txt
|
||||
pageIcons.tTmp2.txt=entn3.txt
|
||||
pageIcons.tTmp3.txt=bEntity3.txt
|
||||
if(type3.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -418,6 +421,7 @@ Button bEntity4
|
||||
tTmp.txt=type4.txt
|
||||
pageIcons.tTmp1.txt=tEntity4.txt
|
||||
pageIcons.tTmp2.txt=entn4.txt
|
||||
pageIcons.tTmp3.txt=bEntity4.txt
|
||||
if(type4.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -454,6 +458,7 @@ Button bEntity5
|
||||
tTmp.txt=type5.txt
|
||||
pageIcons.tTmp1.txt=tEntity5.txt
|
||||
pageIcons.tTmp2.txt=entn5.txt
|
||||
pageIcons.tTmp3.txt=bEntity5.txt
|
||||
if(type5.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
@@ -490,6 +495,7 @@ Button bEntity6
|
||||
tTmp.txt=type6.txt
|
||||
pageIcons.tTmp1.txt=tEntity6.txt
|
||||
pageIcons.tTmp2.txt=entn6.txt
|
||||
pageIcons.tTmp3.txt=bEntity6.txt
|
||||
if(type6.txt=="shutter")
|
||||
{
|
||||
page popupShutter
|
||||
|
||||
@@ -42,6 +42,16 @@ Text tTmp2
|
||||
Text :
|
||||
Max. Text Size : 80
|
||||
|
||||
Text tTmp3
|
||||
Attributes
|
||||
Scope : global
|
||||
Dragging : 0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
Attributes
|
||||
Scope : local
|
||||
|
||||
@@ -17,6 +17,7 @@ Page popupLight
|
||||
tEntity.txt=pageIcons.tTmp1.txt
|
||||
//get entity id
|
||||
entn.txt=pageIcons.tTmp2.txt
|
||||
tIcon1.txt=pageIcons.tTmp3.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
vis tTmp,0
|
||||
|
||||
@@ -17,6 +17,7 @@ Page popupShutter
|
||||
tEntity.txt=pageIcons.tTmp1.txt
|
||||
//get entity id
|
||||
entn.txt=pageIcons.tTmp2.txt
|
||||
tIcon1.txt=pageIcons.tTmp3.txt
|
||||
vis p0,0
|
||||
vis tSend,0
|
||||
vis tPosHeading,0
|
||||
|
||||
Reference in New Issue
Block a user