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

change media page steps (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-13 22:18:52 +00:00
committed by github-actions[bot]
parent 1b3cd5937b
commit d7606455de
9 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
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
--- HMI/n2t-out/Program.s.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-13 22:18:52.344165434 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-13 22:18:52.348165635 +0000
@@ -466,90 +466,6 @@
prints crcval,2
tCode.txt=""
@@ -103,8 +103,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:18:51.560126058 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-13 22:18:52.348165635 +0000
@@ -1074,90 +1074,6 @@
page popupLight
}
@@ -197,8 +197,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-13 22:18:52.348165635 +0000
@@ -522,90 +522,6 @@
page pageTest
}
@@ -291,8 +291,26 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-13 22:18:52.348165635 +0000
@@ -223,7 +223,7 @@
Events
Touch Press Event
- hVolume.val=hVolume.val-1
+ hVolume.val=hVolume.val-5
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -253,7 +253,7 @@
Events
Touch Press Event
- hVolume.val=hVolume.val+1
+ hVolume.val=hVolume.val+5
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -456,90 +456,6 @@
prints tSend.txt,0
prints crcval,2
@@ -385,8 +403,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-13 22:10:34.044970838 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-13 22:18:52.348165635 +0000
@@ -594,90 +594,6 @@
prints tSend.txt,0
prints crcval,2
@@ -479,8 +497,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-13 22:10:34.040970512 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-13 22:18:52.344165434 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

20
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-13 22:10:33.092893183 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:10:33.556931032 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:18:51.944145344 +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-13 22:10:33.092893183 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.556931032 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.944145344 +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-13 22:10:33.092893183 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:10:33.556931032 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:18:51.560126058 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:18:51.944145344 +0000
@@ -62,6 +62,16 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:10:33.556931032 +0000
--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:18:51.944145344 +0000
@@ -247,26 +247,30 @@
prints tSend.txt,0
prints crcval,2
@@ -814,8 +814,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:10:33.556931032 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:18:51.944145344 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-13 22:10:33.572932337 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-13 22:10:33.092893183 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:10:33.556931032 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-13 22:18:51.960146147 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-13 22:18:51.556125857 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-13 22:18:51.944145344 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.092893183 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:10:33.556931032 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.556125857 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-13 22:18:51.944145344 +0000
+@@ -466,7 +466,7 @@
+ prints crcval,2
+ tCode.txt=""
@@ -67,14 +67,14 @@
+ {
+ click bPrev,1
+ }
+--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:10:33.092893183 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:10:33.556931032 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-13 22:18:51.560126058 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-13 22:18:51.944145344 +0000
+ Hotspot mSwipeNext
+ Scope : local
+@@ -1728,6 +1956,128 @@
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
+--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:10:33.092893183 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:10:33.556931032 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-13 22:18:51.556125857 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-13 22:18:51.944145344 +0000
+@@ -247,26 +247,30 @@
+ prints tSend.txt,0
+ prints crcval,2
@@ -393,8 +393,8 @@
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:10:33.092893183 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:10:33.556931032 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-13 22:18:51.556125857 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-13 22:18:51.944145344 +0000
+@@ -351,7 +351,7 @@
+
+ Events

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

@@ -475,7 +475,7 @@ Text t1
Events
Touch Press Event
hVolume.val=hVolume.val-5
hVolume.val=hVolume.val-1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -525,7 +525,7 @@ Text t3
Events
Touch Press Event
hVolume.val=hVolume.val+5
hVolume.val=hVolume.val+1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"

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

@@ -18,10 +18,6 @@ popupShutter
20 Component(s)
193 Line(s) of event code
109 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
177 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
@@ -34,6 +30,10 @@ cardAlarm
38 Component(s)
360 Line(s) of event code
222 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
177 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code

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

@@ -223,7 +223,7 @@ Text t1
Events
Touch Press Event
hVolume.val=hVolume.val-5
hVolume.val=hVolume.val-1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -253,7 +253,7 @@ Text t3
Events
Touch Press Event
hVolume.val=hVolume.val+5
hVolume.val=hVolume.val+1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"

4
HMI/n2t-out-visual/cardMedia.txt
View File

@@ -475,7 +475,7 @@ Text t1
Events
Touch Press Event
hVolume.val=hVolume.val-5
hVolume.val=hVolume.val-1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -525,7 +525,7 @@ Text t3
Events
Touch Press Event
hVolume.val=hVolume.val+5
hVolume.val=hVolume.val+1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"

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

@@ -22,6 +22,10 @@ screensaver
35 Component(s)
292 Line(s) of event code
235 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
177 Unique line(s) of event code
popupShutter
20 Component(s)
193 Line(s) of event code
@@ -30,10 +34,6 @@ popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardMedia
33 Component(s)
346 Line(s) of event code
177 Unique line(s) of event code
cardGrid
42 Component(s)
435 Line(s) of event code

4
HMI/n2t-out/cardMedia.txt
View File

@@ -223,7 +223,7 @@ Text t1
Events
Touch Press Event
hVolume.val=hVolume.val-5
hVolume.val=hVolume.val-1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"
@@ -253,7 +253,7 @@ Text t3
Events
Touch Press Event
hVolume.val=hVolume.val+5
hVolume.val=hVolume.val+1
// event,buttonPress2,internalNameEntity,volumeSlider,50
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider,"