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

This commit is contained in:
joBr99
2022-03-31 10:58:09 +00:00
committed by GitHub Actions
parent 22563d1cb4
commit 7bd3c263cf
22 changed files with 262 additions and 418 deletions

View File

@@ -1,13 +1,7 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-31 10:46:01.799979830 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 10:46:02.260024923 +0000
@@ -6,11 +6,11 @@
int payloadLength=0
int par0=0,par1=0
// sleep timeout in s
- int sleepTimeout=2
+ int sleepTimeout=20
int sleepValue=0
--- HMI/n2t-out/Program.s.txt 2022-03-31 10:58:08.149531933 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 10:58:08.637532153 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
int dimValueNormal=100
@@ -17,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:46:01.799979830 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 10:46:02.264025315 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:58:08.149531933 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 10:58:08.637532153 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -787,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:46:01.799979830 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 10:46:02.260024923 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:58:08.149531933 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 10:58:08.637532153 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -807,32 +801,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 10:46:01.799979830 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 10:46:02.264025315 +0000
@@ -475,25 +475,6 @@
}
}
-Timer tmSleep
- Attributes
- Scope : local
- Period (ms): 1000
- Enabled : yes
-
- Events
- Timer Event
- if(sleepTimeout!=0&&dimValue!=dim)
- {
- sleepValue+=1
- if(sleepTimeout<=sleepValue)
- {
- sleepValue=0
- dim=dimValue
- vaTap.val=0
- }
- }
-
TouchCap tc0
Attributes
Scope: local

View File

@@ -38,14 +38,14 @@ cardGrid
39 Component(s)
397 Line(s) of event code
233 Unique line(s) of event code
screensaver
29 Component(s)
182 Line(s) of event code
137 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
screensaver
28 Component(s)
172 Line(s) of event code
131 Unique line(s) of event code
cardThermo
41 Component(s)
427 Line(s) of event code
@@ -57,6 +57,6 @@ cardEntities
Total
13 Page(s)
374 Component(s)
3822 Line(s) of event code
1033 Unique line(s) of event code
375 Component(s)
3832 Line(s) of event code
1034 Unique line(s) of event code

View File

@@ -917,6 +917,26 @@ Timer tmSerial
}
}
Timer tmSleep
Attributes
ID : 28
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
vaTap.val=0
}
}
TouchCap tc0
Attributes
ID : 2

View File

@@ -475,6 +475,25 @@ Timer tmSerial
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
vaTap.val=0
}
}
TouchCap tc0
Attributes
Scope: local