Reformat code using black

This commit is contained in:
2020-08-16 00:00:08 +02:00
parent 000e3d7f8a
commit 607bb18fb3
15 changed files with 317 additions and 217 deletions

View File

@ -12,4 +12,4 @@ class BatteryLevelChar(ZeiCharBase.ZeiCharBase):
charUUID = btle.AssignedNumbers.battery_level
def __init__(self, periph):
super.__init__(self, periph)
super.__init__(self, periph)

View File

@ -6,12 +6,12 @@ from bluepy import btle
from . import ZeiOrientationChar
from . import ZeiDelegate
class Zei(btle.Peripheral):
class Zei(btle.Peripheral):
def __init__(self, *args, **kwargs):
btle.Peripheral.__init__(self, *args, **kwargs)
self.withDelegate(ZeiDelegate.ZeiDelegate(self))
# activate notifications about turn
self.orientation = ZeiOrientationChar.ZeiOrientationChar(self)
self.orientation.enable()
self.orientation.enable()

View File

@ -6,12 +6,11 @@ import struct
class ZeiCharBase(object):
def __init__(self, periph):
self.periph = periph
self.hndl = None
#self.svcUUID = None
#self.charUUID = None
# self.svcUUID = None
# self.charUUID = None
# pylint: disable=E1101
def enable(self):
@ -20,5 +19,7 @@ class ZeiCharBase(object):
self.hndl = _chr.getHandle()
# this is uint16_t - see: https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml
_cccd = _chr.getDescriptors(btle.AssignedNumbers.client_characteristic_configuration)[0]
_cccd = _chr.getDescriptors(
btle.AssignedNumbers.client_characteristic_configuration
)[0]
_cccd.write(struct.pack("<H", 2), withResponse=True)

View File

@ -7,14 +7,13 @@ from .Log import _log
class ZeiDelegate(btle.DefaultDelegate):
def __init__(self, periph):
btle.DefaultDelegate.__init__(self)
self.parent = periph
def handleNotification(self, cHandle, data):
if cHandle == 38:
side = struct.unpack('B', data)[0]
_log.info("Current side up is %s", side )
side = struct.unpack("B", data)[0]
_log.info("Current side up is %s", side)
else:
_log.info("Notification from hndl: %s - %r", cHandle, data)
_log.info("Notification from hndl: %s - %r", cHandle, data)

View File

@ -6,18 +6,17 @@ from bluepy import btle
class ZeiDiscovery(btle.Scanner):
def __init__(self, periph=None, **kwargs):
self.zei = periph
btle.Scanner.__init__(self, **kwargs)
#self.withDelegate(ZeiDiscoveryDelegate(self, self.zei))
#self.stop_scanning = False
# self.withDelegate(ZeiDiscoveryDelegate(self, self.zei))
# self.stop_scanning = False
def reconnect(self):
self.iface=self.zei.iface
self.iface = self.zei.iface
self.clear()
self.start()
while self.zei.addr not in self.scanned:
self.process(timeout=2)
self.stop()
self.zei.connect(self.scanned[self.zei.addr])
self.zei.connect(self.scanned[self.zei.addr])

View File

@ -13,7 +13,7 @@ class ZeiDiscoveryDelegate(btle.DefaultDelegate):
self.periph = periph
def handleDiscovery(self, dev, isNewDev, isNewData):
if not dev.addr == 'f1:05:a5:9c:2e:9b':
if not dev.addr == "f1:05:a5:9c:2e:9b":
return
_log.info("Device %s (%s), RSSI=%d dB", dev.addr, dev.addrType, dev.rssi)
for (_, desc, value) in dev.getScanData():
@ -22,7 +22,7 @@ class ZeiDiscoveryDelegate(btle.DefaultDelegate):
# bluepy can only do one thing at a time, so stop scanning while trying to connect
# this is not supported by bluepy
#self.scanner.stop()
# self.scanner.stop()
try:
self.periph.connect(dev)
@ -30,4 +30,4 @@ class ZeiDiscoveryDelegate(btle.DefaultDelegate):
except:
# re
self.scanner.start()
pass
pass

View File

@ -4,8 +4,10 @@
from . import ZeiCharBase
def _ZEI_UUID(short_uuid):
return 'c7e7%04X-c847-11e6-8175-8c89a55d403c' % (short_uuid)
return "c7e7%04X-c847-11e6-8175-8c89a55d403c" % (short_uuid)
class ZeiOrientationChar(ZeiCharBase.ZeiCharBase):
svcUUID = _ZEI_UUID(0x0010)

View File

@ -1 +1 @@
# Empty
# Empty