SolarManager unter Versionsverwaltung

Erster Stand der Hintergrundprozesse, die auf der Synology unter
/volume1/homes/wagner/SolarManager laufen: der Manager selbst, die Sammler
je Geraet, die MQTT-Bruecke, der Wecker und - neu hinzugezogen - der
AutoAction-Runner, der als Hintergrundprozess hierher gehoert und nicht ins
Web-Verzeichnis.

Zugangsdaten stehen nicht mehr im Quelltext, sondern in config.ini, die
nicht mit eingecheckt wird. Vorlage ist config.ini.example, gelesen wird sie
von konfig.py. Betroffen waren solarManager.py (Datenbank und Wattpilot),
zeit.py, gatherWaterData.py, wecker.py und skoda_testdaten.py, das sich das
Passwort bisher aus dem Quelltext eines anderen Moduls herausgesucht hat.

Die Kia-Anbindung ist mit dem Fahrzeug entfallen: kiaTest.py,
gatherCarData.py und hyundai_kia_connect_api sind nicht mehr dabei, ebenso
gatherInverterData.py, auf das nur noch eine auskommentierte Zeile zeigte.

Die mitgelieferten Bibliotheken bleiben im Repository - die NAS hat kein
pip, sie muessen neben den Skripten liegen.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

goodwe/modbus.py

@@ -0,0 +1,149 @@
+import logging
+from typing import Union
+
+from .exceptions import RequestRejectedException
+
+logger = logging.getLogger(__name__)
+
+MODBUS_READ_CMD: int = 0x3
+MODBUS_WRITE_CMD: int = 0x6
+MODBUS_WRITE_MULTI_CMD: int = 0x10
+
+FAILURE_CODES = {
+    1: "ILLEGAL FUNCTION",
+    2: "ILLEGAL DATA ADDRESS",
+    3: "ILLEGAL DATA VALUE",
+    4: "SLAVE DEVICE FAILURE",
+    5: "ACKNOWLEDGE",
+    6: "SLAVE DEVICE BUSY",
+    7: "NEGATIVE ACKNOWLEDGEMENT",
+    8: "MEMORY PARITY ERROR",
+    10: "GATEWAY PATH UNAVAILABLE",
+    11: "GATEWAY TARGET DEVICE FAILED TO RESPOND",
+}
+
+
+def _create_crc16_table() -> tuple:
+    """Construct (modbus) CRC-16 table"""
+    table = []
+    for i in range(256):
+        buffer = i << 1
+        crc = 0
+        for _ in range(8, 0, -1):
+            buffer >>= 1
+            if (buffer ^ crc) & 0x0001:
+                crc = (crc >> 1) ^ 0xA001
+            else:
+                crc >>= 1
+        table.append(crc)
+    return tuple(table)
+
+
+_CRC_16_TABLE = _create_crc16_table()
+
+
+def _modbus_checksum(data: Union[bytearray, bytes]) -> int:
+    """
+    Calculate modbus crc-16 checksum
+    """
+    crc = 0xFFFF
+    for ch in data:
+        crc = (crc >> 8) ^ _CRC_16_TABLE[(crc ^ ch) & 0xFF]
+    return crc
+
+
+def create_modbus_request(comm_addr: int, cmd: int, offset: int, value: int) -> bytes:
+    """
+    Create modbus request.
+    data[0] is inverter address
+    data[1] is modbus command
+    data[2:3] is command offset parameter
+    data[4:5] is command value parameter
+    data[6:7] is crc-16 checksum
+    """
+    data: bytearray = bytearray(6)
+    data[0] = comm_addr
+    data[1] = cmd
+    data[2] = (offset >> 8) & 0xFF
+    data[3] = offset & 0xFF
+    data[4] = (value >> 8) & 0xFF
+    data[5] = value & 0xFF
+    checksum = _modbus_checksum(data)
+    data.append(checksum & 0xFF)
+    data.append((checksum >> 8) & 0xFF)
+    return bytes(data)
+
+
+def create_modbus_multi_request(comm_addr: int, cmd: int, offset: int, values: bytes) -> bytes:
+    """
+    Create modbus (multi value) request.
+    data[0] is inverter address
+    data[1] is modbus command
+    data[2:3] is command offset parameter
+    data[4:5] is number of registers
+    data[6] is number of bytes
+    data[7-n] is data payload
+    data[n+1:n+2] is crc-16 checksum
+    """
+    data: bytearray = bytearray(7)
+    data[0] = comm_addr
+    data[1] = cmd
+    data[2] = (offset >> 8) & 0xFF
+    data[3] = offset & 0xFF
+    data[4] = 0
+    data[5] = len(values) // 2
+    data[6] = len(values)
+    data.extend(values)
+    checksum = _modbus_checksum(data)
+    data.append(checksum & 0xFF)
+    data.append((checksum >> 8) & 0xFF)
+    return bytes(data)
+
+
+def validate_modbus_response(data: bytes, cmd: int, offset: int, value: int) -> bool:
+    """
+    Validate the modbus response.
+    data[0:1] is header
+    data[2] is source address
+    data[3] is command return type
+    data[4] is response payload length (for read commands)
+    data[-2:] is crc-16 checksum
+    """
+    if len(data) <= 4:
+        logger.debug("Response is too short.")
+        return False
+    if data[3] == MODBUS_READ_CMD:
+        if data[4] != value * 2:
+            logger.debug("Response has unexpected length: %d, expected %d.", data[4], value * 2)
+            return False
+        expected_length = data[4] + 7
+        if len(data) < expected_length:
+            logger.debug("Response is too short: %d, expected %d.", len(data), expected_length)
+            return False
+    elif data[3] in (MODBUS_WRITE_CMD, MODBUS_WRITE_MULTI_CMD):
+        if len(data) < 10:
+            logger.debug("Response has unexpected length: %d, expected %d.", len(data), 10)
+            return False
+        expected_length = 10
+        response_offset = int.from_bytes(data[4:6], byteorder='big', signed=False)
+        if response_offset != offset:
+            logger.debug("Response has wrong offset: %X, expected %X.", response_offset, offset)
+            return False
+        response_value = int.from_bytes(data[6:8], byteorder='big', signed=True)
+        if response_value != value:
+            logger.debug("Response has wrong value: %X, expected %X.", response_value, value)
+            return False
+    else:
+        expected_length = len(data)
+
+    checksum_offset = expected_length - 2
+    if _modbus_checksum(data[2:checksum_offset]) != ((data[checksum_offset + 1] << 8) + data[checksum_offset]):
+        logger.debug("Response CRC-16 checksum does not match.")
+        return False
+
+    if data[3] != cmd:
+        failure_code = FAILURE_CODES.get(data[4], "UNKNOWN")
+        logger.debug("Response is command failure: %s.", FAILURE_CODES.get(data[4], "UNKNOWN"))
+        raise RequestRejectedException(failure_code)
+
+    return True