Updated data order

This commit is contained in:
Simon Milvert 2023-03-02 12:20:37 +01:00
parent 7f66e99cfa
commit c78818bc5c
3 changed files with 7 additions and 6 deletions

View File

@ -9,8 +9,8 @@ services:
- INVERTER_HOST=192.168.200.100 - INVERTER_HOST=192.168.200.100
- MQTT_HOST=192.168.1.100 - MQTT_HOST=192.168.1.100
- USE_CREDENTIALS=YES - USE_CREDENTIALS=YES
- USER_NAME=simon - USER_NAME=username
- PASSWORD=bajsa123 - PASSWORD=PASSWORD
- LOGLEVEL=DEBUG - LOGLEVEL=DEBUG
- MQTT_TOPIC=raspberryTopic - MQTT_TOPIC=raspberryTopic
- DATA_MODE=INVERTER # INVERTER or OFFLINE - DATA_MODE=INVERTER # INVERTER or OFFLINE

View File

@ -23,14 +23,14 @@ class ReadRegister:
rn.INPUT_POWER, rn.INPUT_POWER,
rn.ACTIVE_POWER, rn.ACTIVE_POWER,
rn.GRID_CURRENT, rn.GRID_CURRENT,
rn.INTERNAL_TEMPERATURE,
rn.EFFICIENCY,
] ]
reg_to_read_calculated = [ reg_to_read_calculated = [
rn.DAY_ACTIVE_POWER_PEAK, rn.DAY_ACTIVE_POWER_PEAK,
rn.EFFICIENCY,
rn.DAILY_YIELD_ENERGY, rn.DAILY_YIELD_ENERGY,
rn.ACCUMULATED_YIELD_ENERGY, rn.ACCUMULATED_YIELD_ENERGY,
rn.INTERNAL_TEMPERATURE,
] ]
reg_to_read_status = [ reg_to_read_status = [

View File

@ -7,7 +7,6 @@ import paho.mqtt.client
from huawei_solar import AsyncHuaweiSolar from huawei_solar import AsyncHuaweiSolar
from huawei_solar import register_values as rv from huawei_solar import register_values as rv
from src import mqtt
from src.data import InverterData, ReadRegister from src.data import InverterData, ReadRegister
from src.inverter import get_data from src.inverter import get_data
from src.inverter_dummy import get_dummy_data from src.inverter_dummy import get_dummy_data
@ -28,7 +27,9 @@ REQUEST_INTERVAL = 60
async def get_inverter_client() -> AsyncHuaweiSolar: async def get_inverter_client() -> AsyncHuaweiSolar:
inverter_client = await AsyncHuaweiSolar.create(host, port, slave_id) 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 return inverter_client