sync media page serial code (add nextion2text)

This commit is contained in:
joBr99
2022-03-31 22:04:17 +00:00
committed by GitHub Actions
parent a5a46c7fdd
commit c4d30e920d
7 changed files with 118 additions and 147 deletions

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 21:51:27.194798213 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 22:04:17.295513600 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
vis arm2,0
vis arm3,0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 21:51:27.194798213 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 22:04:17.295513600 +0000
@@ -1125,33 +1125,6 @@
{
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4
@@ -47,8 +47,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 21:51:27.194798213 +0000
--- HMI/n2t-out/cardGrid.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 22:04:17.299513598 +0000
@@ -12,28 +12,307 @@
Events
@@ -408,8 +408,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
spstr strCommand.txt,type1.txt,",",3
// get internal name
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 21:51:27.194798213 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:04:16.211514160 +0000
+++ HMI/US/landscape/n2t-out/pageIcons.txt 2022-03-31 22:04:17.295513600 +0000
@@ -20,7 +20,7 @@
Attributes
Scope : global
@@ -420,8 +420,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/landscape/n2t-out/pageIcons.txt
Text tIcons
Attributes
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 21:51:27.194798213 +0000
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 22:04:17.295513600 +0000
@@ -30,6 +30,26 @@
vis tSend,0
//page open event

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-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 21:51:26.802801678 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 22:04:16.211514160 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:04:16.731513892 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 21:51:26.806801643 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:04:16.731513892 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -780,94 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-31 21:51:26.806801643 +0000
@@ -506,55 +506,28 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
- //heading
- spstr strCommand.txt,tHeading.txt,"|",1
- // navigation icons
- spstr strCommand.txt,tId.txt,",",2
- spstr tId.txt,tTmp.txt,"|",0
- if(tTmp.txt=="0")
- {
- vis bPrev,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- if(tTmp.txt=="2")
- {
- vis bPrev,1
- bPrev.txt=""
- }
- spstr tId.txt,tTmp.txt,"|",1
- if(tTmp.txt=="0")
- {
- vis bNext,0
- }
- if(tTmp.txt=="1")
- {
- vis bPrev,1
- bNext.txt=""
- }
//entity name
- spstr strCommand.txt,entn.txt,"|",3
+ spstr strCommand.txt,entn.txt,"|",1
+ //heading
+ spstr strCommand.txt,tHeading.txt,"|",2
//icon
- spstr strCommand.txt,tTmp.txt,"|",4
+ spstr strCommand.txt,tTmp.txt,"|",3
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title
- spstr strCommand.txt,tTitle.txt,"|",5
+ spstr strCommand.txt,tTitle.txt,"|",4
//author
- spstr strCommand.txt,tAuthor.txt,"|",6
+ spstr strCommand.txt,tAuthor.txt,"|",5
//volume
- spstr strCommand.txt,tTmp.txt,"|",7
+ spstr strCommand.txt,tTmp.txt,"|",6
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
- spstr strCommand.txt,tTmp.txt,"|",8
+ spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current
- spstr strCommand.txt,tSpeaker.txt,"|",9
+ spstr strCommand.txt,tSpeaker.txt,"|",8
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -563,14 +536,14 @@
tSpeaker.pco=65535
}
//speaker list
- spstr strCommand.txt,vaSpeakerList.txt,"|",10
+ spstr strCommand.txt,vaSpeakerList.txt,"|",9
if(vaSpeakerList.txt=="")
{
vis t6,0
}
vaSpeakerPos.val=0
// on off button
- spstr strCommand.txt,tTmp.txt,"|",11
+ spstr strCommand.txt,tTmp.txt,"|",10
if(tTmp.txt=="disable")
{
vis t5,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 21:51:26.806801643 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:04:16.735513890 +0000
@@ -643,53 +643,26 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
@@ -1196,8 +1111,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 21:51:26.802801678 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:04:16.211514160 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:04:16.731513892 +0000
@@ -20,7 +20,7 @@
Attributes
Scope : global
@@ -1208,8 +1123,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
Text tIcons
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 21:51:26.806801643 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:04:16.731513892 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1229,8 +1144,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-03-31 21:51:26.414805107 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 21:51:26.806801643 +0000
--- HMI/n2t-out/screensaver.txt 2022-03-31 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 22:04:16.731513892 +0000
@@ -30,6 +30,26 @@
vis tSend,0
//page open event
@@ -1303,15 +1218,17 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
Max. Text Size : 10
Text tF1Icon
@@ -145,7 +165,7 @@
@@ -145,8 +165,8 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
- Max. Text Size : 10
+ Text : 
Max. Text Size : 10
+ Max. Text Size : 4
Text tForecast2
Attributes
@@ -155,7 +175,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1353,8 +1270,8 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
Max. Text Size : 10
-Text tMainTextAlt
- Attributes
- Scope : local
@@ -1383,8 +1300,8 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
Max. Text Size : 10
- Max. Text Size : 10
-
-Text tMR
+Text tForecast4Val
Attributes

View File

@@ -928,28 +928,55 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
//entity name
spstr strCommand.txt,entn.txt,"|",1
//heading
spstr strCommand.txt,tHeading.txt,"|",2
spstr strCommand.txt,tHeading.txt,"|",1
// navigation icons
spstr strCommand.txt,tId.txt,",",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
bNext.txt=""
}
//entity name
spstr strCommand.txt,entn.txt,"|",3
//icon
spstr strCommand.txt,tTmp.txt,"|",3
spstr strCommand.txt,tTmp.txt,"|",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title
spstr strCommand.txt,tTitle.txt,"|",4
spstr strCommand.txt,tTitle.txt,"|",5
//author
spstr strCommand.txt,tAuthor.txt,"|",5
spstr strCommand.txt,tAuthor.txt,"|",6
//volume
spstr strCommand.txt,tTmp.txt,"|",6
spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
spstr strCommand.txt,tTmp.txt,"|",7
spstr strCommand.txt,tTmp.txt,"|",8
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current
spstr strCommand.txt,tSpeaker.txt,"|",8
spstr strCommand.txt,tSpeaker.txt,"|",9
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -958,14 +985,14 @@ Timer tmSerial
tSpeaker.pco=65535
}
//speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",9
spstr strCommand.txt,vaSpeakerList.txt,"|",10
if(vaSpeakerList.txt=="")
{
vis t6,0
}
vaSpeakerPos.val=0
// on off button
spstr strCommand.txt,tTmp.txt,"|",10
spstr strCommand.txt,tTmp.txt,"|",11
if(tTmp.txt=="disable")
{
vis t5,0

View File

@@ -14,6 +14,14 @@ popupNotify
17 Component(s)
178 Line(s) of event code
117 Unique line(s) of event code
screensaver
29 Component(s)
182 Line(s) of event code
137 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
169 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
@@ -26,14 +34,6 @@ popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardMedia
30 Component(s)
305 Line(s) of event code
157 Unique line(s) of event code
screensaver
29 Component(s)
182 Line(s) of event code
137 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
@@ -58,5 +58,5 @@ cardThermo
Total
13 Page(s)
375 Component(s)
3949 Line(s) of event code
1061 Unique line(s) of event code
3975 Line(s) of event code
1065 Unique line(s) of event code

View File

@@ -374,7 +374,7 @@ Text tF1Icon
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Max. Text Size : 4
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0

View File

@@ -506,28 +506,55 @@ Timer tmSerial
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
{
//entity name
spstr strCommand.txt,entn.txt,"|",1
//heading
spstr strCommand.txt,tHeading.txt,"|",2
spstr strCommand.txt,tHeading.txt,"|",1
// navigation icons
spstr strCommand.txt,tId.txt,",",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
bNext.txt=""
}
//entity name
spstr strCommand.txt,entn.txt,"|",3
//icon
spstr strCommand.txt,tTmp.txt,"|",3
spstr strCommand.txt,tTmp.txt,"|",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title
spstr strCommand.txt,tTitle.txt,"|",4
spstr strCommand.txt,tTitle.txt,"|",5
//author
spstr strCommand.txt,tAuthor.txt,"|",5
spstr strCommand.txt,tAuthor.txt,"|",6
//volume
spstr strCommand.txt,tTmp.txt,"|",6
spstr strCommand.txt,tTmp.txt,"|",7
covx tTmp.txt,sys0,0,0
hVolume.val=sys0
//icon
spstr strCommand.txt,tTmp.txt,"|",7
spstr strCommand.txt,tTmp.txt,"|",8
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current
spstr strCommand.txt,tSpeaker.txt,"|",8
spstr strCommand.txt,tSpeaker.txt,"|",9
if(tSpeaker.txt!="")
{
tSpeaker.pco=1374
@@ -536,14 +563,14 @@ Timer tmSerial
tSpeaker.pco=65535
}
//speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",9
spstr strCommand.txt,vaSpeakerList.txt,"|",10
if(vaSpeakerList.txt=="")
{
vis t6,0
}
vaSpeakerPos.val=0
// on off button
spstr strCommand.txt,tTmp.txt,"|",10
spstr strCommand.txt,tTmp.txt,"|",11
if(tTmp.txt=="disable")
{
vis t5,0

View File

@@ -166,7 +166,7 @@ Text tF1Icon
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 10
Max. Text Size : 4
Text tForecast2
Attributes