h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-10 15:26:36 +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:
joBr99
2022-05-07 17:37:12 +02:00
parent a060da5cb4 828ef69a4d
commit 1ea3db108f
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 15:22:54.832432189 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:04:38.097005282 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:22:55.672426594 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 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 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:04:38.097005282 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:22:55.672426594 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

8
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -10,14 +10,14 @@ pageTest
13 Component(s) 13 Component(s)
13 Line(s) of event code 13 Line(s) of event code
13 Unique line(s) of event code 13 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
193 Line(s) of event code 193 Line(s) of event code
109 Unique line(s) of event code 109 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
196 Line(s) of event code 196 Line(s) of event code

6
HMI/US/landscape/n2t-out-visual/popupLight.txt
View File

@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

6
HMI/US/landscape/n2t-out/popupLight.txt
View File

@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

12
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-07 15:22:54.832432189 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:22:55.220427870 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-07 15:22:54.836432145 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,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") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

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

@@ -1,7 +1,7 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:04:37.624968840 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:22:55.272427291 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:22:54.832432189 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:22:55.220427870 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:22:54.836432145 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +0000

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -30,10 +30,6 @@ screensaver
35 Component(s) 35 Component(s)
292 Line(s) of event code 292 Line(s) of event code
235 Unique line(s) of event code 235 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardMedia cardMedia
30 Component(s) 30 Component(s)
331 Line(s) of event code 331 Line(s) of event code
@@ -42,6 +38,10 @@ cardAlarm
35 Component(s) 35 Component(s)
345 Line(s) of event code 345 Line(s) of event code
216 Unique line(s) of event code 216 Unique line(s) of event code
popupLight
27 Component(s)
341 Line(s) of event code
185 Unique line(s) of event code
cardThermo cardThermo
41 Component(s) 41 Component(s)
444 Line(s) of event code 444 Line(s) of event code

6
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

6
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

6
HMI/n2t-out-visual/popupLight.txt
View File

@@ -882,11 +882,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

6
HMI/n2t-out/popupLight.txt
View File

@@ -536,11 +536,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",6 spstr strCommand.txt,t0.txt,"~",7
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",7 spstr strCommand.txt,t4.txt,"~",8
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",8 spstr strCommand.txt,t1.txt,"~",9
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {