Skip to content

Commit

Permalink
support script for intermediate meter
Browse files Browse the repository at this point in the history
## V1.93
### script
* support script for intermediate meter (#197)
### config
* add `[SELECT_INTERMEDIATE_METER]`: `USE_SCRIPT_INTERMEDIATE`
* add section `[INTERMEDIATE_SCRIPT]`
  • Loading branch information
reserve85 committed May 12, 2024
1 parent 2c5cdf3 commit 57b8584
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## V1.93
### script
* support script for intermediate meter (https://github.com/reserve85/HoymilesZeroExport/issues/197)
### config
* add `[SELECT_INTERMEDIATE_METER]`: `USE_SCRIPT_INTERMEDIATE`
* add section `[INTERMEDIATE_SCRIPT]`

## V1.92
### script
* support "Mitterbaur AMIS Lesekopf" (https://github.com/reserve85/HoymilesZeroExport/issues/184)
Expand Down
9 changes: 8 additions & 1 deletion 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.93"

import requests
import time
Expand Down Expand Up @@ -1278,6 +1278,13 @@ def CreateIntermediatePowermeter(dtu: DTU) -> Powermeter:
config.get('INTERMEDIATE_VZLOGGER', 'VZL_PORT_INTERMEDIATE'),
config.get('INTERMEDIATE_VZLOGGER', 'VZL_UUID_INTERMEDIATE')
)
elif config.getboolean('SELECT_INTERMEDIATE_METER', 'USE_SCRIPT_INTERMEDIATE'):
return Script(
config.get('INTERMEDIATE_SCRIPT', 'SCRIPT_FILE_INTERMEDIATE'),
config.get('INTERMEDIATE_SCRIPT', 'SCRIPT_IP_INTERMEDIATE'),
config.get('INTERMEDIATE_SCRIPT', 'SCRIPT_USER_INTERMEDIATE'),
config.get('INTERMEDIATE_SCRIPT', 'SCRIPT_PASS_INTERMEDIATE')
)
elif config.getboolean('SELECT_INTERMEDIATE_METER', 'USE_AMIS_READER_INTERMEDIATE'):
return AmisReader(
config.get('INTERMEDIATE_AMIS_READER', 'AMIS_READER_IP_INTERMEDIATE')
Expand Down
10 changes: 9 additions & 1 deletion 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.93

[SELECT_DTU]
# --- define your DTU (only one) ---
Expand Down Expand Up @@ -156,6 +156,7 @@ USE_EMLOG_INTERMEDIATE = false
USE_IOBROKER_INTERMEDIATE = false
USE_HOMEASSISTANT_INTERMEDIATE = false
USE_VZLOGGER_INTERMEDIATE = false
USE_SCRIPT_INTERMEDIATE = false
USE_AMIS_READER_INTERMEDIATE = false

[INTERMEDIATE_TASMOTA]
Expand Down Expand Up @@ -220,6 +221,13 @@ VZL_PORT_INTERMEDIATE = 2081
# you need to specify the uuid of the vzlogger channel for the reading OBIS(16.7.0) (aktuelle Gesamtwirkleistung)
VZL_UUID_INTERMEDIATE = 06ec9562-a490-49fe-92ea-ffe0758d181c

[INTERMEDIATE_SCRIPT]
# --- defines for Shell Script Smartmeter Modul ---
SCRIPT_IP_INTERMEDIATE = xxx.xxx.xxx.xx
SCRIPT_FILE_INTERMEDIATE = GetPowerFromVictronMultiplus.sh
SCRIPT_USER_INTERMEDIATE =
SCRIPT_PASS_INTERMEDIATE =

# --- defines for Mitterbaur AMIS Reader ---
[INTERMEDIATE_AMIS_READER]
AMIS_READER_IP_INTERMEDIATE = xxx.xxx.xxx.xxx
Expand Down

0 comments on commit 57b8584

Please sign in to comment.