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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
Johannes
2022-05-06 18:04:47 +02:00
parent 2542a1e40f 12114e560a
commit b309881487
8 changed files with 145 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 15:56:23.748980554 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:01:53.422317965 +0000
@@ -11,6 +11,4 @@
// dim value
int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 15:56:23.748980554 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:01:53.422317965 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -20,9 +20,34 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:01:53.422317965 +0000
@@ -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/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 15:56:23.748980554 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:01:53.422317965 +0000
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20
-Text tPosHeading
+Text t1
Attributes
Scope : local
Dragging : 0
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
@@ -40,12 +65,14 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
Picture p0
Attributes
Scope : local
@@ -341,8 +331,6 @@
@@ -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")
{

62
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 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:01:52.978311427 +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-05-06 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.978311427 +0000
@@ -46,7 +46,7 @@
Attributes
Scope : local
@@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:01:52.978311427 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -493,8 +493,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 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:01:52.978311427 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
@@ -542,8 +542,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:01:52.978311427 +0000
@@ -25,19 +25,19 @@
Attributes
Scope : local
@@ -658,8 +658,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
//send cmd
printh 55 bb
diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:01:52.978311427 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -679,8 +679,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
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 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:01:52.978311427 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -700,8 +700,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 15:56:22.708977054 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:01:52.978311427 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -713,9 +713,22 @@ 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 15:56:22.712977067 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:56:23.168978602 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:01:52.594305773 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:01:52.978311427 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -727,6 +740,15 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
Text tEntity
Attributes
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20
-Text tPosHeading
+Text t1
Attributes
Scope : local
Dragging : 0
@@ -119,16 +119,6 @@
Text : Position
Max. Text Size : 15
@@ -753,12 +775,14 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -341,8 +331,6 @@
@@ -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")
{

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 15:56:23.268978938 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 15:56:23.168978602 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:01:52.994311663 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:01:52.978311427 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -46,7 +46,7 @@
+ Attributes
+ Scope : local
@@ -67,8 +67,8 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -91,8 +91,8 @@
+ 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 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/cardGrid.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -71,25 +71,25 @@
+ Attributes
+ Scope : local
@@ -140,8 +140,8 @@
+ Text tHeading
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -25,19 +25,19 @@
+ Attributes
+ Scope : local
@@ -256,8 +256,8 @@
+ //send cmd
+ printh 55 bb
+diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/pageIcons.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -30,7 +30,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none
@@ -276,11 +276,11 @@
+
+ Picture p0
+ Attributes
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:01:52.978311427 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-06 15:56:22.708977054 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/popupLight.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -59,8 +59,8 @@
+ Variable (string) entn
+ Attributes
@@ -292,9 +292,22 @@
+
+ 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 15:56:22.712977067 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 15:56:23.168978602 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:01:52.594305773 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:01:52.978311427 +0000
+@@ -46,8 +46,8 @@
+ Variable (string) entn
+ Attributes
@@ -306,6 +319,15 @@
+
+ Text tEntity
+ Attributes
+@@ -109,7 +109,7 @@
+ Text :
+ Max. Text Size : 20
+
+-Text tPosHeading
++Text t1
+ Attributes
+ Scope : local
+ Dragging : 0
+@@ -119,16 +119,6 @@
+ Text : Position
+ Max. Text Size : 15
@@ -332,12 +354,14 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+@@ -341,8 +331,6 @@
+@@ -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")
+ {