From c78818bc5c07f1d5f3ce8e3c58f622a3fcf8b7f1 Mon Sep 17 00:00:00 2001 From: Simon Milvert Date: Thu, 2 Mar 2023 12:20:37 +0100 Subject: [PATCH] Updated data order --- docker-compose.yml.example | 4 ++-- src/data.py | 4 ++-- src/main.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml.example b/docker-compose.yml.example index fb5033b..788b50e 100644 --- a/docker-compose.yml.example +++ b/docker-compose.yml.example @@ -9,8 +9,8 @@ services: - INVERTER_HOST=192.168.200.100 - MQTT_HOST=192.168.1.100 - USE_CREDENTIALS=YES - - USER_NAME=simon - - PASSWORD=bajsa123 + - USER_NAME=username + - PASSWORD=PASSWORD - LOGLEVEL=DEBUG - MQTT_TOPIC=raspberryTopic - DATA_MODE=INVERTER # INVERTER or OFFLINE diff --git a/src/data.py b/src/data.py index 033ad4e..cc8f31e 100644 --- a/src/data.py +++ b/src/data.py @@ -23,14 +23,14 @@ class ReadRegister: rn.INPUT_POWER, rn.ACTIVE_POWER, rn.GRID_CURRENT, + rn.INTERNAL_TEMPERATURE, + rn.EFFICIENCY, ] reg_to_read_calculated = [ rn.DAY_ACTIVE_POWER_PEAK, - rn.EFFICIENCY, rn.DAILY_YIELD_ENERGY, rn.ACCUMULATED_YIELD_ENERGY, - rn.INTERNAL_TEMPERATURE, ] reg_to_read_status = [ diff --git a/src/main.py b/src/main.py index 8751f8b..98ead8c 100644 --- a/src/main.py +++ b/src/main.py @@ -7,7 +7,6 @@ import paho.mqtt.client from huawei_solar import AsyncHuaweiSolar from huawei_solar import register_values as rv -from src import mqtt from src.data import InverterData, ReadRegister from src.inverter import get_data from src.inverter_dummy import get_dummy_data @@ -28,7 +27,9 @@ REQUEST_INTERVAL = 60 async def get_inverter_client() -> AsyncHuaweiSolar: inverter_client = await AsyncHuaweiSolar.create(host, port, slave_id) - LOGGER.info("-- INVERTER -- Connected to Inverter") + LOGGER.info( + f"-- INVERTER -- Connected to Inverter on ip: {host}, port {port}" + ) return inverter_client