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

sync US-P (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-21 06:19:27 +00:00
committed by github-actions[bot]
parent 71b973d121
commit deb19a8b75
8 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 06:10:31.123848546 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 06:19:26.669564883 +0000
@@ -11,6 +11,3 @@ @@ -11,6 +11,3 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- page pageStartup - page pageStartup
Only in HMI/n2t-out: cardQR.txt Only in HMI/n2t-out: cardQR.txt
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 06:10:31.123848546 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 06:19:26.669564883 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 06:10:31.123848546 +0000 +++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 06:19:26.669564883 +0000
@@ -176,17 +176,3 @@ @@ -176,17 +176,3 @@
Touch Press Event Touch Press Event
bauds=115200 bauds=115200

37
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:19:26.257557445 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:19:26.261557518 +0000
@@ -466,7 +466,7 @@ @@ -466,7 +466,7 @@
prints crcval,2 prints crcval,2
tCode.txt="" tCode.txt=""
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
click bPrev,1 click bPrev,1
} }
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:19:26.261557518 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -493,8 +493,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:19:26.261557518 +0000
@@ -198,7 +198,7 @@ @@ -198,7 +198,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -561,8 +561,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Hotspot mSwipePrev Hotspot mSwipePrev
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:19:26.261557518 +0000
@@ -795,7 +795,7 @@ @@ -795,7 +795,7 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -611,8 +611,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Hotspot mSwipePrev Hotspot mSwipePrev
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:19:26.261557518 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -631,18 +631,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -351,7 +351,7 @@
Events
Timer Event
- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
+ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
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 diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 --- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000 +++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:19:26.261557518 +0000
@@ -176,17 +176,3 @@ @@ -176,17 +176,3 @@
Touch Press Event Touch Press Event
bauds=115200 bauds=115200

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 06:10:30.627846144 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 06:19:26.297558167 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-21 06:10:30.103842720 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:19:26.257557445 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:19:26.261557518 +0000
+@@ -466,7 +466,7 @@ +@@ -466,7 +466,7 @@
+ prints crcval,2 + prints crcval,2
+ tCode.txt="" + tCode.txt=""
@@ -67,14 +67,14 @@
+ { + {
+ click bPrev,1 + click bPrev,1
+ } + }
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:10:30.543845735 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:19:26.261557518 +0000
+ Hotspot mSwipeNext + Hotspot mSwipeNext
+ Scope : local + Scope : local
+@@ -1728,6 +1956,128 @@ +@@ -1728,6 +1956,128 @@
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:19:26.261557518 +0000
+@@ -198,7 +198,7 @@ +@@ -198,7 +198,7 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
@@ -141,8 +141,8 @@
+ +
+ Hotspot mSwipePrev + Hotspot mSwipePrev
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:19:26.261557518 +0000
+@@ -795,7 +795,7 @@ +@@ -795,7 +795,7 @@
+ prints tSend.txt,0 + prints tSend.txt,0
+ prints crcval,2 + prints crcval,2
@@ -190,20 +190,11 @@
+ } + }
+ +
+ Hotspot mSwipePrev + Hotspot mSwipePrev
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:19:26.261557518 +0000
+@@ -351,7 +351,7 @@
+
+ Events
+ Timer Event
+- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame
+ 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 +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-05-21 06:10:30.107842748 +0000 +--- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:10:30.539845715 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:19:26.261557518 +0000
+@@ -176,17 +176,3 @@ +@@ -176,17 +176,3 @@
+ Touch Press Event + Touch Press Event
+ bauds=115200 + bauds=115200

24
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -10,10 +10,10 @@ pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
popupNotify pageStartup
17 Component(s) 19 Component(s)
196 Line(s) of event code 150 Line(s) of event code
123 Unique line(s) of event code 113 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
@@ -22,10 +22,10 @@ cardMedia
33 Component(s) 33 Component(s)
346 Line(s) of event code 346 Line(s) of event code
177 Unique line(s) of event code 177 Unique line(s) of event code
pageStartup popupNotify
19 Component(s) 17 Component(s)
150 Line(s) of event code 196 Line(s) of event code
113 Unique line(s) of event code 123 Unique line(s) of event code
screensaver screensaver
35 Component(s) 35 Component(s)
292 Line(s) of event code 292 Line(s) of event code
@@ -38,10 +38,6 @@ cardQR
28 Component(s) 28 Component(s)
247 Line(s) of event code 247 Line(s) of event code
137 Unique line(s) of event code 137 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
435 Line(s) of event code 435 Line(s) of event code
@@ -50,6 +46,10 @@ cardThermo
56 Component(s) 56 Component(s)
542 Line(s) of event code 542 Line(s) of event code
288 Unique line(s) of event code 288 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1174 Line(s) of event code 1174 Line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -647,7 +647,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
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 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 doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)

4
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -537,8 +537,8 @@ Slider hTempSlider
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
Back. Picture ID : 8 Back. Picture ID : 7
Slided Back. Picture ID : 10 Slided Back. Picture ID : 8
Position : 50 Position : 50
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0

4
HMI/US/portrait/n2t-out-visual/popupNotify.txt
View File

@@ -310,7 +310,7 @@ Button b2
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535
@@ -359,7 +359,7 @@ Button b1
Style : flat Style : flat
Font ID : 2 Font ID : 2
Back. Color : 6371 Back. Color : 6371
Back. Picture ID (Pressed) : 9 Back. Picture ID (Pressed) : 8
Back. Color (Pressed) : 1024 Back. Color (Pressed) : 1024
Font Color (Unpressed) : 65535 Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535 Font Color (Pressed) : 65535

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -351,7 +351,7 @@ Timer tmSpinner
Events Events
Timer Event Timer Event
xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame
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 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 doevents // finish drawing before next timer event triggers
if(frame_ptr.val==1820) if(frame_ptr.val==1820)