reading out registers corrected
This commit is contained in:
Nils Reiners
123
pv_inverter.py
123
pv_inverter.py
@@ -1,68 +1,117 @@
|
||||
import time
|
||||
import struct
|
||||
import pandas as pd
|
||||
import matplotlib.pyplot as plt
|
||||
from collections import deque
|
||||
from typing import Dict, Any, List, Tuple, Optional
|
||||
from pymodbus.client import ModbusTcpClient
|
||||
|
||||
EXCEL_PATH = "modbus_registers/pv_inverter_registers.xlsx"
|
||||
|
||||
class PvInverter:
|
||||
def __init__(self, device_name: str, ip_address: str, port: int = 502, unit: int = 1):
|
||||
self.device_name = device_name
|
||||
self.ip = ip_address
|
||||
self.port = port
|
||||
self.unit = unit
|
||||
self.client = None
|
||||
self.registers = None
|
||||
|
||||
self.client: Optional[ModbusTcpClient] = None
|
||||
self.registers: Dict[int, Dict[str, Any]] = {} # addr -> {"desc":..., "type":...}
|
||||
self.connect_to_modbus()
|
||||
self.get_registers()
|
||||
self.load_registers(EXCEL_PATH)
|
||||
|
||||
# ---------- Verbindung ----------
|
||||
def connect_to_modbus(self):
|
||||
# Timeout & retries optional, aber hilfreich:
|
||||
self.client = ModbusTcpClient(self.ip, port=self.port, timeout=3.0, retries=3)
|
||||
if not self.client.connect():
|
||||
print("Verbindung zu Wechselrichter fehlgeschlagen.")
|
||||
print("❌ Verbindung zu Wechselrichter fehlgeschlagen.")
|
||||
raise SystemExit(1)
|
||||
print("Verbindung zu Wechselrichter erfolgreich.")
|
||||
|
||||
# WICHTIG: NICHT hier schließen!
|
||||
# finally: self.client.close() <-- entfernen
|
||||
print("✅ Verbindung zu Wechselrichter hergestellt.")
|
||||
|
||||
def close(self):
|
||||
if self.client:
|
||||
self.client.close()
|
||||
self.client = None
|
||||
|
||||
def get_registers(self):
|
||||
excel_path = "modbus_registers/pv_inverter_registers.xlsx"
|
||||
# ---------- Register-Liste ----------
|
||||
def load_registers(self, excel_path: str):
|
||||
xls = pd.ExcelFile(excel_path)
|
||||
df_input_registers = xls.parse()
|
||||
df_clean = df_input_registers[['MB Adresse', 'Beschreibung', 'Variabel Typ']].dropna()
|
||||
df_clean['MB Adresse'] = df_clean['MB Adresse'].astype(int)
|
||||
|
||||
df = xls.parse()
|
||||
# Passen die Spaltennamen bei dir anders, bitte hier anpassen:
|
||||
cols = ["MB Adresse", "Beschreibung", "Variabel Typ"]
|
||||
for c in cols:
|
||||
if c not in df.columns:
|
||||
raise ValueError(f"Spalte '{c}' fehlt in {excel_path}")
|
||||
df = df[cols].dropna()
|
||||
df["MB Adresse"] = df["MB Adresse"].astype(int)
|
||||
# NORMALISIERE TYP
|
||||
def norm_type(x: Any) -> str:
|
||||
s = str(x).strip().upper()
|
||||
return "REAL" if s == "REAL" else "INT"
|
||||
self.registers = {
|
||||
row['MB Adresse']: {
|
||||
'desc': row['Beschreibung'],
|
||||
'type': 'REAL' if str(row['Variabel Typ']).upper() == 'REAL' else 'INT'
|
||||
int(row["MB Adresse"]): {
|
||||
"desc": str(row["Beschreibung"]).strip(),
|
||||
"type": norm_type(row["Variabel Typ"])
|
||||
}
|
||||
for _, row in df_clean.iterrows()
|
||||
for _, row in df.iterrows()
|
||||
}
|
||||
print(f"ℹ️ {len(self.registers)} Register aus Excel geladen.")
|
||||
|
||||
def get_state(self):
|
||||
data = {'Zeit': time.strftime('%Y-%m-%d %H:%M:%S')}
|
||||
for address, info in self.registers.items():
|
||||
reg_type = info['type']
|
||||
# Unit-ID mitgeben (wichtig bei pymodbus>=3)
|
||||
result = self.client.read_holding_registers(
|
||||
address=address,
|
||||
count=2 if reg_type == 'REAL' else 1,
|
||||
slave=self.unit # pymodbus 2.x -> 'slave', nicht 'unit'
|
||||
)
|
||||
if result.isError():
|
||||
print(f"Fehler beim Lesen von Adresse {address}: {result}")
|
||||
# ---------- Low-Level Lesen ----------
|
||||
def _try_read(self, fn_name: str, address: int, count: int) -> Optional[List[int]]:
|
||||
fn = getattr(self.client, fn_name)
|
||||
# pymodbus 3.8.x hat 'slave='; Fallbacks schaden nicht
|
||||
for kwargs in (dict(address=address, count=count, slave=self.unit),
|
||||
dict(address=address, count=count),
|
||||
):
|
||||
try:
|
||||
res = fn(**kwargs)
|
||||
if res is None or (hasattr(res, "isError") and res.isError()):
|
||||
continue
|
||||
return res.registers
|
||||
except TypeError:
|
||||
continue
|
||||
return None
|
||||
|
||||
# Minimal invasiv: wie bei dir – erstes Register verwenden
|
||||
value = result.registers[0]
|
||||
print(f"Adresse {address} - {info['desc']}: {value}")
|
||||
data[f"{address} - {info['desc']}"] = value
|
||||
return data
|
||||
def _read_any(self, address: int, count: int) -> Optional[List[int]]:
|
||||
regs = self._try_read("read_holding_registers", address, count)
|
||||
if regs is None:
|
||||
regs = self._try_read("read_input_registers", address, count)
|
||||
return regs
|
||||
|
||||
# ---------- Decoding ----------
|
||||
@staticmethod
|
||||
def _to_i16(u16: int) -> int:
|
||||
return struct.unpack(">h", struct.pack(">H", u16))[0]
|
||||
|
||||
@staticmethod
|
||||
def _to_f32_from_two(u16_hi: int, u16_lo: int, msw_first: bool = True) -> float:
|
||||
if msw_first:
|
||||
b = struct.pack(">HH", u16_hi, u16_lo)
|
||||
else:
|
||||
b = struct.pack(">HH", u16_lo, u16_hi)
|
||||
return struct.unpack(">f", b)[0]
|
||||
|
||||
def read_one(self, address_excel: int, rtype: str) -> Optional[float]:
|
||||
"""Liest einen Wert nach Typ ('INT' oder 'REAL') unter Berücksichtigung Base-1."""
|
||||
addr = address_excel
|
||||
if rtype == "REAL":
|
||||
regs = self._read_any(addr, 2)
|
||||
if not regs or len(regs) < 2:
|
||||
return None
|
||||
return self._to_f32_from_two(regs[0], regs[1])
|
||||
else: # INT
|
||||
regs = self._read_any(addr, 1)
|
||||
if not regs:
|
||||
return None
|
||||
return float(self._to_i16(regs[0]))
|
||||
|
||||
def get_state(self) -> Dict[str, Any]:
|
||||
"""Liest ALLE Register aus self.registers und gibt dict zurück."""
|
||||
data = {"Zeit": time.strftime("%Y-%m-%d %H:%M:%S")}
|
||||
for address, meta in self.registers.items():
|
||||
val = self.read_one(address, meta["type"])
|
||||
if val is None:
|
||||
continue
|
||||
key = f"{address} - {meta['desc']}"
|
||||
data[key] = val
|
||||
return data
|
||||
Reference in New Issue
Block a user