Skip to content

Commit 1614566

Browse files
committed
fix aio handler init. Fix ble handler functionality. Remove go() function from code.pys
1 parent 463ac65 commit 1614566

File tree

5 files changed

+63
-66
lines changed

5 files changed

+63
-66
lines changed

CircuitPython_Logger/aio_test/aio_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AIOHandler(Handler):
2424

2525
def __init__(self, name, portal_device, level: int = NOTSET):
2626
"""Create an instance."""
27-
super().__init__(name)
27+
super().__init__(level)
2828
self._log_feed_name = f"{name}-logging"
2929
if not issubclass(type(portal_device), PortalBase):
3030
raise TypeError(

CircuitPython_Logger/aio_test/code.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,21 @@
1313
l = logging.getLogger("aio")
1414
l.addHandler(AIOHandler("test", device))
1515

16-
17-
def go():
18-
while True:
19-
t = random.randint(1, 5)
20-
if t == 1:
21-
print("debug")
22-
l.debug("debug message: %d", random.randint(0, 1000))
23-
elif t == 2:
24-
print("info")
25-
l.info("info message: %d", random.randint(0, 1000))
26-
elif t == 3:
27-
print("warning")
28-
l.warning("warning message: %d", random.randint(0, 1000))
29-
elif t == 4:
30-
print("error")
31-
l.error("error message: %d", random.randint(0, 1000))
32-
elif t == 5:
33-
print("critical")
34-
l.critical("critical message: %d", random.randint(0, 1000))
35-
time.sleep(5.0 + (random.random() * 5.0))
16+
while True:
17+
t = random.randint(1, 5)
18+
if t == 1:
19+
print("debug")
20+
l.debug("debug message: %d", random.randint(0, 1000))
21+
elif t == 2:
22+
print("info")
23+
l.info("info message: %d", random.randint(0, 1000))
24+
elif t == 3:
25+
print("warning")
26+
l.warning("warning message: %d", random.randint(0, 1000))
27+
elif t == 4:
28+
print("error")
29+
l.error("error message: %d", random.randint(0, 1000))
30+
elif t == 5:
31+
print("critical")
32+
l.critical("critical message: %d", random.randint(0, 1000))
33+
time.sleep(5.0 + (random.random() * 5.0))

CircuitPython_Logger/ble_test/ble_handler.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

1919

2020
from adafruit_logging import Handler, NOTSET
21-
from adafruit_ble.uart import UARTServer
21+
22+
from adafruit_ble import BLERadio
23+
from adafruit_ble.advertising.standard import ProvideServicesAdvertisement
24+
from adafruit_ble.services.nordic import UARTService
2225

2326

2427
class BLEHandler(Handler):
@@ -31,8 +34,10 @@ def __init__(self, level: int = NOTSET):
3134
"""
3235
super().__init__(level)
3336
self._advertising_now = False
34-
self._uart = UARTServer()
35-
self._uart.start_advertising()
37+
ble = BLERadio()
38+
self._uart = UARTService()
39+
self._advertisement = ProvideServicesAdvertisement(self._uart)
40+
ble.start_advertising(self._advertisement)
3641

3742
def format(self, record):
3843
"""Generate a string to log.
@@ -46,7 +51,5 @@ def emit(self, record):
4651
4752
:param record: The record (message object) to be logged
4853
"""
49-
while not self._uart.connected:
50-
pass
5154
data = bytes(self.format(record), "utf-8")
5255
self._uart.write(data)

CircuitPython_Logger/ble_test/code.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,21 @@
1111

1212
l.addHandler(BLEHandler())
1313

14-
15-
def go():
16-
while True:
17-
t = random.randint(1, 5)
18-
if t == 1:
19-
print("debug")
20-
l.debug("%d", random.randint(0, 1000))
21-
elif t == 2:
22-
print("info")
23-
l.info("%d", random.randint(0, 1000))
24-
elif t == 3:
25-
print("warning")
26-
l.warning("%d", random.randint(0, 1000))
27-
elif t == 4:
28-
print("error")
29-
l.error("%d", random.randint(0, 1000))
30-
elif t == 5:
31-
print("critical")
32-
l.critical(" %d", random.randint(0, 1000))
33-
time.sleep(5.0 + (random.random() * 5.0))
14+
while True:
15+
t = random.randint(1, 5)
16+
if t == 1:
17+
print("debug")
18+
l.debug("%d", random.randint(0, 1000))
19+
elif t == 2:
20+
print("info")
21+
l.info("%d", random.randint(0, 1000))
22+
elif t == 3:
23+
print("warning")
24+
l.warning("%d", random.randint(0, 1000))
25+
elif t == 4:
26+
print("error")
27+
l.error("%d", random.randint(0, 1000))
28+
elif t == 5:
29+
print("critical")
30+
l.critical(" %d", random.randint(0, 1000))
31+
time.sleep(5.0 + (random.random() * 5.0))

CircuitPython_Logger/file_test/code.py

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,21 @@
2424
l = logging.getLogger("file")
2525
l.addHandler(logging.FileHandler("/sd/test.txt"))
2626

27-
28-
def go():
29-
while True:
30-
t = random.randint(1, 5)
31-
if t == 1:
32-
print("debug")
33-
l.debug("debug message: %d", random.randint(0, 1000))
34-
elif t == 2:
35-
print("info")
36-
l.info("info message: %d", random.randint(0, 1000))
37-
elif t == 3:
38-
print("warning")
39-
l.warning("warning message: %d", random.randint(0, 1000))
40-
elif t == 4:
41-
print("error")
42-
l.error("error message: %d", random.randint(0, 1000))
43-
elif t == 5:
44-
print("critical")
45-
l.critical("critical message: %d", random.randint(0, 1000))
46-
time.sleep(5.0 + (random.random() * 5.0))
27+
while True:
28+
t = random.randint(1, 5)
29+
if t == 1:
30+
print("debug")
31+
l.debug("debug message: %d", random.randint(0, 1000))
32+
elif t == 2:
33+
print("info")
34+
l.info("info message: %d", random.randint(0, 1000))
35+
elif t == 3:
36+
print("warning")
37+
l.warning("warning message: %d", random.randint(0, 1000))
38+
elif t == 4:
39+
print("error")
40+
l.error("error message: %d", random.randint(0, 1000))
41+
elif t == 5:
42+
print("critical")
43+
l.critical("critical message: %d", random.randint(0, 1000))
44+
time.sleep(5.0 + (random.random() * 5.0))

0 commit comments

Comments
 (0)