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

fixes #826 #831 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-03-25 14:31:26 +00:00
committed by github-actions[bot]
parent 4483d5e1c7
commit b7d1c17973
8 changed files with 157 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,25 @@
│ - lcd_dev fffb 0002 0000 0020 │ - lcd_dev fffb 0002 0000 0020
│ + //lcd_dev fffb 0002 0000 0020 │ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup │ page pageStartup
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
│ sleepValue+=1
│ if(sleepTimeout<=sleepValue)
│ {
│ sleepValue=0
│ dim=dimValue
│ - tSend.txt="event,sleepReached,cardQR"
│ + 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/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@ │ @@ -179,15 +179,15 @@
@@ -163,6 +182,34 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -442,25 +418,25 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│
│ Text tIcon2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│
│ Text tMainIcon
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -614,15 +590,14 @@ │ @@ -614,15 +590,14 @@
│ if(tTmp.txt!="") │ if(tTmp.txt!="")
│ { │ {

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

@@ -1380,6 +1380,25 @@
│ Scope : local │ Scope : local
│ Period (ms): 50 │ Period (ms): 50
│ Enabled : yes │ Enabled : yes
│ --- HMI/n2t-out/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -751,15 +751,15 @@
│ if(sleepTimeout!=0&&dimValue!=dim)
│ {
│ sleepValue+=1
│ if(sleepTimeout<=sleepValue)
│ {
│ sleepValue=0
│ dim=dimValue
│ - tSend.txt="event,sleepReached,cardQR"
│ + 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/pageStartup.txt │ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@ │ @@ -35,20 +35,14 @@
@@ -1549,6 +1568,34 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ Associated Keyboard : none
│ @@ -442,25 +418,25 @@
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│
│ Text tIcon2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│
│ Text tMainIcon
│ Attributes
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -614,15 +590,14 @@ │ @@ -614,15 +590,14 @@
│ if(tTmp.txt!="") │ if(tTmp.txt!="")
│ { │ {

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

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-02-27 18:57:41.462287194 +0000 +++ /dev/fd/62 2023-03-25 14:31:18.150326646 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt
@@ -800,6 +800,25 @@
+ Scope : local + Scope : local
+ Period (ms): 50 + Period (ms): 50
+ Enabled : yes + Enabled : yes
+I/n2t-out/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+15 +751,15 @@
+ if(sleepTimeout!=0&&dimValue!=dim)
+ {
+ sleepValue+=1
+ if(sleepTimeout<=sleepValue)
+ {
+ sleepValue=0
+ dim=dimValue
+ tSend.txt="event,sleepReached,cardQR"
+ 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/pageStartup.txt +I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@ +0 +35,14 @@
@@ -935,6 +954,34 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + Associated Keyboard : none
+25 +418,25 @@
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 16
+ Max. Text Size : 10
+
+con2
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 16
+ Max. Text Size : 10
+
+ainIcon
+ributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+15 +590,14 @@ +15 +590,14 @@
+ if(tTmp.txt!="") + if(tTmp.txt!="")
+ { + {

2
HMI/n2t-out-visual/cardQR.txt
View File

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

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

@@ -10,10 +10,6 @@ popupThermo
44 Component(s) 44 Component(s)
519 Line(s) of event code 519 Line(s) of event code
274 Unique line(s) of event code 274 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
pageStartup pageStartup
20 Component(s) 20 Component(s)
189 Line(s) of event code 189 Line(s) of event code
@@ -50,6 +46,10 @@ cardThermo
57 Component(s) 57 Component(s)
536 Line(s) of event code 536 Line(s) of event code
317 Unique line(s) of event code 317 Unique line(s) of event code
cardQR
34 Component(s)
406 Line(s) of event code
236 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -66,10 +66,6 @@ cardMedia
59 Component(s) 59 Component(s)
645 Line(s) of event code 645 Line(s) of event code
320 Unique line(s) of event code 320 Unique line(s) of event code
screensaver2
59 Component(s)
354 Line(s) of event code
251 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
523 Line(s) of event code 523 Line(s) of event code
@@ -86,9 +82,13 @@ cardEntities
67 Component(s) 67 Component(s)
1166 Line(s) of event code 1166 Line(s) of event code
530 Unique line(s) of event code 530 Unique line(s) of event code
screensaver2
59 Component(s)
354 Line(s) of event code
251 Unique line(s) of event code
Total Total
21 Page(s) 21 Page(s)
802 Component(s) 802 Component(s)
9246 Line(s) of event code 9246 Line(s) of event code
2340 Unique line(s) of event code 2341 Unique line(s) of event code

4
HMI/n2t-out-visual/screensaver2.txt
View File

@@ -1124,7 +1124,7 @@ Text tIcon1
Vertical Alignment : top Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
@@ -1154,7 +1154,7 @@ Text tIcon2
Vertical Alignment : top Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0

2
HMI/n2t-out/cardQR.txt
View File

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

4
HMI/n2t-out/screensaver2.txt
View File

@@ -446,7 +446,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Text tIcon2 Text tIcon2
Attributes Attributes
@@ -456,7 +456,7 @@ Text tIcon2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Text tMainIcon Text tMainIcon
Attributes Attributes