diff --git a/Dockerfile b/Dockerfile index bd81ce8..d3c342c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN python3 setup.py install # Building the docker image with already compiled modules FROM base LABEL maintainer="Michael Oberdorf IT-Consulting " -LABEL site.local.program.version="1.0.13" +LABEL site.local.program.version="1.0.14" COPY --from=builder /usr/lib/python3.11/site-packages /usr/lib/python3.11/site-packages diff --git a/README.md b/README.md index 4736c97..bba6b09 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ Container Registry: [DockerHub](https://hub.docker.com/r/oitc/modbus-client) # Supported tags and respective `Dockerfile` links -* [`latest`, `1.0.13`](https://github.com/cybcon/modbus-client/blob/v1.0.13/Dockerfile) +* [`latest`, `1.0.14`](https://github.com/cybcon/modbus-client/blob/v1.0.14/Dockerfile) +* [`1.0.13`](https://github.com/cybcon/modbus-client/blob/v1.0.13/Dockerfile) * [`1.0.12`](https://github.com/cybcon/modbus-client/blob/v1.0.12/Dockerfile) * [`1.0.11`](https://github.com/cybcon/modbus-client/blob/v1.0.11/Dockerfile) diff --git a/src/app/modbus_client.py b/src/app/modbus_client.py index a704ccd..6181e69 100644 --- a/src/app/modbus_client.py +++ b/src/app/modbus_client.py @@ -18,7 +18,7 @@ import FloatToHex from numpy import little_endian -VERSION='1.0.13' +VERSION='1.0.14' DEBUG=False """ ############################################################################### @@ -192,7 +192,7 @@ def parse_modbus_result(registers: list, startRegister: int, readLength: int, va # parse the results if args.registerType >= 3: - df = parse_modbus_result(registers=rr.registers, startRegister=register_number, readLength=args.length, type='word', big_endian=args.bigEndian) + df = parse_modbus_result(registers=rr.registers, startRegister=register_number, readLength=args.length, valueType='word', big_endian=args.bigEndian) # sort and filter output df = df[['HEX16', 'UINT16', 'INT16', 'BIT', 'HEX32', 'FLOAT32']] #, 'UINT32', 'INT32']] else: