diff --git a/CHANGELOG.md b/CHANGELOG.md index 422ef07..6a847f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,5 @@ # Changelog -## V1.92 -### script -* support DDSU666 Smartmeter Module (Modbus) -### config -* add section `DDSU666` -* add `SELECT_POWERMETER`: `USE_DDSU666` - ## V1.91 ### script * support Home Assistant over HTTPS (https://github.com/reserve85/HoymilesZeroExport/issues/178) diff --git a/HoymilesZeroExport.py b/HoymilesZeroExport.py index 63cfa96..4e47f29 100644 --- a/HoymilesZeroExport.py +++ b/HoymilesZeroExport.py @@ -15,7 +15,7 @@ # along with this program. If not, see . __author__ = "Tobias Kraft" -__version__ = "1.92" +__version__ = "1.91" import requests import time @@ -1117,16 +1117,6 @@ def __init__(self, file: str, ip: str, user: str, password: str): def GetPowermeterWatts(self): power = subprocess.check_output([self.file, self.ip, self.user, self.password]) return CastToInt(power) - -class DDSU666(Powermeter): - def __init__(self, device_address: str): - self.file = 'GetPowerFromDDSU666.py' - self.device_address = device_address - - def GetPowermeterWatts(self): - import GetPowerFromDDSU666 - power = GetPowerFromDDSU666.GetPower(int(self.device_address)) - return CastToInt(power) def CreatePowermeter() -> Powermeter: @@ -1197,10 +1187,6 @@ def CreatePowermeter() -> Powermeter: config.get('SCRIPT', 'SCRIPT_USER'), config.get('SCRIPT', 'SCRIPT_PASS') ) - elif config.getboolean('SELECT_POWERMETER', 'USE_DDSU666'): - return DDSU666( - config.get('DDSU666', 'DEVICE_ADDRESS') - ) else: raise Exception("Error: no powermeter defined!") diff --git a/HoymilesZeroExport_Config.ini b/HoymilesZeroExport_Config.ini index cbb7ac0..0cf81a1 100644 --- a/HoymilesZeroExport_Config.ini +++ b/HoymilesZeroExport_Config.ini @@ -19,7 +19,7 @@ # --------------------------------------------------------------------- [VERSION] -VERSION = 1.92 +VERSION = 1.91 [SELECT_DTU] # --- define your DTU (only one) --- @@ -38,7 +38,6 @@ USE_IOBROKER = false USE_HOMEASSISTANT = false USE_VZLOGGER = false USE_SCRIPT = false -USE_DDSU666 = false [AHOY_DTU] # --- defines for AHOY-DTU --- @@ -137,10 +136,6 @@ SCRIPT_FILE = GetPowerFromVictronMultiplus.sh SCRIPT_USER = SCRIPT_PASS = -[DDSU666] -# --- defines for DDSU666 Smartmeter Modul, you need to install pymodbus ("pip install pymodbus") --- -DEVICE_ADDRESS = 1 - [SELECT_INTERMEDIATE_METER] # if you have an intermediate meter ("Zwischenzähler") to measure the outputpower of your inverter you can set it here. It is faster than the DTU current_power value # --- define your intermediate meter - if you don´t have one set the following defines to false to use the value from your DTU---