Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
c2053acee3
|
|||
827ebdadad
|
|||
3d28188833
|
|||
52d690c382
|
@ -35,7 +35,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: pv-controller
|
- name: pv-controller
|
||||||
image: wollud1969/pv-controller:1.0.0
|
image: wollud1969/pv-controller:1.0.5
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: pv-controller
|
name: pv-controller
|
||||||
|
@ -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}"
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
class Config:
|
class Config:
|
||||||
OPTIONS = {
|
OPTIONS = {
|
||||||
@ -17,15 +18,16 @@ class Config:
|
|||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.values = {}
|
self.values = {}
|
||||||
for section, keys in Config.OPTIONS:
|
for section, keys in Config.OPTIONS.items():
|
||||||
self.values[section] = {}
|
self.values[section] = {}
|
||||||
for key in keys:
|
for key in keys:
|
||||||
varname = f"{section}__{key}".upper()
|
varname = f"{section}__{key}".upper()
|
||||||
try:
|
try:
|
||||||
self.values[section][key] = os.environ[varname]
|
self.values[section][key] = os.environ[varname]
|
||||||
|
logger.info(f"Config: {section} {key} -> {self.values[section][key]}")
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def __getitem__(self, section):
|
def __getitem__(self, section):
|
||||||
return self.values[index]
|
return self.values[section]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user