topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

RPI: fix logging

pull/409/head
Christian Ehrlicher 3 years ago
parent
cbcfb8da72
commit
c2ef55f7a2
2 changed files with 19 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      tools/rpi/hoymiles/__main__.py
  2. 26
      tools/rpi/hoymiles/decoders/__init__.py

9
tools/rpi/hoymiles/__main__.py
View File

@ -163,17 +163,18 @@ def poll_inverter(inverter, dtu_ser, do_init, retries):
data = result.__dict__() data = result.__dict__()
if hoymiles.HOYMILES_DEBUG_LOGGING: if hoymiles.HOYMILES_DEBUG_LOGGING:
logging.debug(f'{c_datetime} Decoded: temp={data["temperature"]}, total={data["energy_total"]/1000:.3f}', end='') dbg = f'{c_datetime} Decoded: temp={data["temperature"]}, total={data["energy_total"]/1000:.3f}'
if data['powerfactor'] is not None: if data['powerfactor'] is not None:
logging.debug(f', pf={data["powerfactor"]}', end='') dbg += f', pf={data["powerfactor"]}'
phase_id = 0 phase_id = 0
for phase in data['phases']: for phase in data['phases']:
logging.debug(f' phase{phase_id}=voltage:{phase["voltage"]}, current:{phase["current"]}, power:{phase["power"]}, frequency:{data["frequency"]}', end='') dbg += f' phase{phase_id}=voltage:{phase["voltage"]}, current:{phase["current"]}, power:{phase["power"]}, frequency:{data["frequency"]}'
phase_id = phase_id + 1 phase_id = phase_id + 1
string_id = 0 string_id = 0
for string in data['strings']: for string in data['strings']:
logging.debug(f' string{string_id}=voltage:{string["voltage"]}, current:{string["current"]}, power:{string["power"]}, total:{string["energy_total"]/1000}, daily:{string["energy_daily"]}', end='') dbg += f' string{string_id}=voltage:{string["voltage"]}, current:{string["current"]}, power:{string["power"]}, total:{string["energy_total"]/1000}, daily:{string["energy_daily"]}'
string_id = string_id + 1 string_id = string_id + 1
logging.debug(dbg)
if 'event_count' in data: if 'event_count' in data:
if event_message_index[inv_str] < data['event_count']: if event_message_index[inv_str] < data['event_count']:

26
tools/rpi/hoymiles/decoders/__init__.py
View File

@ -45,18 +45,20 @@ def print_table_unpack(s_fmt, payload, cw=6):
l_hexlified = [f'{byte:02x}' for byte in payload] l_hexlified = [f'{byte:02x}' for byte in payload]
logging.debug(f'{"Pos": <{cw}}', end='') dbg = f'{"Pos": <{cw}}'
logging.debug(''.join([f'{num: >{cw}}' for num in range(0, len(payload))])) dbg += ''.join([f'{num: >{cw}}' for num in range(0, len(payload))])
logging.debug(f'{"Hex": <{cw}}', end='') logging.debug(dbg)
logging.debug(''.join([f'{byte: >{cw}}' for byte in l_hexlified])) dbg = f'{"Hex": <{cw}}'
dbg += ''.join([f'{byte: >{cw}}' for byte in l_hexlified])
logging.debug(dbg)
l_fmt = struct.calcsize(s_fmt) l_fmt = struct.calcsize(s_fmt)
if len(payload) >= l_fmt: if len(payload) >= l_fmt:
for offset in range(0, l_fmt): for offset in range(0, l_fmt):
logging.debug(f'{s_fmt: <{cw}}', end='') dbg = f'{s_fmt: <{cw}}'
logging.debug(' ' * cw * offset, end='') dbg += ' ' * cw * offset
logging.debug(''.join( dbg += ''.join([f'{num[0]: >{cw*l_fmt}}' for num in g_unpack(s_fmt, payload[offset:])])
[f'{num[0]: >{cw*l_fmt}}' for num in g_unpack(s_fmt, payload[offset:])])) logging.debug(dbg)
class Response: class Response:
""" All Response Shared methods """ """ All Response Shared methods """
@ -305,7 +307,7 @@ class EventsResponse(UnknownResponse):
status = struct.unpack('>H', self.response[:2])[0] status = struct.unpack('>H', self.response[:2])[0]
a_text = self.alarm_codes.get(status, 'N/A') a_text = self.alarm_codes.get(status, 'N/A')
print (f' Inverter status: {a_text} ({status})') logging.info (f' Inverter status: {a_text} ({status})')
chunk_size = 12 chunk_size = 12
for i_chunk in range(2, len(self.response), chunk_size): for i_chunk in range(2, len(self.response), chunk_size):
@ -318,9 +320,10 @@ class EventsResponse(UnknownResponse):
logging.debug(f' uptime={timedelta(seconds=uptime_sec)} a_count={a_count} opcode={opcode} a_code={a_code} a_text={a_text}') logging.debug(f' uptime={timedelta(seconds=uptime_sec)} a_count={a_count} opcode={opcode} a_code={a_code} a_text={a_text}')
dbg = ''
for fmt in ['BBHHHHH']: for fmt in ['BBHHHHH']:
logging.debug(f' {fmt:7}: ' + str(struct.unpack('>' + fmt, chunk))) dbg += f' {fmt:7}: ' + str(struct.unpack('>' + fmt, chunk))
logging.debug(end='', flush=True) logging.debug(dbg)
class HardwareInfoResponse(UnknownResponse): class HardwareInfoResponse(UnknownResponse):
def __init__(self, *args, **params): def __init__(self, *args, **params):
@ -341,7 +344,6 @@ class HardwareInfoResponse(UnknownResponse):
fw_version_pat = int((fw_version % 100)) fw_version_pat = int((fw_version % 100))
fw_build_mm = int(fw_build_mmdd / 100) fw_build_mm = int(fw_build_mmdd / 100)
fw_build_dd = int(fw_build_mmdd % 100) fw_build_dd = int(fw_build_mmdd % 100)
logging.debug()
logging.debug(f'Firmware: {fw_version_maj}.{fw_version_min}.{fw_version_pat} build at {fw_build_dd}/{fw_build_mm}/{fw_build_yyyy}, HW revision {hw_id}') logging.debug(f'Firmware: {fw_version_maj}.{fw_version_min}.{fw_version_pat} build at {fw_build_dd}/{fw_build_mm}/{fw_build_yyyy}, HW revision {hw_id}')
class DebugDecodeAny(UnknownResponse): class DebugDecodeAny(UnknownResponse):

Write Preview
Loading…
Cancel
Save