fix CRC to be compliant for new firmware

.gitignore

@@ -12,6 +12,7 @@ buildx.sh
 .venv
 .vscode
 GivTCP/__pycache__
+./givenergy_modbus/__pycache__
 GivTCP/givenergy_modbus_2
 GivTCP/asyncclient.py
 GivTCP/testdata.json

GivTCP/mqtt_client.py

@@ -50,7 +50,7 @@ def isfloat(num):
 
 def on_message(client, userdata, message):
     payload={}
-    logger.critical("MQTT Message Recieved: "+str(message.topic)+"= "+str(message.payload.decode("utf-8")))
+    logger.debug("MQTT Message Recieved: "+str(message.topic)+"= "+str(message.payload.decode("utf-8")))
     writecommand={}
     command=str(message.topic).split("/")[-1]
     if command=="setDischargeRate":

buildx.bat

@@ -1,2 +1,2 @@
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:2.2.0 --push .
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-dev:2.2.1 --push .
 ::docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t britkat/giv_tcp-ma:latest -t britkat/giv_tcp-ma:2.2.0 --push .

givenergy_modbus/cli.py

@@ -4,11 +4,11 @@
 
 import click
 
-from givenergy_modbus.client import GivEnergyClient
-from givenergy_modbus.model.battery import Battery
-from givenergy_modbus.model.inverter import Inverter  # type: ignore
-from givenergy_modbus.model.plant import Plant
-from givenergy_modbus.util import InterceptHandler
+from client import GivEnergyClient
+from model.battery import Battery
+from model.inverter import Inverter  # type: ignore
+from model.plant import Plant
+from util import InterceptHandler
 
 _logger = logging.getLogger(__package__)
 

givenergy_modbus/client.py

@@ -34,7 +34,7 @@ def fetch_register_pages(
         self,
         pages: Mapping[type[HoldingRegister | InputRegister], Sequence[int]],
         register_cache: RegisterCache,
-        slave_address: int = 0x32,
+        slave_address: int = 0x31,
         sleep_between_queries: float = DEFAULT_SLEEP,
     ) -> None:
         """Reload all inverter data from the device."""
@@ -54,13 +54,13 @@ def refresh_plant(self, plant: Plant, full_refresh: bool, sleep_between_queries=
             inverter_registers[HoldingRegister] = [0, 60, 120]
 
         self.fetch_register_pages(
-            inverter_registers, plant.inverter_rc, slave_address=0x32, sleep_between_queries=sleep_between_queries
+            inverter_registers, plant.inverter_rc, slave_address=0x11, sleep_between_queries=sleep_between_queries
         )
         for i, battery_rc in enumerate(plant.batteries_rcs):
             self.fetch_register_pages(
                 {InputRegister: [60]},
                 battery_rc,
-                slave_address=0x32 + i,
+                slave_address=0x11 + i,
                 sleep_between_queries=sleep_between_queries,
             )
 
@@ -194,8 +194,7 @@ def set_mode_dynamic(self):
         self-consumption of renewable generation and minimise the amount of energy drawn from the grid.
         """
         self.set_battery_discharge_mode_demand()  # r27=1
-        #self.set_shallow_charge(4)  # r110=4  Commented as this has nothing to do with dynamic mode.  This should be handled 
-        # in either setBatteryMode() or by calling setBatteryReserve()
+        self.set_shallow_charge(4)  # r110=4
         self.disable_discharge()  # r59=0
 
     def set_mode_storage(

givenergy_modbus/pdu.py

@@ -22,9 +22,10 @@ class ModbusPDU(ABC):
 
     builder: BinaryPayloadBuilder
     function_code: int
-    data_adapter_serial_number: str = 'AB1234G567'
+    data_adapter_serial_number: str = ''
+    #data_adapter_serial_number: int = 0x0000000000
     padding: int = 0x00000008
-    slave_address: int = 0x31  # 0x11 is the inverter but the cloud systems interfere, 0x32+ are the batteries
+    slave_address: int = 0x32  # 0x11 is the inverter but the cloud systems interfere, 0x32+ are the batteries
     check: int = 0x0000
     error: bool = False
 
@@ -201,10 +202,12 @@ def _decode_function_data(self, decoder):
 
     def _update_check_code(self):
         crc_builder = BinaryPayloadBuilder(byteorder=Endian.Big)
+        crc_builder.add_8bit_uint(self.slave_address)
         crc_builder.add_8bit_uint(self.function_code)
         crc_builder.add_16bit_uint(self.base_register)
         crc_builder.add_16bit_uint(self.register_count)
         self.check = CrcModbus().process(crc_builder.to_string()).final()
+        self.check=int.from_bytes(self.check.to_bytes(2,'little'),'big')
         self.builder.add_16bit_uint(self.check)
 
     def _calculate_function_data_size(self):
@@ -381,10 +384,12 @@ def _decode_function_data(self, decoder):
 
     def _update_check_code(self):
         crc_builder = BinaryPayloadBuilder(byteorder=Endian.Big)
+        crc_builder.add_8bit_uint(self.slave_address)
         crc_builder.add_8bit_uint(self.function_code)
-        crc_builder.add_16bit_uint(self.register)
-        crc_builder.add_16bit_uint(self.value)
+        crc_builder.add_16bit_uint(self.base_register)
+        crc_builder.add_16bit_uint(self.register_count)
         self.check = CrcModbus().process(crc_builder.to_string()).final()
+        self.check=int.from_bytes(self.check.to_bytes(2,'little'),'big')
         self.builder.add_16bit_uint(self.check)
 
     def _calculate_function_data_size(self):

givenergy_modbus/transaction.py

@@ -83,6 +83,7 @@ def _transact(
             self.client.connect()
             tx_data = self.client.framer.buildPacket(request)
             _logger.debug(f"SEND raw frame: {hexlify(tx_data)}")
+#            print(f"SEND raw frame: {hexlify(tx_data)}")
             _logger.info(f'Sending request {request}')
             tx_size = self._send(tx_data)
 

startup.py

@@ -60,7 +60,6 @@ def palm_job():
         hasMQTT=False
         logger.critical("No HA MQTT service has been found")
 
-
     #Get Host Details    
     url="http://supervisor/network/info"
     result = requests.get(url,
@@ -69,12 +68,16 @@ def palm_job():
     hostDetails=result.json()
 
     if hostDetails['result']=="ok":
-    # For each interface scan for inverters    
-        for interface in hostDetails['data']['interfaces']:
-            subnet=interface['ipv4']['gateway']
-            invList=findInvertor(subnet)
-            logger.critical ("We have found the following invertors: "+str(invList))
-
+    # For each interface scan for inverters
+        try:
+            for interface in hostDetails['data']['interfaces']:
+                subnet=interface['ipv4']['gateway']
+                invList=findInvertor(subnet)
+                logger.critical ("We have found the following invertors: "+str(invList))
+        except:
+            logger.error("Error scanning for Inverters")
+
+logger.critical("GivTCP isAddon: "+str(isAddon))
 
 if not os.path.exists(str(os.getenv("CACHELOCATION"))):
     os.makedirs(str(os.getenv("CACHELOCATION")))