3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-06 13:45:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #583 from PaeserBastelstube/RPi-correct-calling-of-MqttOutputPlugin

Browse source 
RPi: correct error while calling MqttOutputPlugin
This commit is contained in:
Lukas Pusch 2023-01-13 21:22:20 +01:00 • committed by GitHub
commit b53018f13e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/rpi/hoymiles/__main__.py
View file

@ -185,7 +185,6 @@ def poll_inverter(inverter, dtu_ser, do_init, retries):
if volkszaehler_client: if volkszaehler_client:
volkszaehler_client.store_status(result) volkszaehler_client.store_status(result)
"""
def mqtt_send_status(broker, inverter_ser, data, topic=None): def mqtt_send_status(broker, inverter_ser, data, topic=None):
""" """
Publish StatusResponse object Publish StatusResponse object
@ -229,7 +228,6 @@ def mqtt_send_status(broker, inverter_ser, data, topic=None):
broker.publish(f'{topic}/temperature', data['temperature']) broker.publish(f'{topic}/temperature', data['temperature'])
if data['energy_total'] is not None: if data['energy_total'] is not None:
broker.publish(f'{topic}/total', data['energy_total']/1000) broker.publish(f'{topic}/total', data['energy_total']/1000)
"""
def mqtt_on_command(client, userdata, message): def mqtt_on_command(client, userdata, message):
""" """
@ -326,8 +324,6 @@ if __name__ == '__main__':
for radio_config in ahoy_config.get('nrf', [{}]): for radio_config in ahoy_config.get('nrf', [{}]):
hmradio = hoymiles.HoymilesNRF(**radio_config) hmradio = hoymiles.HoymilesNRF(**radio_config)
mqtt_client = None
event_message_index = {} event_message_index = {}
command_queue = {} command_queue = {}
mqtt_command_topic_subs = [] mqtt_command_topic_subs = []
@ -337,18 +333,11 @@ if __name__ == '__main__':
if global_config.verbose: if global_config.verbose:
hoymiles.HOYMILES_DEBUG_LOGGING=True hoymiles.HOYMILES_DEBUG_LOGGING=True
mqtt_client = None
mqtt_config = ahoy_config.get('mqtt', {}) mqtt_config = ahoy_config.get('mqtt', {})
if mqtt_config and not mqtt_config.get('disabled', False): if mqtt_config and not mqtt_config.get('disabled', False):
mqtt_client = paho.mqtt.client.Client() from .outputs import MqttOutputPlugin
mqtt_client = MqttOutputPlugin(mqtt_config)
if mqtt_config.get('useTLS',False):
mqtt_client.tls_set()
mqtt_client.tls_insecure_set(mqtt_config.get('insecureTLS',False))
mqtt_client.username_pw_set(mqtt_config.get('user', None), mqtt_config.get('password', None))
mqtt_client.connect(mqtt_config.get('host', '127.0.0.1'), mqtt_config.get('port', 1883))
mqtt_client.loop_start()
mqtt_client.on_message = mqtt_on_command
influx_client = None influx_client = None
influx_config = ahoy_config.get('influxdb', {}) influx_config = ahoy_config.get('influxdb', {})