Compare commits

...

12 Commits

Author SHA1 Message Date
joBr99
7ee16ef2e6 added some icons #120 (add nextion2text) 2022-04-03 16:02:25 +00:00
Johannes
22b4b7ccf1 added some icons #120 2022-04-03 18:01:57 +02:00
Johannes
7196dbd90e Update README.md 2022-04-03 16:28:18 +02:00
Johannes
9ba4d04ccc change date parser 2022-04-03 14:30:32 +02:00
Johannes
2f072a4e68 Update pages.py 2022-04-03 14:09:56 +02:00
joBr99
06ed5d721e Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-03 11:36:29 +00:00
Johannes
3b2db021f8 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-03 13:36:05 +02:00
Johannes
33c7b8850a added some icons 2022-04-03 13:35:46 +02:00
Johannes
e1bc46f26e Update README.md 2022-04-03 12:55:25 +02:00
Johannes
8f520f1bc9 Update README.md 2022-04-03 12:41:14 +02:00
Johannes
95905e18cb Create README.md 2022-04-03 12:12:23 +02:00
Johannes
8b7d196721 fix doubletap config location 2022-04-03 11:46:25 +02:00
30 changed files with 85 additions and 50 deletions

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-04-03 07:35:47.898571291 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 07:35:48.646571620 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 16:02:25.284722859 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,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-04-03 07:35:47.902571293 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:35:48.646571620 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 16:02:25.288722884 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

View File

@@ -2,6 +2,10 @@ Program.s
0 Component(s)
10 Line(s) of event code
10 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
@@ -10,10 +14,6 @@ pageSerialTest
13 Component(s)
48 Line(s) of event code
43 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code

View File

@@ -56,8 +56,8 @@ Text tIcons
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 28
Text : 29
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -29,8 +29,8 @@ Text tIcons
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Text tTmp1
Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 28
Text : 29
Max. Text Size : 10
Picture p0

Binary file not shown.

Binary file not shown.

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-04-03 07:35:47.898571291 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:35:48.266571453 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-03 16:02:24.464717607 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 16:02:24.872720220 +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-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:35:48.266571453 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-03 16:02:24.468717633 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 16:02:24.872720220 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:35:48.266571453 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-03 16:02:24.464717607 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 16:02:24.872720220 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

View File

@@ -56,8 +56,8 @@ Text tIcons
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 28
Text : 29
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -29,8 +29,8 @@ Text tIcons
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Text tTmp1
Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 28
Text : 29
Max. Text Size : 10
Picture p0

Binary file not shown.

Binary file not shown.

View File

@@ -55,7 +55,14 @@ icons = [
"cast-audio",
"cast",
"radio",
"fireplace"
"fireplace",
"arrow-left-bold",
"arrow-right-bold",
"sofa",
"garage-variant",
"bed",
"soccer",
"silverware-variant"
]

View File

@@ -58,3 +58,10 @@ ID | MD Icon Name | Icon
51 | cast | ![cast](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast.svg)
52 | radio | ![radio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/radio.svg)
53 | fireplace | ![fireplace](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fireplace.svg)
54 | arrow-left-bold | ![arrow-left-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-left-bold.svg)
55 | arrow-right-bold | ![arrow-right-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-right-bold.svg)
56 | sofa | ![sofa](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/sofa.svg)
57 | garage-variant | ![garage-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/garage-variant.svg)
58 | bed | ![bed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/bed.svg)
59 | soccer | ![soccer](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/soccer.svg)
60 | silverware-variant | ![silverware-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/silverware-variant.svg)

View File

@@ -2,6 +2,10 @@ Program.s
0 Component(s)
11 Line(s) of event code
11 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
@@ -10,10 +14,10 @@ pageSerialTest
13 Component(s)
48 Line(s) of event code
43 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code
@@ -26,10 +30,6 @@ popupLight
27 Component(s)
322 Line(s) of event code
173 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardThermo
41 Component(s)
460 Line(s) of event code

View File

@@ -56,8 +56,8 @@ Text tIcons
Horizontal Alignment : left
Vertical Alignment : top
Input Type : character
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 28
Text : 29
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -29,8 +29,8 @@ Text tIcons
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 
Max. Text Size : 170
Text : 
Max. Text Size : 185
Text tTmp1
Attributes

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 28
Text : 29
Max. Text Size : 10
Picture p0

Binary file not shown.

Binary file not shown.

View File

@@ -371,7 +371,7 @@ key | optional | type | default | description
`weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver
`doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times
`alternativeLayout` | True | boolean | `False` | alternative layout with humidity
`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards
`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards; needs to be a navigation item, see subpages (navigate.type_key)
`key` | True | string | `None` | Used by navigate items
Example for the weatherOverride config options:
@@ -409,7 +409,7 @@ Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
#### Subpages
You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden page, the navigation items will change and the arrow is bringing you back to the current page on the top level.
You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden card, the navigation items will change and the arrow is bringing you back to the privious page.
```yaml
- entity: navigate.cardGrid_testKey

12
appdaemon/README.md Normal file
View File

@@ -0,0 +1,12 @@
# Example configurations
This folder contains some example configs
## appdaemon.yaml
Example config for appademon itself
## apps.yaml
"Simple" Example Config with all possible entity types

View File

@@ -140,9 +140,9 @@ class LuiController(object):
self._previous_cards = []
self._current_card = dstCard
# check for duouble tap if configured and render current page
if self._config.get("doubleTapToUnlock") and int(value) >= 2:
if self._config.get("screensaver.doubleTapToUnlock") and int(value) >= 2:
self._pages_gen.render_card(self._current_card)
elif not self._config.get("doubleTapToUnlock"):
elif not self._config.get("screensaver.doubleTapToUnlock"):
self._pages_gen.render_card(self._current_card)
return

View File

@@ -53,6 +53,13 @@ icons = {
'cast': 51,
'radio': 52,
'fireplace': 53,
'arrow-left-bold': 54,
'arrow-right-bold': 55,
'sofa': 56,
'garage-variant': 57,
'bed': 58,
'soccer': 59,
'silverware-variant': 60,
}
def get_icon_id(ma_name):

View File

@@ -1,5 +1,6 @@
import logging
import datetime
import dateutil.parser as dp
from icon_mapping import get_icon_id
from icons import get_icon_id_ha
@@ -78,7 +79,8 @@ class LuiPagesGen(object):
wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
if wOF is None:
up = we.attributes.forecast[i-1]['datetime']
up = datetime.datetime.fromisoformat(up)
#up = datetime.datetime.fromisoformat(up)
up = dp.parse(up)
if babel_spec is not None:
up = babel.dates.format_date(up, "E", locale=self._locale)
else:
@@ -116,7 +118,7 @@ class LuiPagesGen(object):
if entityType == "navigate":
page_search_res = self._config.searchCard(entityId)
if page_search_res is not None:
name = page_search_res.title
name = name if name is not None else page_search_res.title
text = get_translation(self._locale,"PRESS")
icon_id = get_icon_id(icon) if icon is not None else get_icon_id("gesture-tap-button")
return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"

View File

@@ -63,8 +63,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(self, cfg, send_mqtt_msg)
desired_display_firmware_version = 28
version = "v2.5.0"
desired_display_firmware_version = 29
version = "v2.5.5"
model = cfg.get("model")
if model == "us-l":