3 Commits
1.0.5 ... 1.0.7

Author SHA1 Message Date
0eace0be7c env 2023-11-08 18:31:21 +01:00
88c442697f deployment added 2023-11-08 17:14:29 +01:00
c2053acee3 fix 2023-11-08 17:12:22 +01:00
3 changed files with 10 additions and 6 deletions

View File

@ -2,11 +2,17 @@ FROM python:latest
LABEL Maintainer="Wolfgang Hottgenroth wolfgang.hottgenroth@icloud.com" LABEL Maintainer="Wolfgang Hottgenroth wolfgang.hottgenroth@icloud.com"
LABEL ImageName="registry.hottis.de/dockerized/pv-controller" LABEL ImageName="registry.hottis.de/dockerized/pv-controller"
LABEL HubImageName="wollud1969/pv-controller"
ARG APP_DIR="/opt/app" ARG APP_DIR="/opt/app"
ARG CONF_DIR="${APP_DIR}/config"
ENV MQTT__BROKER ""
ENV MQTT__PORT "1883"
ENV MQTT__METERPUBLISHTOPIC "IoT/PV/Values"
ENV MQTT__METERPUBLISHPERIOD "15"
ENV MQTT__RELAISSUBSCRIBETOPIC "IoT/PV/Cmd"
ENV MODBUS__GATEWAY ""
RUN \ RUN \
apt update && \ apt update && \
@ -20,14 +26,12 @@ RUN \
useradd -d ${APP_DIR} -u 1000 user useradd -d ${APP_DIR} -u 1000 user
COPY ./src/pv_controller/*.py ${APP_DIR}/ COPY ./src/pv_controller/*.py ${APP_DIR}/
COPY config.ini ${CONF_DIR}/
USER 1000:1000 USER 1000:1000
WORKDIR ${APP_DIR} WORKDIR ${APP_DIR}
VOLUME ${CONF_DIR}
CMD [ "python", "pvc.py", "-f", "/opt/app/config/config.ini" ] CMD [ "python", "pvc.py" ]

View File

@ -35,7 +35,7 @@ spec:
spec: spec:
containers: containers:
- name: pv-controller - name: pv-controller
image: wollud1969/pv-controller:1.0.4 image: wollud1969/pv-controller:1.0.6
envFrom: envFrom:
- configMapRef: - configMapRef:
name: pv-controller name: pv-controller

View File

@ -37,7 +37,7 @@ class ModbusHandler:
def readInputRegister(self, slave, addr): def readInputRegister(self, slave, addr):
res = self.client.read_input_registers(addr, 2, slave=slave) res = self.client.read_input_registers(addr, 2, slave=slave)
if (isinstance(res, ReadInputRegistersResponse)): if (isinstance(res, ReadInputRegistersResponse)):
v = BinaryPayloadDecoder.fromRegisters(res.registers, byteorder=Endian.Big, wordorder=Endian.Big).decode_32bit_float() v = BinaryPayloadDecoder.fromRegisters(res.registers, byteorder=Endian.BIG, wordorder=Endian.BIG).decode_32bit_float()
return v return v
elif (isinstance(res, LocalModbusException)): elif (isinstance(res, LocalModbusException)):
msg = f"Error: {type(res)}, Content: {res}" msg = f"Error: {type(res)}, Content: {res}"