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

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

Browse Source
This commit is contained in:
joBr99
2022-10-29 21:20:52 +02:00
parent 16f3e9f221 f226a4f250
commit 5ebca44e76
6 changed files with 698 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
HMI/US/landscape/diff-eu-version.txt
View File

@@ -48,3 +48,164 @@
│ b[sys0].pco=defaultFontColor │ b[sys0].pco=defaultFontColor
│ } │ }
│ if(b[sys0].type==53&&defaultBcoColor==0) │ if(b[sys0].type==53&&defaultBcoColor==0)
├── screensaver.txt
│ @@ -64,44 +64,14 @@
│
│ Variable (string) tSend
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 50
│
│ -Variable (int32) xc1
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) yc1
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) xc2
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) yc2
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) ycR
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) xcR
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ Text tTime
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -754,38 +724,21 @@
│ {
│ sleepValue=0
│ dim=dimValue
│ vaTap.val=0
│ }
│ }
│
│ -Timer tm0
│ - Attributes
│ - Scope : local
│ - Period (ms): 50
│ - Enabled : yes
│ -
│ - Events
│ - Timer Event
│ - if(tc0.val!=0)
│ - {
│ - xc2.val=tch0
│ - yc2.val=tch1
│ - }
│ -
│ TouchCap tc0
│ Attributes
│ Scope: local
│ Value: 0
│
│ Events
│ Touch Press Event
│ - xc1.val=tch0
│ - yc1.val=tch1
│ - tm0.en=1
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
│ {
│ if(dim!=0)
│ {
│ tNotifyHead.txt=""
│ tNotifyText.txt=""
│ vis tNotifyHead,0
│ @@ -793,75 +746,14 @@
│ }
│ }
│ dim=dimValueNormal
│ vaTap.val+=1
│ covx vaTap.val,tTmp.txt,0,0
│ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
│ //send calc crc
│ - //btlen tSend.txt,sys0
│ - //crcrest 1,0xffff // reset CRC
│ - //crcputh 55 bb
│ - //crcputs sys0,2
│ - //crcputs tSend.txt,0
│ - //send cmd
│ - //printh 55 bb
│ - //prints sys0,2
│ - //prints tSend.txt,0
│ - //prints crcval,2
│ -
│ - Touch Release Event
│ - tm0.en=0
│ - if(tch0==0)
│ - // When this is zero we can interpret that as the real end of the drag event
│ - {
│ - xcR.val=xc1.val-xc2.val
│ - ycR.val=yc1.val-yc2.val
│ - // new method
│ - // one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
│ - // x difference between -125 and 125 (swipe on y-axis)
│ - if(xcR.val>-125&&xcR.val<125)
│ - {
│ - //tStatusNew.txt="x low, -> y"
│ - // check if below minimum value (change is negative)
│ - if(ycR.val<-80)
│ - {
│ - //tDirNew.txt="down"
│ - tSend.txt="event,buttonPress2,screensaver,swipeDown"
│ - }else if(ycR.val>80)
│ - {
│ - //tDirNew.txt="up"
│ - tSend.txt="event,buttonPress2,screensaver,swipeUp"
│ - }else
│ - {
│ - //tDirNew.txt="invalid"
│ - }
│ - // y difference between -125 and 125 (swipe on x-axis)
│ - }else if(ycR.val>-125&&ycR.val<125)
│ - {
│ - //tStatusNew.txt="y low, -> x"
│ - if(xcR.val<-80)
│ - {
│ - //tDirNew.txt="right"
│ - tSend.txt="event,buttonPress2,screensaver,swipeRight"
│ - }else if(xcR.val>80)
│ - {
│ - //tDirNew.txt="left"
│ - tSend.txt="event,buttonPress2,screensaver,swipeLeft"
│ - }else
│ - {
│ - //tDirNew.txt="invalid"
│ - }
│ - //diagonal swipe invalid
│ - }else
│ - {
│ - //tStatusNew.txt="invalid"
│ - //tDirNew.txt="diagonal"
│ - }
│ - }
│ - //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb

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

@@ -696,7 +696,44 @@
│ } │ }
│ if(b[sys0].type==53&&defaultBcoColor==0) │ if(b[sys0].type==53&&defaultBcoColor==0)
├── screensaver.txt ├── screensaver.txt
│ @@ -71,15 +71,15 @@ │ @@ -64,52 +64,22 @@
│
│ Variable (string) tSend
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 50
│
│ -Variable (int32) xc1
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) yc1
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) xc2
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) yc2
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) ycR
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ -Variable (int32) xcR
│ - Attributes
│ - Scope: local
│ - Value: 0
│ -
│ Text tTime │ Text tTime
│ Attributes │ Attributes
│ Scope : local │ Scope : local
@@ -713,3 +750,118 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ @@ -754,38 +724,21 @@
│ {
│ sleepValue=0
│ dim=dimValue
│ vaTap.val=0
│ }
│ }
│
│ -Timer tm0
│ - Attributes
│ - Scope : local
│ - Period (ms): 50
│ - Enabled : yes
│ -
│ - Events
│ - Timer Event
│ - if(tc0.val!=0)
│ - {
│ - xc2.val=tch0
│ - yc2.val=tch1
│ - }
│ -
│ TouchCap tc0
│ Attributes
│ Scope: local
│ Value: 0
│
│ Events
│ Touch Press Event
│ - xc1.val=tch0
│ - yc1.val=tch1
│ - tm0.en=1
│ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
│ {
│ if(dim!=0)
│ {
│ tNotifyHead.txt=""
│ tNotifyText.txt=""
│ vis tNotifyHead,0
│ @@ -793,75 +746,14 @@
│ }
│ }
│ dim=dimValueNormal
│ vaTap.val+=1
│ covx vaTap.val,tTmp.txt,0,0
│ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
│ //send calc crc
│ - //btlen tSend.txt,sys0
│ - //crcrest 1,0xffff // reset CRC
│ - //crcputh 55 bb
│ - //crcputs sys0,2
│ - //crcputs tSend.txt,0
│ - //send cmd
│ - //printh 55 bb
│ - //prints sys0,2
│ - //prints tSend.txt,0
│ - //prints crcval,2
│ -
│ - Touch Release Event
│ - tm0.en=0
│ - if(tch0==0)
│ - // When this is zero we can interpret that as the real end of the drag event
│ - {
│ - xcR.val=xc1.val-xc2.val
│ - ycR.val=yc1.val-yc2.val
│ - // new method
│ - // one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
│ - // x difference between -125 and 125 (swipe on y-axis)
│ - if(xcR.val>-125&&xcR.val<125)
│ - {
│ - //tStatusNew.txt="x low, -> y"
│ - // check if below minimum value (change is negative)
│ - if(ycR.val<-80)
│ - {
│ - //tDirNew.txt="down"
│ - tSend.txt="event,buttonPress2,screensaver,swipeDown"
│ - }else if(ycR.val>80)
│ - {
│ - //tDirNew.txt="up"
│ - tSend.txt="event,buttonPress2,screensaver,swipeUp"
│ - }else
│ - {
│ - //tDirNew.txt="invalid"
│ - }
│ - // y difference between -125 and 125 (swipe on x-axis)
│ - }else if(ycR.val>-125&&ycR.val<125)
│ - {
│ - //tStatusNew.txt="y low, -> x"
│ - if(xcR.val<-80)
│ - {
│ - //tDirNew.txt="right"
│ - tSend.txt="event,buttonPress2,screensaver,swipeRight"
│ - }else if(xcR.val>80)
│ - {
│ - //tDirNew.txt="left"
│ - tSend.txt="event,buttonPress2,screensaver,swipeLeft"
│ - }else
│ - {
│ - //tDirNew.txt="invalid"
│ - }
│ - //diagonal swipe invalid
│ - }else
│ - {
│ - //tStatusNew.txt="invalid"
│ - //tDirNew.txt="diagonal"
│ - }
│ - }
│ - //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-25 18:20:57.776626176 +0000 +++ /dev/fd/62 2022-10-29 19:12:04.936656714 +0000
+,14 +1329,45 @@ +,14 +1329,45 @@
+ page popupFan + page popupFan
+ if(type4.txt=="input_sel") + if(type4.txt=="input_sel")
@@ -11,6 +11,11 @@
+ if(type5.txt=="button"||type5.txt=="input_sel") + if(type5.txt=="button"||type5.txt=="input_sel")
+ tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt
+ tSend.txt+="mode-preset_modes,"+tTmp.txt + tSend.txt+="mode-preset_modes,"+tTmp.txt
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+pupThermo.txt +pupThermo.txt
+5 +38,15 @@ +5 +38,15 @@
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
@@ -30,7 +35,44 @@
+ } + }
+ if(b[sys0].type==53&&defaultBcoColor==0) + if(b[sys0].type==53&&defaultBcoColor==0)
+reensaver.txt +reensaver.txt
+5 +71,15 @@ +2 +64,22 @@
+
+e (string) tSend
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 50
+
+e (int32) xc1
+ributes
+ Scope: local
+ Value: 0
+
+e (int32) yc1
+ributes
+ Scope: local
+ Value: 0
+
+e (int32) xc2
+ributes
+ Scope: local
+ Value: 0
+
+e (int32) yc2
+ributes
+ Scope: local
+ Value: 0
+
+e (int32) ycR
+ributes
+ Scope: local
+ Value: 0
+
+e (int32) xcR
+ributes
+ Scope: local
+ Value: 0
+
+ime +ime
+ributes +ributes
+ Scope : local + Scope : local
@@ -47,3 +89,113 @@
+ Scope : local + Scope : local
+ Dragging : 0 + Dragging : 0
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+38 +724,21 @@
+ {
+ sleepValue=0
+ dim=dimValue
+ vaTap.val=0
+ }
+ }
+
+m0
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+
+nts
+ Timer Event
+ if(tc0.val!=0)
+ {
+ xc2.val=tch0
+ yc2.val=tch1
+ }
+
+p tc0
+ributes
+ Scope: local
+ Value: 0
+
+nts
+ Touch Press Event
+ xc1.val=tch0
+ yc1.val=tch1
+ tm0.en=1
+ if(tNotifyHead.txt!=""||tNotifyText.txt!="")
+ {
+ if(dim!=0)
+ {
+ tNotifyHead.txt=""
+ tNotifyText.txt=""
+ vis tNotifyHead,0
+75 +746,14 @@
+ }
+ }
+ dim=dimValueNormal
+ vaTap.val+=1
+ covx vaTap.val,tTmp.txt,0,0
+ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
+ //send calc crc
+ //btlen tSend.txt,sys0
+ //crcrest 1,0xffff // reset CRC
+ //crcputh 55 bb
+ //crcputs sys0,2
+ //crcputs tSend.txt,0
+ //send cmd
+ //printh 55 bb
+ //prints sys0,2
+ //prints tSend.txt,0
+ //prints crcval,2
+
+ Touch Release Event
+ tm0.en=0
+ if(tch0==0)
+ // When this is zero we can interpret that as the real end of the drag event
+ {
+ xcR.val=xc1.val-xc2.val
+ ycR.val=yc1.val-yc2.val
+ // new method
+ // one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
+ // x difference between -125 and 125 (swipe on y-axis)
+ if(xcR.val>-125&&xcR.val<125)
+ {
+ //tStatusNew.txt="x low, -> y"
+ // check if below minimum value (change is negative)
+ if(ycR.val<-80)
+ {
+ //tDirNew.txt="down"
+ tSend.txt="event,buttonPress2,screensaver,swipeDown"
+ }else if(ycR.val>80)
+ {
+ //tDirNew.txt="up"
+ tSend.txt="event,buttonPress2,screensaver,swipeUp"
+ }else
+ {
+ //tDirNew.txt="invalid"
+ }
+ // y difference between -125 and 125 (swipe on x-axis)
+ }else if(ycR.val>-125&&ycR.val<125)
+ {
+ //tStatusNew.txt="y low, -> x"
+ if(xcR.val<-80)
+ {
+ //tDirNew.txt="right"
+ tSend.txt="event,buttonPress2,screensaver,swipeRight"
+ }else if(xcR.val>80)
+ {
+ //tDirNew.txt="left"
+ tSend.txt="event,buttonPress2,screensaver,swipeLeft"
+ }else
+ {
+ //tDirNew.txt="invalid"
+ }
+ //diagonal swipe invalid
+ }else
+ {
+ //tStatusNew.txt="invalid"
+ //tDirNew.txt="diagonal"
+ }
+ }
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb

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

@@ -18,6 +18,10 @@ popupLight
27 Component(s) 27 Component(s)
391 Line(s) of event code 391 Line(s) of event code
214 Unique line(s) of event code 214 Unique line(s) of event code
screensaver
45 Component(s)
389 Line(s) of event code
288 Unique line(s) of event code
popupNotify popupNotify
19 Component(s) 19 Component(s)
253 Line(s) of event code 253 Line(s) of event code
@@ -50,10 +54,6 @@ popupFan
27 Component(s) 27 Component(s)
347 Line(s) of event code 347 Line(s) of event code
202 Unique line(s) of event code 202 Unique line(s) of event code
screensaver
38 Component(s)
350 Line(s) of event code
266 Unique line(s) of event code
cardAlarm cardAlarm
40 Component(s) 40 Component(s)
427 Line(s) of event code 427 Line(s) of event code
@@ -73,6 +73,6 @@ cardEntities
Total Total
17 Page(s) 17 Page(s)
569 Component(s) 576 Component(s)
6909 Line(s) of event code 6948 Line(s) of event code
1787 Unique line(s) of event code 1809 Unique line(s) of event code

115
HMI/n2t-out-visual/screensaver.txt
View File

@@ -82,6 +82,42 @@ Variable (string) tSend
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (int32) xc1
Attributes
ID : 39
Scope: local
Value: 0
Variable (int32) yc1
Attributes
ID : 40
Scope: local
Value: 0
Variable (int32) xc2
Attributes
ID : 41
Scope: local
Value: 0
Variable (int32) yc2
Attributes
ID : 42
Scope: local
Value: 0
Variable (int32) ycR
Attributes
ID : 43
Scope: local
Value: 0
Variable (int32) xcR
Attributes
ID : 44
Scope: local
Value: 0
Text tTime Text tTime
Attributes Attributes
ID : 5 ID : 5
@@ -1294,6 +1330,21 @@ Timer tmSleep
} }
} }
Timer tm0
Attributes
ID : 38
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
if(tc0.val!=0)
{
xc2.val=tch0
yc2.val=tch1
}
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 2 ID : 2
@@ -1302,6 +1353,9 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
xc1.val=tch0
yc1.val=tch1
tm0.en=1
if(tNotifyHead.txt!=""||tNotifyText.txt!="") if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{ {
if(dim!=0) if(dim!=0)
@@ -1317,6 +1371,67 @@ TouchCap tc0
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
//send calc crc //send calc crc
//btlen tSend.txt,sys0
//crcrest 1,0xffff // reset CRC
//crcputh 55 bb
//crcputs sys0,2
//crcputs tSend.txt,0
//send cmd
//printh 55 bb
//prints sys0,2
//prints tSend.txt,0
//prints crcval,2
Touch Release Event
tm0.en=0
if(tch0==0)
// When this is zero we can interpret that as the real end of the drag event
{
xcR.val=xc1.val-xc2.val
ycR.val=yc1.val-yc2.val
// new method
// one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
// x difference between -125 and 125 (swipe on y-axis)
if(xcR.val>-125&&xcR.val<125)
{
//tStatusNew.txt="x low, -> y"
// check if below minimum value (change is negative)
if(ycR.val<-80)
{
//tDirNew.txt="down"
tSend.txt="event,buttonPress2,screensaver,swipeDown"
}else if(ycR.val>80)
{
//tDirNew.txt="up"
tSend.txt="event,buttonPress2,screensaver,swipeUp"
}else
{
//tDirNew.txt="invalid"
}
// y difference between -125 and 125 (swipe on x-axis)
}else if(ycR.val>-125&&ycR.val<125)
{
//tStatusNew.txt="y low, -> x"
if(xcR.val<-80)
{
//tDirNew.txt="right"
tSend.txt="event,buttonPress2,screensaver,swipeRight"
}else if(xcR.val>80)
{
//tDirNew.txt="left"
tSend.txt="event,buttonPress2,screensaver,swipeLeft"
}else
{
//tDirNew.txt="invalid"
}
//diagonal swipe invalid
}else
{
//tStatusNew.txt="invalid"
//tDirNew.txt="diagonal"
}
}
//send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb

108
HMI/n2t-out/screensaver.txt
View File

@@ -68,6 +68,36 @@ Variable (string) tSend
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (int32) xc1
Attributes
Scope: local
Value: 0
Variable (int32) yc1
Attributes
Scope: local
Value: 0
Variable (int32) xc2
Attributes
Scope: local
Value: 0
Variable (int32) yc2
Attributes
Scope: local
Value: 0
Variable (int32) ycR
Attributes
Scope: local
Value: 0
Variable (int32) xcR
Attributes
Scope: local
Value: 0
Text tTime Text tTime
Attributes Attributes
Scope : local Scope : local
@@ -728,6 +758,20 @@ Timer tmSleep
} }
} }
Timer tm0
Attributes
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
if(tc0.val!=0)
{
xc2.val=tch0
yc2.val=tch1
}
TouchCap tc0 TouchCap tc0
Attributes Attributes
Scope: local Scope: local
@@ -735,6 +779,9 @@ TouchCap tc0
Events Events
Touch Press Event Touch Press Event
xc1.val=tch0
yc1.val=tch1
tm0.en=1
if(tNotifyHead.txt!=""||tNotifyText.txt!="") if(tNotifyHead.txt!=""||tNotifyText.txt!="")
{ {
if(dim!=0) if(dim!=0)
@@ -750,6 +797,67 @@ TouchCap tc0
covx vaTap.val,tTmp.txt,0,0 covx vaTap.val,tTmp.txt,0,0
tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt
//send calc crc //send calc crc
//btlen tSend.txt,sys0
//crcrest 1,0xffff // reset CRC
//crcputh 55 bb
//crcputs sys0,2
//crcputs tSend.txt,0
//send cmd
//printh 55 bb
//prints sys0,2
//prints tSend.txt,0
//prints crcval,2
Touch Release Event
tm0.en=0
if(tch0==0)
// When this is zero we can interpret that as the real end of the drag event
{
xcR.val=xc1.val-xc2.val
ycR.val=yc1.val-yc2.val
// new method
// one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal
// x difference between -125 and 125 (swipe on y-axis)
if(xcR.val>-125&&xcR.val<125)
{
//tStatusNew.txt="x low, -> y"
// check if below minimum value (change is negative)
if(ycR.val<-80)
{
//tDirNew.txt="down"
tSend.txt="event,buttonPress2,screensaver,swipeDown"
}else if(ycR.val>80)
{
//tDirNew.txt="up"
tSend.txt="event,buttonPress2,screensaver,swipeUp"
}else
{
//tDirNew.txt="invalid"
}
// y difference between -125 and 125 (swipe on x-axis)
}else if(ycR.val>-125&&ycR.val<125)
{
//tStatusNew.txt="y low, -> x"
if(xcR.val<-80)
{
//tDirNew.txt="right"
tSend.txt="event,buttonPress2,screensaver,swipeRight"
}else if(xcR.val>80)
{
//tDirNew.txt="left"
tSend.txt="event,buttonPress2,screensaver,swipeLeft"
}else
{
//tDirNew.txt="invalid"
}
//diagonal swipe invalid
}else
{
//tStatusNew.txt="invalid"
//tDirNew.txt="diagonal"
}
}
//send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
crcputh 55 bb crcputh 55 bb