Tool assisted code formatting

This commit is contained in:
Odd Stråbø 2021-10-31 18:14:22 +01:00
parent d8f3a16a45
commit c7e97aca84
1 changed files with 93 additions and 79 deletions

100
solar_ble.py Normal file → Executable file
View File

@ -1,7 +1,8 @@
#!/usr/bin/env python3
import time
import struct
# -*- coding: utf-8 -*-
import datetime
import struct
import time
from bluepy import btle
from libscrc import modbus
@ -15,25 +16,24 @@ write_device = "0000ffd1-0000-1000-8000-00805f9b34fb"
# read_device = "0000fff1-0000-1000-8000-00805f9b34fb"
CMD_GET_1 = b'\xff\x03\x00\x0c\x00\x02'
CMD_GET_1 = b"\xff\x03\x00\x0c\x00\x02"
# > ff 03 04 20 20 20 20
CMD_GET_MODEL = b'\xff\x03\x00\x0c\x00\x08'
CMD_GET_MODEL = b"\xff\x03\x00\x0c\x00\x08"
# > ff 03 10 20 20 20 20 4d 4c 32 34 32 30 20 20 20 20 20 20
# Device SKU: ML2420
CMD_GET_VERSION = b'\xff\x03\x00\x14\x00\x04'
CMD_GET_VERSION = b"\xff\x03\x00\x14\x00\x04"
# > ff 03 08 00 04 02 00 02 00 00 03
# CC ?? 11 22 33 ?? 44 55 66
# Version: 4.2.0
CMD_GET_SERIAL = b'\xff\x03\x00\x18\x00\x03'
CMD_GET_SERIAL = b"\xff\x03\x00\x18\x00\x03"
# > ff 03 06 3c 13 02 67 00 01
# CC 11 22 33 33 ?? ??
# SN: 60-19-0615
CMD_GET_BATTERY_STATE = b'\xff\x03\x01\x00\x00\x07'
CMD_GET_BATTERY_STATE = b"\xff\x03\x01\x00\x00\x07"
# > ff 03 0e 00 48 00 7e 00 1d 0e 0d 00 7e 00 1c 00 03
# CC 11 11 22 22 33 33 44 55 66 66 77 77 88 88
# 1: Battery charge: 72 %
@ -45,7 +45,7 @@ CMD_GET_BATTERY_STATE = b'\xff\x03\x01\x00\x00\x07'
# 7: Load current: 0.28 A
# 8: Load power: 3 W
CMD_GET_PANEL_STATUS = b'\xff\x03\x01\x07\x00\x04'
CMD_GET_PANEL_STATUS = b"\xff\x03\x01\x07\x00\x04"
# > ff 03 08 00 c8 00 14 00 04 00 01
# CC 11 11 22 22 33 33 ?? ??
# 1: Panel voltage: 20.0 V
@ -53,14 +53,14 @@ CMD_GET_PANEL_STATUS = b'\xff\x03\x01\x07\x00\x04'
# 3: Panel power: 4 W
# Charging status?
CMD_GET_2 = b'\xff\x03\x01\x20\x00\x03'
CMD_GET_2 = b"\xff\x03\x01\x20\x00\x03"
# > ff 03 06 80 02 00 00 00 00
# CC 11 22 33 33 33 33
# 1: boolean flag?: 1
# 2: ?: 2
# 3: ?: 0
CMD_GET_BATTERY_PARAMETERS = b'\xff\x03\xe0\x01\x00\x21'
CMD_GET_BATTERY_PARAMETERS = b"\xff\x03\xe0\x01\x00\x21"
# > ff 03 42 07 d0 00 c8 ff 0c 00 02 00 a0 00 9b 00 92 00 90 00
# > 8a 00 84 00 7e 00 78 00 6f 00 6a 64 32 00 05 00 78 00 78 00
# > 1e 00 03 00 41 00 a3 00 4b 00 a3 00 00 00 00 00 00 00 00 00
@ -68,16 +68,16 @@ CMD_GET_BATTERY_PARAMETERS = b'\xff\x03\xe0\x01\x00\x21'
# 33 * uint16
# (0xff, 267, 21)
CMD_GET_LOAD_PARAMETERS = b'\xff\x03\x01\x0b\x00\x15'
CMD_GET_LOAD_PARAMETERS = b"\xff\x03\x01\x0b\x00\x15"
# > ff 03 2a 00 7c 00 7f 00 51 00 20 00 0a 00 03 00 00 00 00 00
# > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
# > 00 00 00 00 00
# 01 03 f000 000a
CMD_GET_HISTORICAL_TODAY = b'\x01\x03\xf0\x00\x00\x0a'
CMD_GET_HISTORICAL_YESTERDAY = b'\x01\x03\xf0\x01\x00\x0a'
CMD_GET_HISTORICAL_D2 = b'\x01\x03\xf0\x02\x00\x0a'
CMD_GET_HISTORICAL_D3 = b'\x01\x03\xf0\x03\x00\x0a'
CMD_GET_HISTORICAL_TODAY = b"\x01\x03\xf0\x00\x00\x0a"
CMD_GET_HISTORICAL_YESTERDAY = b"\x01\x03\xf0\x01\x00\x0a"
CMD_GET_HISTORICAL_D2 = b"\x01\x03\xf0\x02\x00\x0a"
CMD_GET_HISTORICAL_D3 = b"\x01\x03\xf0\x03\x00\x0a"
# ,- battery_min_voltage
# | ,- battery_max_voltage
@ -103,10 +103,10 @@ CMD_GET_HISTORICAL_D3 = b'\x01\x03\xf0\x03\x00\x0a'
# production_power = 0 Wh
# consumption_power = 0 Wh
CMD_ENABLE_LOAD = b'\xff\x06\x01\x0a\x00\x01'
CMD_DISABLE_LOAD = b'\xff\x06\x01\x0a\x00\x00'
CMD_ENABLE_LOAD = b"\xff\x06\x01\x0a\x00\x01"
CMD_DISABLE_LOAD = b"\xff\x06\x01\x0a\x00\x00"
CMD_ = b'\xff\x78\x00\x00\x00\x01'
CMD_ = b"\xff\x78\x00\x00\x00\x01"
# CMD_GET_BATTERY_STATE = b'\xff\x03\x01\x00\x00\x07'
# > ff 03 0e 00 48 00 7e 00 1d 0e 0d 00 7e 00 1c 00 03
@ -133,36 +133,46 @@ STATUS = {}
def parsePacket(data):
timestamp = datetime.datetime.utcnow().isoformat(' ')
prefix = data[0]
timestamp = datetime.datetime.utcnow().isoformat(" ")
# prefix = data[0]
operation = data[1]
cc = data[2]
res = None
if operation == 3:
if cc == 0x0e: # GET_BATTERY_STATE
res = dict(zip(
('battery_charge', 'battery_voltage', 'battery_current', '_internal_temperature?', 'battery_temperature', 'load_voltage', 'load_current', 'load_power'),
struct.unpack('!xxxHHHbbHHHxx', data)
))
res['battery_voltage'] /= 10
res['battery_current'] /= 100
res['load_voltage'] /= 10
res['load_current'] /= 100
if cc == 0x0E: # GET_BATTERY_STATE
res = dict(
zip(
(
"battery_charge",
"battery_voltage",
"battery_current",
"_internal_temperature?",
"battery_temperature",
"load_voltage",
"load_current",
"load_power",
),
struct.unpack("!xxxHHHbbHHHxx", data),
)
)
res["battery_voltage"] /= 10
res["battery_current"] /= 100
res["load_voltage"] /= 10
res["load_current"] /= 100
STATUS.update(res)
elif cc == 0x08: # GET_PANEL_STATUS (OR version)
res = dict(zip(
('panel_voltage', 'panel_current', 'panel_power', 'load_enabled'),
struct.unpack('!xxxHHHx?xx', data)
))
res['panel_voltage'] /= 10
res['panel_current'] /= 100
res = dict(
zip(
("panel_voltage", "panel_current", "panel_power", "load_enabled"),
struct.unpack("!xxxHHHx?xx", data),
)
)
res["panel_voltage"] /= 10
res["panel_current"] /= 100
STATUS.update(res)
elif operation == 6 and cc == 1:
res = dict(zip(
('load_enabled',),
struct.unpack('!xxxxx?xx', data)
))
res = dict(zip(("load_enabled",), struct.unpack("!xxxxx?xx", data)))
STATUS.update(res)
if res:
@ -170,28 +180,32 @@ def parsePacket(data):
return res
print(timestamp, data)
class Delegate(btle.DefaultDelegate):
data = bytearray()
def handleNotification(self, cHandle, data):
dlen = len(data)
# print(cHandle, data, dlen)
self.data.extend(data)
c_crc = modbus(bytes(self.data[:-2]))
d_crc = self.data[-1] << 8 | self.data[-2] # byte order is inverted in regards to libscrc output
# byte order is inverted in regards to libscrc output
d_crc = self.data[-1] << 8 | self.data[-2]
# print(hex(c_crc), hex(d_crc))
if c_crc == d_crc:
parsePacket(self.data)
self.data.clear()
def write(fh, data):
bdata = bytes(data)
crc = modbus(bdata)
bcrc = bytes([crc & 0xff, (crc & 0xff00) >> 8])
bcrc = bytes([crc & 0xFF, (crc & 0xFF00) >> 8])
fh.write(data + bcrc)
dlgt = Delegate()
prev = time.time() - INTERVAL