3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-08-04 00:48:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development03' into asyncWeb03

Browse source
This commit is contained in:
lumapu 2022-09-08 22:54:09 +02:00
commit bd93622d8f
7 changed files with 109 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tools/esp8266/README.md
View file

@ -76,11 +76,29 @@ Additional, there are 3 pins, which can be set individual:
#### ESP8266 wiring example
This is an example wiring using a Wemos D1 mini.<br>
<img src="https://github.com/grindylow/ahoy/blob/main/doc/AhoyWemos_Steckplatine.jpg" width="300">
<img src="https://github.com/grindylow/ahoy/blob/main/doc/AhoyWemos_Schaltplan.jpg" width="300">
##### Schematic
![Schematic](../../doc/AhoyWemos_Schaltplan.jpg)
##### Symbolic view
![Symbolic](../../doc/AhoyWemos_Steckplatine.jpg)
#### ESP32 wiring example
Example wiring for a 38pin ESP32 module
##### Schematic
![Schematic](../../doc/Wiring_ESP32_Schematic.png)
##### Symbolic view
![Symbolic](../../doc/Wiring_ESP32_Symbol.png)
##### ESP32 GPIO settings
For this wiring, set the 3 individual GPIOs under the /setup URL:
```
CS D1 (GPIO5)
CE D2 (GPIO4)
IRQ D0 (GPIO16 - no IRQ!)
```
## Flash the Firmware on your Ahoy DTU Hardware
Once your Hardware is ready to run, you need to flash the Ahoy DTU Firmware to your Board.

50
tools/rpi/ahoy.yml.example
View file

@ -30,30 +30,32 @@ ahoy:
volkszaehler:
disabled: true
url: 'http://localhost/middleware/'
channels:
- type: 'temperature'
uid: 'ad578a40-1d97-11ed-8e8b-fda01a416575'
- type: 'frequency'
uid: ''
- type: 'ac_power0'
uid: '7ca5ac50-1e41-11ed-927f-610c4cb2c69e'
- type: 'ac_voltage0'
uid: '9a38e2e0-1d94-11ed-b539-25f8607ac030'
- type: 'ac_current0'
uid: 'a9a4daf0-1e41-11ed-b68c-eb73eef3d21d'
- type: 'dc_power0'
uid: '38eb3ca0-1e53-11ed-b830-792e70a592fa'
- type: 'dc_voltage0'
uid: ''
- type: 'dc_current0'
uid: ''
- type: 'dc_power1'
uid: '51c0e9d0-1e53-11ed-b574-8bc81547eb8f'
- type: 'dc_voltage1'
uid: ''
- type: 'dc_current1'
uid: ''
inverters:
- serial: 114172220003
url: 'http://localhost/middleware/'
channels:
- type: 'temperature'
uid: 'ad578a40-1d97-11ed-8e8b-fda01a416575'
- type: 'frequency'
uid: ''
- type: 'ac_power0'
uid: '7ca5ac50-1e41-11ed-927f-610c4cb2c69e'
- type: 'ac_voltage0'
uid: '9a38e2e0-1d94-11ed-b539-25f8607ac030'
- type: 'ac_current0'
uid: 'a9a4daf0-1e41-11ed-b68c-eb73eef3d21d'
- type: 'dc_power0'
uid: '38eb3ca0-1e53-11ed-b830-792e70a592fa'
- type: 'dc_voltage0'
uid: ''
- type: 'dc_current0'
uid: ''
- type: 'dc_power1'
uid: '51c0e9d0-1e53-11ed-b574-8bc81547eb8f'
- type: 'dc_voltage1'
uid: ''
- type: 'dc_current1'
uid: ''
dtu:
serial: 99978563001

2
tools/rpi/hoymiles/__init__.py
View file

@ -647,7 +647,7 @@ class InverterTransaction:
self.time_rx = end_frame.time_rx
tr_len = end_frame.seq - 0x80
except StopIteration:
seq_last = max(frames, key=lambda frame:frame.seq).seq
seq_last = max(frames, key=lambda frame:frame.seq).seq if len(frames) else 0
self.__retransmit_frame(seq_last + 1)
raise BufferError(f'Missing packet: Last packet {len(self.scratch)}')

54
tools/rpi/hoymiles/outputs.py
View file

@ -208,14 +208,10 @@ try:
except ModuleNotFoundError:
pass
class VolkszaehlerOutputPlugin(OutputPluginFactory):
def __init__(self, config, **params):
"""
Initialize VolkszaehlerOutputPlugin
"""
super().__init__(**params)
self.session = requests.Session()
class VzInverterOutput:
def __init__(self, config, session):
self.session = session
self.serial = config.get('serial')
self.baseurl = config.get('url', 'http://localhost/middleware/')
self.channels = dict()
for channel in config.get('channels', []):
@ -224,7 +220,7 @@ class VolkszaehlerOutputPlugin(OutputPluginFactory):
if uid and ctype:
self.channels[ctype] = uid
def store_status(self, response, **params):
def store_status(self, data, session):
"""
Publish StatusResponse object
@ -232,15 +228,9 @@ class VolkszaehlerOutputPlugin(OutputPluginFactory):
:raises ValueError: when response is not instance of StatusResponse
"""
if not isinstance(response, StatusResponse):
raise ValueError('Data needs to be instance of StatusResponse')
if len(self.channels) == 0:
return
data = response.__dict__()
ts = int(round(data['time'].timestamp() * 1000))
# AC Data
@ -277,3 +267,37 @@ class VolkszaehlerOutputPlugin(OutputPluginFactory):
raise ValueError('Could not send request (%s)' % url)
except ConnectionError as e:
raise ValueError('Could not send request (%s)' % e)
class VolkszaehlerOutputPlugin(OutputPluginFactory):
def __init__(self, config, **params):
"""
Initialize VolkszaehlerOutputPlugin
"""
super().__init__(**params)
self.session = requests.Session()
self.inverters = dict()
for inverterconfig in config.get('inverters', []):
serial = inverterconfig.get('serial')
output = VzInverterOutput(inverterconfig, self.session)
self.inverters[serial] = output
def store_status(self, response, **params):
"""
Publish StatusResponse object
:param hoymiles.decoders.StatusResponse response: StatusResponse object
:raises ValueError: when response is not instance of StatusResponse
"""
if not isinstance(response, StatusResponse):
raise ValueError('Data needs to be instance of StatusResponse')
if len(self.inverters) == 0:
return
data = response.__dict__()
serial = data["inverter_ser"]
if serial in self.inverters:
output = self.inverters[serial]
output.store_status(data, self.session)