limit NASA_EHSSENTINEL_COP and NASA_EHSSENTINEL_TOTAL_COP to values between 0 and 20 (#8)
This commit is contained in:
@@ -131,16 +131,23 @@ class MessageProcessor:
|
|||||||
if msgname in ('NASA_EHSSENTINEL_HEAT_OUTPUT', 'NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT'):
|
if msgname in ('NASA_EHSSENTINEL_HEAT_OUTPUT', 'NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT'):
|
||||||
if all(k in self.NASA_VAL_STORE for k in ['NASA_EHSSENTINEL_HEAT_OUTPUT', 'NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT']):
|
if all(k in self.NASA_VAL_STORE for k in ['NASA_EHSSENTINEL_HEAT_OUTPUT', 'NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT']):
|
||||||
if (self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT'] > 0):
|
if (self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT'] > 0):
|
||||||
|
value = round((self.NASA_VAL_STORE['NASA_EHSSENTINEL_HEAT_OUTPUT'] / self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT']/1000.), 3)
|
||||||
|
if (value < 20 and value > 0):
|
||||||
self.protocolMessage(NASAMessage(packet_message=0x9998, packet_message_type=1),
|
self.protocolMessage(NASAMessage(packet_message=0x9998, packet_message_type=1),
|
||||||
"NASA_EHSSENTINEL_COP",
|
"NASA_EHSSENTINEL_COP",
|
||||||
round((self.NASA_VAL_STORE['NASA_EHSSENTINEL_HEAT_OUTPUT'] / self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT']/1000.), 3))
|
value
|
||||||
|
)
|
||||||
|
|
||||||
if msgname in ('NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM', 'LVAR_IN_TOTAL_GENERATED_POWER'):
|
if msgname in ('NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM', 'LVAR_IN_TOTAL_GENERATED_POWER'):
|
||||||
if all(k in self.NASA_VAL_STORE for k in ['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM', 'LVAR_IN_TOTAL_GENERATED_POWER']):
|
if all(k in self.NASA_VAL_STORE for k in ['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM', 'LVAR_IN_TOTAL_GENERATED_POWER']):
|
||||||
if (self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM'] > 0):
|
if (self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM'] > 0):
|
||||||
|
value = round(self.NASA_VAL_STORE['LVAR_IN_TOTAL_GENERATED_POWER'] / self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM'], 3)
|
||||||
|
|
||||||
|
if (value < 20 and value > 0):
|
||||||
self.protocolMessage(NASAMessage(packet_message=0x9997, packet_message_type=1),
|
self.protocolMessage(NASAMessage(packet_message=0x9997, packet_message_type=1),
|
||||||
"NASA_EHSSENTINEL_TOTAL_COP",
|
"NASA_EHSSENTINEL_TOTAL_COP",
|
||||||
round(self.NASA_VAL_STORE['LVAR_IN_TOTAL_GENERATED_POWER'] / self.NASA_VAL_STORE['NASA_OUTDOOR_CONTROL_WATTMETER_ALL_UNIT_ACCUM'], 3))
|
value
|
||||||
|
)
|
||||||
|
|
||||||
def search_nasa_table(self, address):
|
def search_nasa_table(self, address):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -267,6 +267,9 @@ if you want to see how many uniquie Messages have been collected in the Dumpfile
|
|||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
### v0.2.1 - 2025-02-22
|
||||||
|
- limit NASA_EHSSENTINEL_COP and NASA_EHSSENTINEL_TOTAL_COP to values between 0 and 20
|
||||||
|
|
||||||
### v0.2.0 - 2025-02-22
|
### v0.2.0 - 2025-02-22
|
||||||
- improved MQTT Auto Discovery Config Messages
|
- improved MQTT Auto Discovery Config Messages
|
||||||
- NASAPacket and NASAMessage are now bidirectional, can decode and encode Packets
|
- NASAPacket and NASAMessage are now bidirectional, can decode and encode Packets
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ from CustomLogger import logger
|
|||||||
from NASAPacket import NASAPacket, AddressClassEnum, PacketType, DataType
|
from NASAPacket import NASAPacket, AddressClassEnum, PacketType, DataType
|
||||||
from NASAMessage import NASAMessage
|
from NASAMessage import NASAMessage
|
||||||
|
|
||||||
version = "0.2.0 Stable"
|
version = "0.2.1 Stable"
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user