h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 05:58:39 +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-05-27 20:18:10 +00:00
committed by github-actions[bot]
parent ad2acadf17
commit fe350dd99d
8 changed files with 232 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
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-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 19:42:38.974090580 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-27 20:18:08.893442508 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 20:18:09.393466017 +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-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 19:42:38.978090258 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-27 20:18:08.893442508 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 20:18:09.397466205 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 19:42:38.978090258 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 20:18:09.397466205 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 19:42:38.978090258 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-27 20:18:08.893442508 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 20:18:09.397466205 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -501,8 +501,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 19:42:38.978090258 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 20:18:09.397466205 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
@@ -513,97 +513,3 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.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-05-27 19:42:38.550124672 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-27 19:42:38.978090258 +0000
@@ -62,12 +62,6 @@
Text :
Max. Text Size: 50
-Variable (string) tSend
- Attributes
- Scope : local
- Text :
- Max. Text Size: 50
-
Text tTime
Attributes
Scope : local
@@ -88,6 +82,16 @@
Text : Tuesday, 08. March 2022
Max. Text Size : 35
+Text tSend
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Text :
+ Max. Text Size : 50
+
Text tMainIcon
Attributes
Scope : local
@@ -308,26 +312,6 @@
Text :
Max. Text Size : 35
-Text tIcon1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 5
-
-Text tIcon2
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text : 
- Max. Text Size : 5
-
Picture p0
Attributes
Scope : local
@@ -471,33 +455,9 @@
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
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
}
//tMR
spstr strCommand.txt,tMR.txt,"~",16
- //statusIcon1
- spstr strCommand.txt,tIcon1.txt,"~",17
- spstr strCommand.txt,tTmp.txt,"~",18
- covx tTmp.txt,tIcon1.pco,0,0
- //statusIcon2
- spstr strCommand.txt,tIcon2.txt,"~",19
- spstr strCommand.txt,tTmp.txt,"~",20
- covx tTmp.txt,tIcon2.pco,0,0
}
if(tInstruction.txt=="color")
{