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

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

Browse Source
This commit is contained in:
joBr99
2022-12-21 21:05:45 +01:00
parent c382d23090 66100ed4b7
commit 78b274e1e6
7 changed files with 10 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,25 +15,6 @@
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -168,15 +168,15 @@
│ Send Component ID : disabled
│
│ Button bNext
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ - Send Component ID : disabled
│ + Send Component ID : on press
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│
│ Events
│ Touch Press Event
│ tSend.txt="event,buttonPress2,cardChart,"
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -61,14 +61,24 @@
@@ -1016,23 +997,6 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -2005,15 +2775,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
│ sleepValue+=1
│ if(sleepTimeout<=sleepValue)
│ {
│ sleepValue=0
│ dim=dimValue
│ - tSend.txt="event,sleepReached,cardEntities"
│ + tSend.txt="event,sleepReached,cardAlarm"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -258,18 +258,14 @@

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

@@ -1,25 +1,6 @@
+++ /dev/fd/62 2022-12-21 19:52:24.482417329 +0000
+++ /dev/fd/62 2022-12-21 20:02:53.423928525 +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
+15 +168,15 @@
+ Send Component ID : disabled
+
+bNext
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Send Component ID : on press
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,cardChart,"
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+14 +116,26 @@
@@ -423,23 +404,6 @@
+ covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0
+ }
+,15 +2775,15 @@
+ if(sleepTimeout!=0&&dimValue!=dim)
+ {
+ sleepValue+=1
+ if(sleepTimeout<=sleepValue)
+ {
+ sleepValue=0
+ dim=dimValue
+ tSend.txt="event,sleepReached,cardEntities"
+ tSend.txt="event,sleepReached,cardAlarm"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+18 +258,14 @@

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

@@ -252,7 +252,7 @@ Button bNext
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : on press
Send Component ID : disabled
Opacity : 127
x coordinate : 262
y coordinate : 16

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

@@ -4119,7 +4119,7 @@ Timer tmSleep
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
tSend.txt="event,sleepReached,cardEntities"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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

@@ -30,6 +30,10 @@ pageStartup
19 Component(s)
181 Line(s) of event code
129 Unique line(s) of event code
cardGrid
42 Component(s)
518 Line(s) of event code
294 Unique line(s) of event code
popupShutter
25 Component(s)
398 Line(s) of event code
@@ -42,10 +46,6 @@ cardPower
43 Component(s)
439 Line(s) of event code
299 Unique line(s) of event code
cardGrid
42 Component(s)
518 Line(s) of event code
294 Unique line(s) of event code
cardMedia
57 Component(s)
660 Line(s) of event code
@@ -83,4 +83,4 @@ Total
19 Page(s)
693 Component(s)
8806 Line(s) of event code
2252 Unique line(s) of event code
2253 Unique line(s) of event code

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

@@ -172,7 +172,7 @@ Button bNext
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : on press
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10

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

@@ -2779,7 +2779,7 @@ Timer tmSleep
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
tSend.txt="event,sleepReached,cardEntities"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC