Skip to content

Commit

Permalink
Revert "support DDSU666 Smartmeter"
Browse files Browse the repository at this point in the history
This reverts commit d949d93.
  • Loading branch information
reserve85 committed May 2, 2024
1 parent 5849243 commit e4aa15b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 28 deletions.
7 changes: 0 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
16 changes: 1 addition & 15 deletions HoymilesZeroExport.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

__author__ = "Tobias Kraft"
__version__ = "1.92"
__version__ = "1.91"

import requests
import time
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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!")

Expand Down
7 changes: 1 addition & 6 deletions HoymilesZeroExport_Config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# ---------------------------------------------------------------------

[VERSION]
VERSION = 1.92
VERSION = 1.91

[SELECT_DTU]
# --- define your DTU (only one) ---
Expand All @@ -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 ---
Expand Down Expand Up @@ -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---
Expand Down

0 comments on commit e4aa15b

Please sign in to comment.