Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
joBr99
2022-12-21 20:49:08 +01:00
18 changed files with 7103 additions and 457 deletions

View File

@@ -32,200 +32,6 @@
│ tCode.bco=6371
│ tCode.pco=40179
│ }
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -1019,18 +1019,14 @@
│ {
│ page popupFan
│ }
│ if(type1.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type1.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Hotspot m1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1054,18 +1050,14 @@
│ {
│ page popupFan
│ }
│ if(type2.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type2.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Hotspot m2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1089,18 +1081,14 @@
│ {
│ page popupFan
│ }
│ if(type3.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type3.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Hotspot m3
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1124,18 +1112,14 @@
│ {
│ page popupFan
│ }
│ if(type4.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type4.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Hotspot mSpecial
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -258,18 +258,14 @@
│ {
│ page popupShutter
│ }
│ if(type1.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type1.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn1.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -303,18 +299,14 @@
│ {
│ page popupShutter
│ }
│ if(type2.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type2.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -348,18 +340,14 @@
│ {
│ page popupShutter
│ }
│ if(type3.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type3.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn3.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -393,18 +381,14 @@
│ {
│ page popupShutter
│ }
│ if(type4.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type4.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn4.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -438,18 +422,14 @@
│ {
│ page popupShutter
│ }
│ if(type5.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type5.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn5.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -483,18 +463,14 @@
│ {
│ page popupShutter
│ }
│ if(type6.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type6.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -173,15 +173,15 @@

View File

@@ -1912,6 +1912,10 @@ Hotspot m0
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Hotspot m1
Attributes
@@ -1952,6 +1956,10 @@ Hotspot m1
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Hotspot m2
Attributes
@@ -1992,6 +2000,10 @@ Hotspot m2
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Hotspot m3
Attributes
@@ -2032,6 +2044,10 @@ Hotspot m3
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Hotspot mSpecial
Attributes
@@ -2876,6 +2892,10 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -516,6 +516,10 @@ Button bEntity1
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -579,6 +583,10 @@ Button bEntity2
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -642,6 +650,10 @@ Button bEntity3
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -705,6 +717,10 @@ Button bEntity4
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -768,6 +784,10 @@ Button bEntity5
{
page popupInSel
}
if(type5.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -831,6 +851,10 @@ Button bEntity6
{
page popupInSel
}
if(type6.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0

View File

@@ -46,6 +46,10 @@ cardQR
32 Component(s)
425 Line(s) of event code
244 Unique line(s) of event code
cardGrid
42 Component(s)
538 Line(s) of event code
300 Unique line(s) of event code
screensaver
45 Component(s)
410 Line(s) of event code
@@ -66,21 +70,17 @@ cardMedia
57 Component(s)
660 Line(s) of event code
325 Unique line(s) of event code
cardGrid
42 Component(s)
514 Line(s) of event code
293 Unique line(s) of event code
cardEntities
65 Component(s)
1185 Line(s) of event code
537 Unique line(s) of event code
cardThermo
55 Component(s)
555 Line(s) of event code
322 Unique line(s) of event code
cardEntities
65 Component(s)
1165 Line(s) of event code
530 Unique line(s) of event code
Total
19 Page(s)
670 Component(s)
8332 Line(s) of event code
2109 Unique line(s) of event code
8376 Line(s) of event code
2116 Unique line(s) of event code

View File

@@ -1023,6 +1023,10 @@ Hotspot m0
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Hotspot m1
Attributes
@@ -1054,6 +1058,10 @@ Hotspot m1
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Hotspot m2
Attributes
@@ -1085,6 +1093,10 @@ Hotspot m2
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Hotspot m3
Attributes
@@ -1116,6 +1128,10 @@ Hotspot m3
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Hotspot mSpecial
Attributes
@@ -1923,6 +1939,10 @@ Timer tmSerial
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -262,6 +262,10 @@ Button bEntity1
{
page popupInSel
}
if(type1.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -303,6 +307,10 @@ Button bEntity2
{
page popupInSel
}
if(type2.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -344,6 +352,10 @@ Button bEntity3
{
page popupInSel
}
if(type3.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -385,6 +397,10 @@ Button bEntity4
{
page popupInSel
}
if(type4.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -426,6 +442,10 @@ Button bEntity5
{
page popupInSel
}
if(type5.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
@@ -467,6 +487,10 @@ Button bEntity6
{
page popupInSel
}
if(type6.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0