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

syned alarm page to us-l and us-p #242 (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-30 20:14:02 +00:00
committed by github-actions[bot]
parent 3287601e1b
commit dc5896c505
25 changed files with 471 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 19:51:39.518226029 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.522226060 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000
@@ -33,7 +33,6 @@
vis b8,0
vis b9,0
@@ -21,104 +21,9 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
vis tCode,0
vis bPrev,0
vis bNext,0
@@ -80,12 +79,6 @@
Text :
Max. Text Size: 20
-Variable (string) vaAddBtn
- Attributes
- Scope : local
- Text :
- Max. Text Size: 20
-
Text tTmp
Attributes
Scope : local
@@ -333,27 +326,12 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text :
+ Text : 0
Max. Text Size : 10
Events
Touch Press Event
- // event,buttonPress2,entn,arm1,tCode
- tSend.txt="event,buttonPress2,"
- tSend.txt+=entn.txt+","
- tSend.txt+=vaAddBtn.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
- tCode.txt=""
+ tCode.txt=tCode.txt+"0"
Button b10
Attributes
@@ -362,12 +340,12 @@
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
- Text : 0
+ Text : CLR
Max. Text Size : 10
Events
Touch Press Event
- tCode.txt=tCode.txt+"0"
+ tCode.txt=""
Button arm1
Attributes
@@ -489,20 +467,6 @@
prints crcval,2
tCode.txt=""
-Button b11
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : CLR
- Max. Text Size : 10
-
- Events
- Touch Press Event
- tCode.txt=""
-
Hotspot mSwipeNext
Attributes
Scope : local
@@ -704,15 +668,6 @@
{
tmFlash.en=0
}
- // extra button
- spstr strCommand.txt,b9.txt,"~",15
- if(b9.txt!="")
- {
- vis b9,1
- spstr strCommand.txt,tTmp.txt,"~",16
- covx tTmp.txt,b9.pco,0,0
- spstr strCommand.txt,vaAddBtn.txt,"~",17
- }
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 19:51:39.522226060 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
@@ -574,8 +479,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 19:51:39.518226029 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000
@@ -35,7 +35,7 @@
Attributes
Scope : local
@@ -586,8 +491,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 19:51:39.522226060 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -607,8 +512,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
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-05-30 19:51:39.086222656 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 19:51:39.522226060 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000
@@ -474,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1