still not able to connect to slave
This commit is contained in:
Nils Reiners
@@ -1,32 +1,40 @@
|
||||
import time
|
||||
import struct
|
||||
import pandas as pd
|
||||
from typing import Dict, Any, List, Tuple, Optional
|
||||
from typing import Dict, Any, List, Optional
|
||||
from pymodbus.client import ModbusTcpClient
|
||||
|
||||
EXCEL_PATH = "modbus_registers/pv_inverter_registers.xlsx"
|
||||
|
||||
# Obergrenze: bis EXKLUSIVE 40206 (d.h. max. 40205)
|
||||
MAX_ADDR_EXCLUSIVE = 40121
|
||||
# Bis EXKLUSIVE 40206 (also max. 40205)
|
||||
MAX_ADDR_EXCLUSIVE = 40206
|
||||
|
||||
|
||||
class PvInverter:
|
||||
def __init__(self, device_name: str, ip_address: str, port: int = 502, unit: int = 1):
|
||||
"""
|
||||
device_name : Anzeigename (z.B. 'master' oder 'slave')
|
||||
ip_address : IP des Wechselrichters oder Modbus-Gateways
|
||||
port : TCP-Port (Standard 502)
|
||||
unit : Modbus Unit-ID (1 = Master, 3 = Slave)
|
||||
"""
|
||||
self.device_name = device_name
|
||||
self.ip = ip_address
|
||||
self.port = port
|
||||
self.unit = unit
|
||||
self.client: Optional[ModbusTcpClient] = None
|
||||
self.registers: Dict[int, Dict[str, Any]] = {} # addr -> {"desc":..., "type":...}
|
||||
self.registers: Dict[int, Dict[str, Any]] = {}
|
||||
|
||||
self.connect_to_modbus()
|
||||
self.load_registers(EXCEL_PATH)
|
||||
|
||||
# ---------- Verbindung ----------
|
||||
def connect_to_modbus(self):
|
||||
self.client = ModbusTcpClient(self.ip, port=self.port, timeout=3.0, retries=3)
|
||||
self.client = ModbusTcpClient(self.ip, port=self.port, timeout=3.0)
|
||||
if not self.client.connect():
|
||||
print("❌ Verbindung zu Wechselrichter fehlgeschlagen.")
|
||||
print(f"❌ Verbindung zu {self.device_name} ({self.ip}:{self.port}) fehlgeschlagen.")
|
||||
raise SystemExit(1)
|
||||
print("✅ Verbindung zu Wechselrichter hergestellt.")
|
||||
print(f"✅ Verbindung hergestellt zu {self.device_name} ({self.ip}:{self.port}, unit={self.unit})")
|
||||
|
||||
def close(self):
|
||||
if self.client:
|
||||
@@ -37,12 +45,13 @@ class PvInverter:
|
||||
def load_registers(self, excel_path: str):
|
||||
xls = pd.ExcelFile(excel_path)
|
||||
df = xls.parse()
|
||||
# Passe Spaltennamen hier an, falls nötig:
|
||||
|
||||
# Passe Spaltennamen an deine Excel an
|
||||
cols = ["MB Adresse", "Beschreibung", "Variabel Typ"]
|
||||
df = df[cols].dropna()
|
||||
df["MB Adresse"] = df["MB Adresse"].astype(int)
|
||||
|
||||
# 1) Vorab-Filter: nur Adressen < 40206 übernehmen
|
||||
# Nur Register unterhalb der Grenze übernehmen
|
||||
df = df[df["MB Adresse"] < MAX_ADDR_EXCLUSIVE]
|
||||
|
||||
self.registers = {
|
||||
@@ -53,21 +62,16 @@ class PvInverter:
|
||||
for _, row in df.iterrows()
|
||||
}
|
||||
|
||||
|
||||
# ---------- Low-Level Lesen ----------
|
||||
def _try_read(self, fn_name: str, address: int, count: int) -> Optional[List[int]]:
|
||||
"""
|
||||
Ruft die pymodbus-Funktion mit fester unit-ID auf (kein Fallback).
|
||||
"""
|
||||
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
|
||||
res = fn(address=address, count=count, slave=self.unit)
|
||||
if res is None or (hasattr(res, "isError") and res.isError()):
|
||||
return None
|
||||
return getattr(res, "registers", None)
|
||||
|
||||
def _read_any(self, address: int, count: int) -> Optional[List[int]]:
|
||||
regs = self._try_read("read_holding_registers", address, count)
|
||||
@@ -85,34 +89,30 @@ class PvInverter:
|
||||
b = struct.pack(">HH", u16_hi, u16_lo) if msw_first else struct.pack(">HH", u16_lo, u16_hi)
|
||||
return struct.unpack(">f", b)[0]
|
||||
|
||||
# Hilfsfunktion: wie viele 16-Bit-Register braucht dieser Typ?
|
||||
# Wie viele Register braucht der Typ?
|
||||
@staticmethod
|
||||
def _word_count_for_type(rtype: str) -> int:
|
||||
rt = (rtype or "").lower()
|
||||
# Passe hier an deine Excel-Typen an:
|
||||
if "uint32" in rt or "real" in rt or "float" in rt or "string(32)" in rt:
|
||||
return 2
|
||||
# Default: 1 Wort (z.B. int16/uint16)
|
||||
return 1
|
||||
|
||||
# ---------- Lesen ----------
|
||||
def read_one(self, address_excel: int, rtype: str) -> Optional[float]:
|
||||
"""
|
||||
Liest einen Wert nach Typ ('INT' oder 'REAL' etc.).
|
||||
Es werden ausschließlich Register < 40206 gelesen.
|
||||
Liest einen Wert nach Typ ('INT', 'REAL' etc.) mit fixer Unit-ID.
|
||||
"""
|
||||
addr = int(address_excel)
|
||||
words = self._word_count_for_type(rtype)
|
||||
|
||||
# 2) Harte Grenze prüfen: höchstes angefasstes Register muss < 40206 sein
|
||||
# Grenze prüfen
|
||||
if addr + words - 1 >= MAX_ADDR_EXCLUSIVE:
|
||||
# Überspringen, da der Lesevorgang die Grenze >= 40206 berühren würde
|
||||
return None
|
||||
|
||||
if words == 2:
|
||||
regs = self._read_any(addr, 2)
|
||||
if not regs or len(regs) < 2:
|
||||
return None
|
||||
# Deine bisherige Logik interpretiert 2 Worte als Float32:
|
||||
return self._to_f32_from_two(regs[0], regs[1])
|
||||
else:
|
||||
regs = self._read_any(addr, 1)
|
||||
@@ -122,13 +122,11 @@ class PvInverter:
|
||||
|
||||
def get_state(self) -> Dict[str, Any]:
|
||||
"""
|
||||
Liest ALLE Register aus self.registers und gibt dict zurück.
|
||||
Achtet darauf, dass keine Adresse (inkl. Mehrwort) >= 40206 gelesen wird.
|
||||
Liest alle gültigen Register und gibt ein dict zurück.
|
||||
"""
|
||||
data = {"Zeit": time.strftime("%Y-%m-%d %H:%M:%S")}
|
||||
for address, meta in sorted(self.registers.items()):
|
||||
words = self._word_count_for_type(meta["type"])
|
||||
# 3) Nochmals Schutz auf Ebene der Iteration:
|
||||
if address + words - 1 >= MAX_ADDR_EXCLUSIVE:
|
||||
continue
|
||||
val = self.read_one(address, meta["type"])
|
||||
|
||||
Reference in New Issue
Block a user