This commit is contained in:
joBr99
2022-05-28 07:16:37 +02:00
10 changed files with 89 additions and 75 deletions

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-27 20:18:08.893442508 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-27 20:18:09.913490467 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 05:04:51.228984325 +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/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-27 20:18:09.913490467 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-28 05:04:51.232984331 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 20:18:08.893442508 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-27 20:18:09.913490467 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 05:04:51.228984325 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -33,8 +33,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-27 20:18:09.913490467 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-28 05:04:51.228984325 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -46,8 +46,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-27 20:18:08.893442508 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-27 20:18:09.913490467 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-28 05:04:51.232984331 +0000
@@ -62,12 +62,6 @@ @@ -62,12 +62,6 @@
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -120,3 +120,12 @@ diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
} }
if(tInstruction.txt=="color") if(tInstruction.txt=="color")
{ {
@@ -513,8 +489,6 @@
tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco
- tIcon1.bco=tTime.bco
- tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco

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-27 20:18:08.893442508 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 20:18:09.393466017 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +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-27 20:18:08.893442508 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 20:18:09.397466205 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -468,8 +468,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/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 20:18:09.397466205 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
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-27 20:18:08.893442508 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 20:18:09.397466205 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +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
@@ -501,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 20:18:09.397466205 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000
@@ -209,9 +209,6 @@ @@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0 covx sys0,tTmp.txt,0,0
@@ -513,3 +513,29 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC 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-28 05:04:50.364986253 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000
@@ -471,22 +471,6 @@
vis tMainIconAlt,1
vis tMRIcon,1
vis tMR,1
- vis tForecast1,0
- vis tF1Icon,0
- vis tForecast1Val,0
- //move forecast values to the right
- tForecast4.txt=tForecast3.txt
- tForecast3.txt=tForecast2.txt
- tForecast2.txt=tForecast1.txt
- tForecast4Val.txt=tForecast3Val.txt
- tForecast3Val.txt=tForecast2Val.txt
- tForecast2Val.txt=tForecast1Val.txt
- 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

View File

@@ -1,15 +1,15 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-27 20:18:09.413466958 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 05:04:50.800983931 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-27 20:18:08.893442508 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 05:04:50.360986275 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-27 20:18:09.393466017 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-27 20:18:08.893442508 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-27 20:18:09.397466205 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/cardQR.txt 2022-05-27 20:18:08.893442508 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-27 20:18:09.397466205 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 05:04:50.784984016 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-05-27 20:18:08.893442508 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-27 20:18:09.397466205 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 05:04:50.784984016 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-27 20:18:08.893442508 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-27 20:18:09.397466205 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 05:04:50.784984016 +0000
+@@ -209,9 +209,6 @@ +@@ -209,9 +209,6 @@
+ sys0=sys0-pColorWheel.y + sys0=sys0-pColorWheel.y
+ covx sys0,tTmp.txt,0,0 + covx sys0,tTmp.txt,0,0
@@ -20,3 +20,6 @@
+ //send calc crc + //send calc crc
+ btlen tSend.txt,sys0 + btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC + crcrest 1,0xffff // reset CRC
+--- HMI/n2t-out/screensaver.txt 2022-05-28 05:04:50.364986253 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 05:04:50.784984016 +0000
+@@ -471,22 +471,6 @@

View File

@@ -38,10 +38,6 @@ cardMedia
33 Component(s) 33 Component(s)
350 Line(s) of event code 350 Line(s) of event code
179 Unique line(s) of event code 179 Unique line(s) of event code
screensaver
37 Component(s)
303 Line(s) of event code
242 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
154 Line(s) of event code 154 Line(s) of event code
@@ -50,6 +46,10 @@ popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 244 Line(s) of event code
138 Unique line(s) of event code 138 Unique line(s) of event code
screensaver
37 Component(s)
290 Line(s) of event code
229 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1363 Line(s) of event code 1363 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4695 Line(s) of event code 4682 Line(s) of event code
1244 Unique line(s) of event code 1231 Unique line(s) of event code

View File

@@ -1016,22 +1016,6 @@ Timer tmSerial
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
vis tMR,1 vis tMR,1
vis tForecast1,0
vis tF1Icon,0
vis tForecast1Val,0
//move forecast values to the right
tForecast4.txt=tForecast3.txt
tForecast3.txt=tForecast2.txt
tForecast2.txt=tForecast1.txt
tForecast4Val.txt=tForecast3Val.txt
tForecast3Val.txt=tForecast2Val.txt
tForecast2Val.txt=tForecast1Val.txt
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 //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
@@ -1058,6 +1042,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

View File

@@ -471,22 +471,6 @@ Timer tmSerial
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
vis tMR,1 vis tMR,1
vis tForecast1,0
vis tF1Icon,0
vis tForecast1Val,0
//move forecast values to the right
tForecast4.txt=tForecast3.txt
tForecast3.txt=tForecast2.txt
tForecast2.txt=tForecast1.txt
tForecast4Val.txt=tForecast3Val.txt
tForecast3Val.txt=tForecast2Val.txt
tForecast2Val.txt=tForecast1Val.txt
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 //tMR
spstr strCommand.txt,tMR.txt,"~",16 spstr strCommand.txt,tMR.txt,"~",16
@@ -513,6 +497,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

View File

@@ -28,8 +28,8 @@ popupLight
188 Unique line(s) of event code 188 Unique line(s) of event code
screensaver screensaver
37 Component(s) 37 Component(s)
303 Line(s) of event code 305 Line(s) of event code
242 Unique line(s) of event code 244 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
363 Line(s) of event code 363 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
404 Component(s) 404 Component(s)
4469 Line(s) of event code 4471 Line(s) of event code
1174 Unique line(s) of event code 1176 Unique line(s) of event code

View File

@@ -1058,6 +1058,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

View File

@@ -513,6 +513,8 @@ Timer tmSerial
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tMR.bco=tTime.bco tMR.bco=tTime.bco
tMRIcon.bco=tTime.bco tMRIcon.bco=tTime.bco
tIcon1.bco=tTime.bco
tIcon2.bco=tTime.bco
tForecast1.bco=tTime.bco tForecast1.bco=tTime.bco
tForecast1Val.bco=tTime.bco tForecast1Val.bco=tTime.bco
tF1Icon.bco=tTime.bco tF1Icon.bco=tTime.bco

View File

@@ -277,7 +277,7 @@ class LuiPagesGen(object):
command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~" command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = title if title == "unknown" else entity.attributes.friendly_name heading = title if title != "unknown" else entity.attributes.friendly_name
current_temp = get_attr_safe(entity, "current_temperature", "") current_temp = get_attr_safe(entity, "current_temperature", "")
dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) dest_temp = int(get_attr_safe(entity, "temperature", 0)*10)
status = get_attr_safe(entity, "hvac_action", "") status = get_attr_safe(entity, "hvac_action", "")
@@ -330,7 +330,7 @@ class LuiPagesGen(object):
command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable" command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = title if title == "unknown" else entity.attributes.friendly_name heading = title if title != "unknown" else entity.attributes.friendly_name
icon = get_icon_id('speaker-off') icon = get_icon_id('speaker-off')
title = get_attr_safe(entity, "media_title", "") title = get_attr_safe(entity, "media_title", "")
author = get_attr_safe(entity, "media_artist", "") author = get_attr_safe(entity, "media_artist", "")