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

fix current dimmode on page change (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-30 18:24:37 +00:00
committed by github-actions[bot]
parent 9a734c9c64
commit ff838ef6cc
43 changed files with 434 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
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-30 17:12:23.655186508 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:12:24.083197314 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-30 18:24:32.989991642 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:24:33.409988695 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,9 +11,9 @@ 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-30 17:12:23.659186609 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:12:24.087197415 +0000
@@ -62,6 +62,16 @@
--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:24:32.993991614 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:24:33.409988695 +0000
@@ -63,6 +63,16 @@
vis bText4,0
vis hSlider4,0
vis nNum4,0
@@ -30,7 +30,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
vis bPrev,0
vis bNext,0
@@ -119,6 +129,18 @@
@@ -120,6 +130,18 @@
Text :
Max. Text Size: 80
@@ -49,23 +49,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -155,6 +177,15 @@
@@ -156,7 +178,7 @@
Associated Keyboard : none
Value : 0
-Number n0
+Number nNum5
+ Attributes
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+ Value : 0
+
Text tHeading
Attributes
Scope : local
@@ -285,6 +316,26 @@
Dragging : 0
@@ -295,6 +317,26 @@
Text :
Max. Text Size : 50
@@ -92,7 +85,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -404,6 +455,34 @@
@@ -414,6 +456,34 @@
prints tSend.txt,0
prints crcval,2
@@ -127,7 +120,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -861,6 +940,106 @@
@@ -871,6 +941,106 @@
prints tSend.txt,0
prints crcval,2
@@ -234,7 +227,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -969,6 +1148,33 @@
@@ -979,6 +1149,33 @@
prints tSend.txt,0
prints crcval,2
@@ -268,7 +261,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1074,6 +1280,28 @@
@@ -1084,6 +1281,28 @@
page popupLight
}
@@ -297,7 +290,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
Attributes
Scope : local
@@ -1849,6 +2077,169 @@
@@ -1859,6 +2078,169 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -467,10 +460,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
@@ -1938,7 +2320,6 @@
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
- n0.val=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 17:12:23.659186609 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:12:24.087197415 +0000
@@ -34,7 +34,7 @@
--- HMI/n2t-out/cardQR.txt 2022-05-30 18:24:32.989991642 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:24:33.409988695 +0000
@@ -35,7 +35,7 @@
Attributes
Scope : local
Text :
@@ -480,8 +481,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-30 17:12:23.655186508 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:12:24.087197415 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:24:32.993991614 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:24:33.409988695 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -501,9 +502,33 @@ 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-05-30 17:12:23.655186508 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:12:24.087197415 +0000
@@ -474,22 +474,6 @@
--- HMI/n2t-out/screensaver.txt 2022-05-30 18:24:32.993991614 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:24:33.409988695 +0000
@@ -68,15 +68,6 @@
Text :
Max. Text Size: 50
-Number n0
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Value : 0
-
Text tTime
Attributes
Scope : local
@@ -409,7 +400,6 @@
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
- n0.val=dimValueNormal
}
if(tInstruction.txt=="time")
{
@@ -484,22 +474,6 @@
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,1