h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-20 22:47:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

some final cleanup of power page

Browse Source
This commit is contained in:
joBr99
2023-01-14 14:46:46 +01:00
parent 0b10ce0a6d
commit ebe1d82924
5 changed files with 80 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
HMI/README.md
View File

@@ -1868,12 +1868,14 @@ Example: `entityUpd~Guest Wifi~button~navigate.prev~<~65535~~~button~navigate.ne
</table>
### cardPower (in development)
### cardPower
```entityUpd~LightTest~button~navigate.prev~<~65535~~~button~navigate.next~>~65535~~~17299~C~1~100 W~17299~D~0~100 W~17299~E~3~3499.5 kWh~17299~F~-1~3499.5 kWh~17299~G~-2~3499.5 kWh~17299~H~-3~3499.5 kWh~17299~G~1~3499.5 kWh~17299~H~1~100 W```
<table>
<thead>
<tr>
<th>Parameter&nbsp;&nbsp;&nbsp;Number</th>
<th>Parameter Number</th>
<th>Category</th>
<th>Location</th>
<th>Type</th>
@@ -1965,153 +1967,178 @@ Example: `entityUpd~Guest Wifi~button~navigate.prev~<~65535~~~button~navigate.ne
</tr>
<tr>
<td>14</td>
<td rowspan="27">cardPower specific</td>
<td rowspan="3">Home Icon Middle</td>
<td></td>
<td rowspan="32">cardPower specific</td>
<td rowspan="4">Home Icon / Value below Home Icon</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>15</td>
<td></td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>16</td>
<td></td>
<td>speed</td>
<td>ignored</td>
</tr>
<tr>
<td>17</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>17</td>
<td>18</td>
<td rowspan="4">Value above Home Icon</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td>ignored</td>
</tr>
<tr>
<td>19</td>
<td>icon</td>
<td>ignored</td>
</tr>
<tr>
<td>20</td>
<td>speed</td>
<td>ignored</td>
</tr>
<tr>
<td>21</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>22</td>
<td rowspan="4">1st Item Upper Left</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>18</td>
<td>23</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>19</td>
<td>24</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>20</td>
<td>25</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>21</td>
<td>26</td>
<td rowspan="4">2nd Item Middle Left</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>22</td>
<td>27</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>23</td>
<td>28</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>24</td>
<td>29</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>25</td>
<td>30</td>
<td rowspan="4">3rd Item Bottom Left</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>26</td>
<td>31</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>27</td>
<td>32</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>28</td>
<td>33</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>29</td>
<td>34</td>
<td rowspan="4">4th Item Upper Right</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>30</td>
<td>35</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>31</td>
<td>36</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>32</td>
<td>37</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>33</td>
<td>38</td>
<td rowspan="4">5thItem Middle Right</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>34</td>
<td>39</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>35</td>
<td>40</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>36</td>
<td>41</td>
<td>text</td>
<td></td>
</tr>
<tr>
<td>37</td>
<td>42</td>
<td rowspan="4">6th Item Bottom Right</td>
<td rowspan="4">Power Entity Definition</td>
<td>iconColor</td>
<td></td>
</tr>
<tr>
<td>38</td>
<td>43</td>
<td>icon</td>
<td></td>
</tr>
<tr>
<td>39</td>
<td>44</td>
<td>speed</td>
<td>numbers (-2,-1,0,1,2)</td>
</tr>
<tr>
<td>40</td>
<td>45</td>
<td>text</td>
<td></td>
</tr>

14
HMI/code_gen/pages/cardPower.py
View File

@@ -10,11 +10,21 @@ head = sharedhead + """
covx tTmp.txt,t1.pco,0,0
// icon home
spstr strCommand.txt,t1.txt,"~",15
// speed 16 ignored
// text home
spstr strCommand.txt,tHome.txt,"~",16
spstr strCommand.txt,tHome.txt,"~",17
spstr tHome.txt,tHome2.txt," ",1
spstr tHome.txt,tHome.txt," ",0
// icon color 18 ignored
// icon 19 ignored
// speed 20 ignored
// text home
spstr strCommand.txt,tHomeO.txt,"~",21
spstr tHomeO.txt,tHomeO2.txt," ",1
spstr tHomeO.txt,tHomeO.txt," ",0
"""
print(head)
start = 17
start = 22
for i in range(0,6):
idxstart = start + (i)*4
item = f"""

BIN
HMI/nspanel.HMI
View File

Binary file not shown.

BIN
HMI/nspanel.tft
View File

Binary file not shown.

13
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -630,19 +630,16 @@ class LuiPagesGen(object):
def generate_power_page(self, navigation, heading, items):
command = f"entityUpd~{heading}~{navigation}"
for idx, item in enumerate(items):
for item in items:
entity = apis.ha_api.get_entity(item.entityId)
icon_color = self.get_entity_color(entity, overwrite=item.colorOverride)
device_class = entity.attributes.get("device_class", "")
icon = get_icon_ha(item.entityId, overwrite=item.iconOverride)
speed = 0
if float(entity.state) > 0:
speed = item.entity_input_config.get("speed", 1)
apis.ha_api.log(f"{item.data}")
if idx == 0:
command += f"~{icon_color}~{icon}~{entity.state}"
else:
command += f"~{icon_color}~{icon}~{speed}~{entity.state}"
speed = str(item.entity_input_config.get("speed", 1))
speed = apis.ha_api.render_template(speed)
unit = get_attr_safe(entity, "unit_of_measurement", "")
command += f"~{icon_color}~{icon}~{speed}~{entity.state} {unit}"
self._send_mqtt_msg(command)
def render_card(self, card, send_page_type=True):