add design for #194 (add nextion2text)

This commit is contained in:
joBr99
2022-05-19 17:45:31 +00:00
committed by github-actions[bot]
parent 455ebe7f5a
commit a5b5ab90ab
8 changed files with 1632 additions and 32 deletions

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-15 09:04:03.078760396 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-15 09:04:03.594763248 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-19 17:45:30.176249529 +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-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-15 09:04:03.594763248 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-19 17:45:30.176249529 +0000
@@ -466,7 +466,7 @@
prints crcval,2
tCode.txt=""
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1
}
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-15 09:04:03.594763248 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-19 17:45:30.176249529 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -492,9 +492,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-15 09:04:03.594763248 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-19 17:45:30.176249529 +0000
@@ -17,12 +17,9 @@
vis tInstruction,0
vis tTmp,0
@@ -1248,8 +1249,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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-05-15 09:04:03.082760419 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-15 09:04:03.594763248 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-19 17:45:30.176249529 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1277,3 +1278,24 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end
doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820)
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-19 17:45:29.816254306 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-19 17:45:30.176249529 +0000
@@ -176,17 +176,3 @@
Touch Press Event
bauds=115200
-Button b2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- State : unpressed
- Text : qr
- Max. Text Size : 10
-
- Events
- Touch Press Event
- page cardQR
-