h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 13:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

open select popup on cardGird direct (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-11-30 16:01:16 +00:00
committed by github-actions[bot]
parent 3bc42a9d0f
commit a70494b355
26 changed files with 327 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,7 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── Program.s.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,10 +10,10 @@
│ int sleepValue=0
│ // dim value
@@ -14,7 +15,8 @@
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
├── cardChart.txt
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -175,16 +175,16 @@
│ Send Component ID : disabled
│ State : unpressed
@@ -76,7 +78,8 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
├── cardEntities.txt
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -61,14 +61,24 @@
│ vis tIcon4,0
│ vis tEntity4,0
@@ -673,7 +676,28 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
├── cardMedia.txt
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -609,14 +609,18 @@
│ {
│ page popupLight
│ }
│ if(tTmp.txt=="fan")
│ {
│ page popupFan
│ }
│ + if(tTmp.txt=="input_sel")
│ + {
│ + page popupInSel
│ + }
│
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ --- HMI/n2t-out/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -15,15 +15,14 @@
│ dim=dimValueNormal
│ vis p0,0
@@ -862,7 +886,8 @@
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
├── pageStartup.txt
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -118,15 +118,15 @@
│ Text tMsg3
│ Attributes
@@ -897,7 +922,8 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
├── popupFan.txt
│ --- HMI/n2t-out/popupFan.txt
├── +++ HMI/US/portrait/n2t-out/popupFan.txt
│ @@ -619,14 +619,18 @@
│ {
│ page cardQR
@@ -917,7 +943,8 @@
│ }
│ }
│ }
├── popupInSel.txt
│ --- HMI/n2t-out/popupInSel.txt
├── +++ HMI/US/portrait/n2t-out/popupInSel.txt
│ @@ -893,14 +893,18 @@
│ {
│ page cardQR
@@ -937,7 +964,8 @@
│ }
│ }
│ }
├── popupLight.txt
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -682,14 +682,18 @@
│ {
│ page cardQR
@@ -957,7 +985,8 @@
│ }
│ }
│ }
├── popupNotify.txt
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/portrait/n2t-out/popupNotify.txt
│ @@ -437,14 +437,18 @@
│ {
│ page cardQR
@@ -977,7 +1006,8 @@
│ }
│ }
│ }
├── popupShutter.txt
│ --- HMI/n2t-out/popupShutter.txt
├── +++ HMI/US/portrait/n2t-out/popupShutter.txt
│ @@ -671,14 +671,18 @@
│ {
│ page cardQR
@@ -997,7 +1027,8 @@
│ }
│ }
│ }
├── popupThermo.txt
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/portrait/n2t-out/popupThermo.txt
│ @@ -942,14 +942,18 @@
│ {
│ page cardQR

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

@@ -1,5 +1,8 @@
+++ /dev/fd/62 2022-11-27 12:27:00.567901800 +0000
+rdChart.txt
+++ /dev/fd/62 2022-11-30 16:01:08.850583062 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardChart.txt
++ HMI/US/portrait/n2t-out/cardChart.txt
+16 +175,16 @@
+ Send Component ID : disabled
+ State : unpressed
@@ -61,7 +64,30 @@
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+rdMedia.txt
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+14 +609,18 @@
+ {
+ page popupLight
+ }
+ if(tTmp.txt=="fan")
+ {
+ page popupFan
+ }
+ if(tTmp.txt=="input_sel")
+ {
+ page popupInSel
+ }
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+I/n2t-out/cardMedia.txt
++ HMI/US/portrait/n2t-out/cardMedia.txt
+5 +15,14 @@
+ dim=dimValueNormal
+ vis p0,0
@@ -250,7 +276,10 @@
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+pupFan.txt
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+I/n2t-out/popupFan.txt
++ HMI/US/portrait/n2t-out/popupFan.txt
+14 +619,18 @@
+ {
+ page cardQR
@@ -270,7 +299,8 @@
+ }
+ }
+ }
+pupInSel.txt
+I/n2t-out/popupInSel.txt
++ HMI/US/portrait/n2t-out/popupInSel.txt
+14 +893,18 @@
+ {
+ page cardQR
@@ -290,7 +320,8 @@
+ }
+ }
+ }
+pupLight.txt
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+14 +682,18 @@
+ {
+ page cardQR
@@ -310,7 +341,8 @@
+ }
+ }
+ }
+pupNotify.txt
+I/n2t-out/popupNotify.txt
++ HMI/US/portrait/n2t-out/popupNotify.txt
+14 +437,18 @@
+ {
+ page cardQR
@@ -330,7 +362,8 @@
+ }
+ }
+ }
+pupShutter.txt
+I/n2t-out/popupShutter.txt
++ HMI/US/portrait/n2t-out/popupShutter.txt
+14 +671,18 @@
+ {
+ page cardQR
@@ -350,7 +383,8 @@
+ }
+ }
+ }
+pupThermo.txt
+I/n2t-out/popupThermo.txt
++ HMI/US/portrait/n2t-out/popupThermo.txt
+14 +942,18 @@
+ {
+ page cardQR

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

@@ -25,7 +25,7 @@ Page cardEntities
//remove background & activate reparse mode
vis p0,0
recmod=1
bauds=115200
baud=115200
//debug stuff
vis tTmp,0
vis tSend,0

26
HMI/US/portrait/n2t-out-visual/cardGrid.txt
View File

@@ -24,7 +24,7 @@ Page cardGrid
//remove background & activate reparse mode
vis p0,0
recmod=1
bauds=115200
baud=115200
//debug stuff
vis tTmp,0
vis tSend,0
@@ -512,6 +512,10 @@ Button bEntity1
{
page popupShutter
}
if(type1.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -571,6 +575,10 @@ Button bEntity2
{
page popupShutter
}
if(type2.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -630,6 +638,10 @@ Button bEntity3
{
page popupShutter
}
if(type3.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -689,6 +701,10 @@ Button bEntity4
{
page popupShutter
}
if(type4.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -748,6 +764,10 @@ Button bEntity5
{
page popupShutter
}
if(type5.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -807,6 +827,10 @@ Button bEntity6
{
page popupShutter
}
if(type6.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0

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

@@ -58,14 +58,14 @@ cardAlarm
40 Component(s)
443 Line(s) of event code
263 Unique line(s) of event code
cardGrid
42 Component(s)
518 Line(s) of event code
294 Unique line(s) of event code
screensaver
45 Component(s)
400 Line(s) of event code
296 Unique line(s) of event code
cardGrid
42 Component(s)
494 Line(s) of event code
288 Unique line(s) of event code
cardQR
32 Component(s)
425 Line(s) of event code
@@ -78,5 +78,5 @@ cardEntities
Total
18 Page(s)
615 Component(s)
7759 Line(s) of event code
2012 Unique line(s) of event code
7783 Line(s) of event code
2014 Unique line(s) of event code

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

@@ -21,7 +21,7 @@ Page screensaver
Events
Preinitialize Event
recmod=1
bauds=115200
baud=115200
vis tInstruction,0
vis tTmp,0
vis p0,0

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

@@ -17,7 +17,7 @@ Page cardEntities
//remove background & activate reparse mode
vis p0,0
recmod=1
bauds=115200
baud=115200
//debug stuff
vis tTmp,0
vis tSend,0

26
HMI/US/portrait/n2t-out/cardGrid.txt
View File

@@ -16,7 +16,7 @@ Page cardGrid
//remove background & activate reparse mode
vis p0,0
recmod=1
bauds=115200
baud=115200
//debug stuff
vis tTmp,0
vis tSend,0
@@ -258,6 +258,10 @@ Button bEntity1
{
page popupShutter
}
if(type1.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -295,6 +299,10 @@ Button bEntity2
{
page popupShutter
}
if(type2.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -332,6 +340,10 @@ Button bEntity3
{
page popupShutter
}
if(type3.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -369,6 +381,10 @@ Button bEntity4
{
page popupShutter
}
if(type4.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -406,6 +422,10 @@ Button bEntity5
{
page popupShutter
}
if(type5.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0
@@ -443,6 +463,10 @@ Button bEntity6
{
page popupShutter
}
if(type6.txt=="input_sel")
{
page popupInSel
}
Touch Release Event
tmLP.en=0

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

@@ -13,7 +13,7 @@ Page screensaver
Events
Preinitialize Event
recmod=1
bauds=115200
baud=115200
vis tInstruction,0
vis tTmp,0
vis p0,0