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

try different approach on color for alternative layout (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-08-29 18:54:04 +00:00
committed by github-actions[bot]
parent fe32063be9
commit 1f9a941b16
6 changed files with 143 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
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-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +0000
--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-08-29 16:07:16.141624865 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000
--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -458,8 +458,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +0000
--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -479,8 +479,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/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000
--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000
@@ -13,36 +13,6 @@
Events
Preinitialize Event
@@ -601,3 +601,35 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
- }
- }
-
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000
@@ -510,6 +510,9 @@
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
@@ -606,18 +609,6 @@
covx tTmp.txt,tMR.pco,0,0
spstr strCommand.txt,tTmp.txt,"~",22
covx tTmp.txt,tTimeAdd.pco,0,0
- if(tMRIcon.txt!=""&&p0.w!=320)
- {
- tF4Icon.pco=tF3Icon.pco
- tF3Icon.pco=tF2Icon.pco
- tF2Icon.pco=tF1Icon.pco
- tForecast4Val.pco=tForecast3Val.pco
- tForecast3Val.pco=tForecast2Val.pco
- tForecast2Val.pco=tForecast1Val.pco
- tForecast4.pco=tForecast3.pco
- tForecast3.pco=tForecast2.pco
- tForecast2.pco=tForecast1.pco
- }
}
if(tInstruction.txt=="notify")
{

46
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 16:07:16.689613925 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 16:07:16.677613901 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-08-29 18:53:57.783527357 +0000
+--- HMI/n2t-out/Program.s.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-08-29 18:53:57.743527237 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-08-29 16:07:16.141624865 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 16:07:16.677613901 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-08-29 18:53:57.743527237 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -33,11 +33,11 @@
++ spstr strCommand.txt,tTmp.txt,"~",32
++ covx tTmp.txt,sys0,0,0
++ btOnOff5.val=sys0
+--- HMI/n2t-out/pageStartup.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 16:07:16.677613901 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-08-29 18:53:57.743527237 +0000
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
+--- HMI/n2t-out/pageTest.txt 2022-08-29 16:07:16.137625205 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 16:07:16.677613901 +0000
+--- HMI/n2t-out/pageTest.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-08-29 18:53:57.743527237 +0000
+@@ -13,36 +13,6 @@
+ Events
+ Preinitialize Event
@@ -158,3 +158,31 @@
+- }
+- }
+-
+--- HMI/n2t-out/screensaver.txt 2022-08-29 18:53:57.199525609 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-08-29 18:53:57.743527237 +0000
+@@ -510,6 +510,9 @@
+ tF4Icon.txt=tF3Icon.txt
+ tF3Icon.txt=tF2Icon.txt
+ tF2Icon.txt=tF1Icon.txt
++ tF4Icon.pco=tF3Icon.pco
++ tF3Icon.pco=tF2Icon.pco
++ tF2Icon.pco=tF1Icon.pco
+@@ -606,18 +609,6 @@
+ covx tTmp.txt,tMR.pco,0,0
+ spstr strCommand.txt,tTmp.txt,"~",22
+ covx tTmp.txt,tTimeAdd.pco,0,0
+- if(tMRIcon.txt!=""&&p0.w!=320)
+- {
+- tF4Icon.pco=tF3Icon.pco
+- tF3Icon.pco=tF2Icon.pco
+- tF2Icon.pco=tF1Icon.pco
+- tForecast4Val.pco=tForecast3Val.pco
+- tForecast3Val.pco=tForecast2Val.pco
+- tForecast2Val.pco=tForecast1Val.pco
+- tForecast4.pco=tForecast3.pco
+- tForecast3.pco=tForecast2.pco
+- tForecast2.pco=tForecast1.pco
+- }
+ }
+ if(tInstruction.txt=="notify")
+ {