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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-31 22:17:45 +00:00
committed by GitHub Actions
parent 5a21d9cba5
commit cb51e4a4e8
5 changed files with 352 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
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 22:04:16.211514160 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:04:16.731513892 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-31 22:17:43.214551653 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 22:17:43.670556711 +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 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:04:16.731513892 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-31 22:17:43.214551653 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 22:17:43.670556711 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -781,8 +781,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-03-31 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:04:16.735513890 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-31 22:17:43.218551697 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-31 22:17:43.670556711 +0000
@@ -643,53 +643,26 @@
spstr strCommand.txt,tInstruction.txt,",",0
if(tInstruction.txt=="entityUpd")
@@ -1111,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 22:04:16.211514160 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:04:16.731513892 +0000
--- HMI/n2t-out/pageIcons.txt 2022-03-31 22:17:43.214551653 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-31 22:17:43.670556711 +0000
@@ -20,7 +20,7 @@
Attributes
Scope : global
@@ -1123,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 22:04:16.215514158 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:04:16.731513892 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-31 22:17:43.214551653 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 22:17:43.670556711 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1143,225 +1143,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc
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 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
// clear weather elements, to keep example content in HMI
+ tMainIcon.txt=""
+ tMainText.txt=""
+ tForecast1.txt=""
+ tF1Icon.txt=""
+ tForecast1Val.txt=""
+ tForecast2.txt=""
+ tF2Icon.txt=""
+ tForecast2Val.txt=""
+ //tSend.txt="event,screensaverOpen"
+ //send calc crc
+ //btlen tSend.txt,sys0
+ //crcrest 1,0xffff // reset CRC
+ //crcputh 55 bb
+ //crcputs sys0,1
+ //crcputs tSend.txt,0
+ //send cmd
+ //printh 55 bb
+ //prints sys0,2
+ //prints tSend.txt,0
+ //prints crcval,2
Variable (string) strCommand
Attributes
@@ -86,7 +106,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text : Tuesday, 08. March 2022
- Max. Text Size : 35
+ Max. Text Size : 30
Text tSend
Attributes
@@ -105,7 +125,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 
Max. Text Size : 10
Text tMainText
@@ -115,7 +135,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 2,3 °C
Max. Text Size : 10
Text tForecast1
@@ -125,7 +145,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : Mi
Max. Text Size : 10
Text tForecast1Val
@@ -135,7 +155,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 9,3 °C
Max. Text Size : 10
Text tF1Icon
@@ -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 : 4
Text tForecast2
Attributes
@@ -155,7 +175,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : Do
Max. Text Size : 10
Text tF2Icon
@@ -165,7 +185,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 
Max. Text Size : 10
Text tForecast2Val
@@ -175,7 +195,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
- Text :
+ Text : 11,9 °C
Max. Text Size : 10
Text t10
@@ -246,49 +266,9 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 5
-
-Text tForecast4Val
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
Max. Text Size : 10
-Text tMainTextAlt
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tMainIconAlt
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tMRIcon
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 10
-
-Text tMR
+Text tForecast4Val
Attributes
Scope : local
Dragging : 0
@@ -393,20 +373,12 @@
}
if(tInstruction.txt=="weatherUpdate")
{
- vis tMainIcon,1
- vis tMainIconAlt,0
- vis tMainText,1
- vis tMainTextAlt,0
- vis tMRIcon,0
- vis tMR,0
//tMainIcon
spstr strCommand.txt,tTmp.txt,"?",1
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1
- tMainIconAlt.txt=tMainIcon.txt
//tMainText
spstr strCommand.txt,tMainText.txt,"?",2
- tMainTextAlt.txt=tMainText.txt
//tForecast1
spstr strCommand.txt,tForecast1.txt,"?",3
//tF1Icon
@@ -439,36 +411,6 @@
substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val
spstr strCommand.txt,tForecast4Val.txt,"?",14
- //alternative layout
- //tMRIcon
- spstr strCommand.txt,tTmp.txt,"?",15
- covx tTmp.txt,sys0,0,0
- substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
- if(tTmp.txt!="")
- {
- //value for tMRIcon, activate alternative layout
- vis tMainIcon,0
- vis tMainText,0
- vis tMainTextAlt,1
- vis tMainIconAlt,1
- vis tMRIcon,1
- vis tMR,1
- vis tForecast1,0
- vis tF1Icon,0
- vis tForecast1Val,0
- //move forecast values to the right
- tForecast4.txt=tForecast3.txt
- tForecast3.txt=tForecast2.txt
- tForecast2.txt=tForecast1.txt
- tForecast4Val.txt=tForecast3Val.txt
- tForecast3Val.txt=tForecast2Val.txt
- tForecast2Val.txt=tForecast1Val.txt
- tF4Icon.txt=tF3Icon.txt
- tF3Icon.txt=tF2Icon.txt
- tF2Icon.txt=tF1Icon.txt
- }
- //tMR
- spstr strCommand.txt,tMR.txt,"?",16
}
if(tInstruction.txt=="pageType")
{