h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 14:08:37 +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
│ 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/US/landscape/n2t-out/pageStartup.txt
│ @@ -179,15 +179,15 @@
@@ -163,6 +182,34 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ 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 @@
│ if(tTmp.txt!="")
│ {

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

@@ -1380,6 +1380,25 @@
│ Scope : local
│ Period (ms): 50
│ 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/US/portrait/n2t-out/pageStartup.txt
│ @@ -35,20 +35,14 @@
@@ -1549,6 +1568,34 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ 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 @@
│ 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
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt
@@ -800,6 +800,25 @@
+ Scope : local
+ Period (ms): 50
+ 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
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +35,14 @@
@@ -935,6 +954,34 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ 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 @@
+ if(tTmp.txt!="")
+ {