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

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-06 16:15:47 +00:00
committed by github-actions[bot]
parent d734adefce
commit 7bb069d1e2
10 changed files with 122 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
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-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:15:46.462825367 +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-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:15:46.466825347 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:15:46.462825367 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -475,30 +475,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:09:54.639733284 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Text tTmp2
Attributes
@@ -40,7 +40,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 80
+ Max. Text Size : 50
Picture p0
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:15:46.462825367 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -518,8 +497,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-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:15:46.462825367 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -531,22 +510,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
@@ -535,12 +535,6 @@
vis pColorWheel,1
}
}
- // set t0 Color (Localization)
- spstr strCommand.txt,t0.txt,"~",6
- // set t4 Temperature (Localization)
- spstr strCommand.txt,t4.txt,"~",7
- // set t1 Brightness (Localization)
- spstr strCommand.txt,t0.txt,"~",8
}
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:09:54.295728867 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:09:54.639733284 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:15:46.086827231 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:15:46.462825367 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -558,33 +524,16 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
@@ -109,7 +109,7 @@
@@ -127,7 +127,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 20
-Text tPosHeading
+Text t1
Attributes
Scope : local
Dragging : 0
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
-Text tInfo1
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 40
-
+ Max. Text Size : 25
Picture p0
Attributes
Scope : local
@@ -157,7 +147,7 @@
@@ -157,7 +157,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -593,14 +542,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -341,10 +331,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sys0,0,0
hPosition.val=sys0
- // set tinfo1 text
- spstr strCommand.txt,tInfo1.txt,"~",2
- // set tPosHeading (localization)
- spstr strCommand.txt,tPosHeading.txt,"~",3
}
if(tInstruction.txt=="dimmode")
{