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

removed additional delimiter for weather (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-01 15:25:02 +00:00
committed by GitHub Actions
parent f901a57dd1
commit 91e4d5b388
5 changed files with 198 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
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-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 15:25:01.750404700 +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-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.342399464 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-04-01 15:25:01.750404700 +0000
@@ -512,13 +512,13 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -139,8 +139,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-01 15:25:01.342399464 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 15:25:01.750404700 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -1272,8 +1272,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
// end of user code
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/cardGrid.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-04-01 15:25:01.750404700 +0000
@@ -568,13 +568,13 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -1504,8 +1504,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
}
// end of user code
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/cardMedia.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-04-01 15:25:01.750404700 +0000
@@ -503,13 +503,13 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -1563,8 +1563,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/cardThermo.txt 2022-04-01 15:25:01.342399464 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-04-01 15:25:01.750404700 +0000
@@ -640,13 +640,13 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -1847,8 +1847,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
}
// end of user code
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 15:25:01.750404700 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -1913,8 +1913,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-01 15:25:01.750404700 +0000
@@ -438,24 +438,24 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -2003,8 +2003,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/popupNotify.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-01 15:25:01.750404700 +0000
@@ -251,7 +251,7 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -2055,8 +2055,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/popupShutter.txt 2022-04-01 15:25:01.338399413 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-01 15:25:01.750404700 +0000
@@ -324,24 +324,24 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -2110,8 +2110,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
udelete payloadLength-1
bufferPos=0
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-01 14:58:11.568015122 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 14:58:11.972012802 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-01 15:25:01.342399464 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-01 15:25:01.750404700 +0000
@@ -355,7 +355,7 @@
// write command to variable strCommand
ucopy strCommand.txt,4,payloadLength-5,0
@@ -2147,7 +2147,79 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="weatherUpdate")
@@ -475,11 +475,11 @@
@@ -400,48 +400,48 @@
vis tMRIcon,0
vis tMR,0
//tMainIcon
- spstr strCommand.txt,tTmp.txt,"~",1
+ 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
+ spstr strCommand.txt,tMainText.txt,"?",2
tMainTextAlt.txt=tMainText.txt
//tForecast1
- spstr strCommand.txt,tForecast1.txt,"~",3
+ spstr strCommand.txt,tForecast1.txt,"?",3
//tF1Icon
- spstr strCommand.txt,tTmp.txt,"~",4
+ spstr strCommand.txt,tTmp.txt,"?",4
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1
//tForecast1Val
- spstr strCommand.txt,tForecast1Val.txt,"~",5
+ spstr strCommand.txt,tForecast1Val.txt,"?",5
//tForecast2
- spstr strCommand.txt,tForecast2.txt,"~",6
+ spstr strCommand.txt,tForecast2.txt,"?",6
//tF2Icon
- spstr strCommand.txt,tTmp.txt,"~",7
+ spstr strCommand.txt,tTmp.txt,"?",7
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1
//tForecast2Val
- spstr strCommand.txt,tForecast2Val.txt,"~",8
+ spstr strCommand.txt,tForecast2Val.txt,"?",8
//tForecast3
- spstr strCommand.txt,tForecast3.txt,"~",9
+ spstr strCommand.txt,tForecast3.txt,"?",9
//tF3Icon
- spstr strCommand.txt,tTmp.txt,"~",10
+ spstr strCommand.txt,tTmp.txt,"?",10
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1
//tForecast3Val
- spstr strCommand.txt,tForecast3Val.txt,"~",11
+ spstr strCommand.txt,tForecast3Val.txt,"?",11
//tForecast4
- spstr strCommand.txt,tForecast4.txt,"~",12
+ spstr strCommand.txt,tForecast4.txt,"?",12
//tF4Icon
- spstr strCommand.txt,tTmp.txt,"~",13
+ spstr strCommand.txt,tTmp.txt,"?",13
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1
//tForecast4Val
- spstr strCommand.txt,tForecast4Val.txt,"~",14
+ spstr strCommand.txt,tForecast4Val.txt,"?",14
//alternative layout
//tMRIcon
- spstr strCommand.txt,tTmp.txt,"~",15
+ spstr strCommand.txt,tTmp.txt,"?",15
covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1
if(tTmp.txt!="")
@@ -468,18 +468,18 @@
tF2Icon.txt=tF1Icon.txt
}
//tMR
- spstr strCommand.txt,tMR.txt,"~",16
+ spstr strCommand.txt,tMR.txt,"?",16
}
if(tInstruction.txt=="pageType")
{
dim=100
//command format pageType,specialPageName
//write name of speical page to tId