h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-16 01:46:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync media page serial code (add nextion2text)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

123
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-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