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

remove test from bprev (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-29 07:50:33 +00:00
committed by GitHub Actions
parent f52918364d
commit 9683af77cd
5 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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-03-29 07:47:31.945583643 +0000 --- HMI/n2t-out/Program.s.txt 2022-03-29 07:50:32.340739774 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:47:32.365587735 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:50:32.748740333 +0000
@@ -10,6 +10,6 @@ @@ -10,6 +10,6 @@
int sleepValue=0 int sleepValue=0
// dim value // dim value
@@ -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/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-03-29 07:47:31.945583643 +0000 --- HMI/n2t-out/cardEntities.txt 2022-03-29 07:50:32.340739774 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:47:32.365587735 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:50:32.752740338 +0000
@@ -123,6 +123,34 @@ @@ -123,6 +123,34 @@
Text : Text :
Max. Text Size: 70 Max. Text Size: 70
@@ -157,23 +157,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -643,14 +737,7 @@ @@ -786,6 +880,214 @@
Events
Touch Press Event
- tSend.txt="event,buttonPress2,cardEntities,"
- if(bPrev.isbr==1)
- {
- tSend.txt+="bBack"
- }else
- {
- tSend.txt+="bPrev"
- }
+ tSend.txt="event,buttonPress2,cardEntities,bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -793,6 +880,214 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -388,7 +372,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
ID : 23 ID : 23
@@ -905,6 +1200,62 @@ @@ -898,6 +1200,62 @@
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
@@ -451,7 +435,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial Hotspot mSpecial
Attributes Attributes
ID : 35 ID : 35
@@ -1015,6 +1366,52 @@ @@ -1008,6 +1366,52 @@
page popupLight page popupLight
} }
@@ -504,7 +488,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 30 ID : 30
@@ -1535,6 +1932,238 @@ @@ -1528,6 +1932,238 @@
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0 hSlider4.maxval=sys0
} }
@@ -744,8 +728,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/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-29 07:47:31.945583643 +0000 --- HMI/n2t-out/cardMedia.txt 2022-03-29 07:50:32.340739774 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:47:32.365587735 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:50:32.752740338 +0000
@@ -30,21 +30,21 @@ @@ -30,21 +30,21 @@
Variable (string) entn Variable (string) entn
@@ -873,8 +857,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Only in HMI/n2t-out: nspanel_Stats.txt Only in HMI/n2t-out: nspanel_Stats.txt
Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt
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-03-29 07:47:31.945583643 +0000 --- HMI/n2t-out/pageStartup.txt 2022-03-29 07:50:32.340739774 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:47:32.365587735 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:50:32.752740338 +0000
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -905,8 +889,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-29 07:47:31.945583643 +0000 --- HMI/n2t-out/popupLight.txt 2022-03-29 07:50:32.340739774 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:47:32.365587735 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:50:32.748740333 +0000
@@ -252,8 +252,6 @@ @@ -252,8 +252,6 @@
Events Events

9
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -1235,14 +1235,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities," tSend.txt="event,buttonPress2,cardEntities,bPrev"
if(bPrev.isbr==1)
{
tSend.txt+="bBack"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -52,11 +52,11 @@ screensaver
133 Unique line(s) of event code 133 Unique line(s) of event code
cardEntities cardEntities
58 Component(s) 58 Component(s)
849 Line(s) of event code 842 Line(s) of event code
364 Unique line(s) of event code 360 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
349 Component(s) 349 Component(s)
3282 Line(s) of event code 3275 Line(s) of event code
885 Unique line(s) of event code 882 Unique line(s) of event code

9
HMI/n2t-out/cardEntities.txt
View File

@@ -643,14 +643,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardEntities," tSend.txt="event,buttonPress2,cardEntities,bPrev"
if(bPrev.isbr==1)
{
tSend.txt+="bBack"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

8
HMI/n2t-out/nspanel_Stats.txt
View File

@@ -52,11 +52,11 @@ screensaver
133 Unique line(s) of event code 133 Unique line(s) of event code
cardEntities cardEntities
58 Component(s) 58 Component(s)
849 Line(s) of event code 842 Line(s) of event code
364 Unique line(s) of event code 360 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
349 Component(s) 349 Component(s)
3282 Line(s) of event code 3275 Line(s) of event code
885 Unique line(s) of event code 882 Unique line(s) of event code