diff --git a/CircuitPython_Logger/aio_test/aio_handler.py b/CircuitPython_Logger/aio_test/aio_handler.py index 4caadc0b8..936f38821 100644 --- a/CircuitPython_Logger/aio_test/aio_handler.py +++ b/CircuitPython_Logger/aio_test/aio_handler.py @@ -24,7 +24,7 @@ class AIOHandler(Handler): def __init__(self, name, portal_device, level: int = NOTSET): """Create an instance.""" - super().__init__(name) + super().__init__(level) self._log_feed_name = f"{name}-logging" if not issubclass(type(portal_device), PortalBase): raise TypeError( diff --git a/CircuitPython_Logger/aio_test/code.py b/CircuitPython_Logger/aio_test/code.py index f2823bb08..fb3f38535 100644 --- a/CircuitPython_Logger/aio_test/code.py +++ b/CircuitPython_Logger/aio_test/code.py @@ -13,23 +13,21 @@ device = PyPortal() l = logging.getLogger("aio") l.addHandler(AIOHandler("test", device)) - -def go(): - while True: - t = random.randint(1, 5) - if t == 1: - print("debug") - l.debug("debug message: %d", random.randint(0, 1000)) - elif t == 2: - print("info") - l.info("info message: %d", random.randint(0, 1000)) - elif t == 3: - print("warning") - l.warning("warning message: %d", random.randint(0, 1000)) - elif t == 4: - print("error") - l.error("error message: %d", random.randint(0, 1000)) - elif t == 5: - print("critical") - l.critical("critical message: %d", random.randint(0, 1000)) - time.sleep(5.0 + (random.random() * 5.0)) +while True: + t = random.randint(1, 5) + if t == 1: + print("debug") + l.debug("debug message: %d", random.randint(0, 1000)) + elif t == 2: + print("info") + l.info("info message: %d", random.randint(0, 1000)) + elif t == 3: + print("warning") + l.warning("warning message: %d", random.randint(0, 1000)) + elif t == 4: + print("error") + l.error("error message: %d", random.randint(0, 1000)) + elif t == 5: + print("critical") + l.critical("critical message: %d", random.randint(0, 1000)) + time.sleep(5.0 + (random.random() * 5.0)) diff --git a/CircuitPython_Logger/ble_test/ble_handler.py b/CircuitPython_Logger/ble_test/ble_handler.py index b60de5a36..3e8aa7510 100644 --- a/CircuitPython_Logger/ble_test/ble_handler.py +++ b/CircuitPython_Logger/ble_test/ble_handler.py @@ -18,7 +18,10 @@ All text above must be included in any redistribution. from adafruit_logging import Handler, NOTSET -from adafruit_ble.uart import UARTServer + +from adafruit_ble import BLERadio +from adafruit_ble.advertising.standard import ProvideServicesAdvertisement +from adafruit_ble.services.nordic import UARTService class BLEHandler(Handler): @@ -31,8 +34,10 @@ class BLEHandler(Handler): """ super().__init__(level) self._advertising_now = False - self._uart = UARTServer() - self._uart.start_advertising() + ble = BLERadio() + self._uart = UARTService() + self._advertisement = ProvideServicesAdvertisement(self._uart) + ble.start_advertising(self._advertisement) def format(self, record): """Generate a string to log. @@ -46,7 +51,5 @@ class BLEHandler(Handler): :param record: The record (message object) to be logged """ - while not self._uart.connected: - pass data = bytes(self.format(record), "utf-8") self._uart.write(data) diff --git a/CircuitPython_Logger/ble_test/code.py b/CircuitPython_Logger/ble_test/code.py index 09ef7e039..77d11eb7a 100644 --- a/CircuitPython_Logger/ble_test/code.py +++ b/CircuitPython_Logger/ble_test/code.py @@ -11,23 +11,21 @@ l = logging.getLogger("ble") l.addHandler(BLEHandler()) - -def go(): - while True: - t = random.randint(1, 5) - if t == 1: - print("debug") - l.debug("%d", random.randint(0, 1000)) - elif t == 2: - print("info") - l.info("%d", random.randint(0, 1000)) - elif t == 3: - print("warning") - l.warning("%d", random.randint(0, 1000)) - elif t == 4: - print("error") - l.error("%d", random.randint(0, 1000)) - elif t == 5: - print("critical") - l.critical(" %d", random.randint(0, 1000)) - time.sleep(5.0 + (random.random() * 5.0)) +while True: + t = random.randint(1, 5) + if t == 1: + print("debug") + l.debug("%d", random.randint(0, 1000)) + elif t == 2: + print("info") + l.info("%d", random.randint(0, 1000)) + elif t == 3: + print("warning") + l.warning("%d", random.randint(0, 1000)) + elif t == 4: + print("error") + l.error("%d", random.randint(0, 1000)) + elif t == 5: + print("critical") + l.critical(" %d", random.randint(0, 1000)) + time.sleep(5.0 + (random.random() * 5.0)) diff --git a/CircuitPython_Logger/file_test/code.py b/CircuitPython_Logger/file_test/code.py index 188239008..14e8f7fb6 100644 --- a/CircuitPython_Logger/file_test/code.py +++ b/CircuitPython_Logger/file_test/code.py @@ -24,23 +24,21 @@ storage.mount(vfs, "/sd") l = logging.getLogger("file") l.addHandler(logging.FileHandler("/sd/test.txt")) - -def go(): - while True: - t = random.randint(1, 5) - if t == 1: - print("debug") - l.debug("debug message: %d", random.randint(0, 1000)) - elif t == 2: - print("info") - l.info("info message: %d", random.randint(0, 1000)) - elif t == 3: - print("warning") - l.warning("warning message: %d", random.randint(0, 1000)) - elif t == 4: - print("error") - l.error("error message: %d", random.randint(0, 1000)) - elif t == 5: - print("critical") - l.critical("critical message: %d", random.randint(0, 1000)) - time.sleep(5.0 + (random.random() * 5.0)) +while True: + t = random.randint(1, 5) + if t == 1: + print("debug") + l.debug("debug message: %d", random.randint(0, 1000)) + elif t == 2: + print("info") + l.info("info message: %d", random.randint(0, 1000)) + elif t == 3: + print("warning") + l.warning("warning message: %d", random.randint(0, 1000)) + elif t == 4: + print("error") + l.error("error message: %d", random.randint(0, 1000)) + elif t == 5: + print("critical") + l.critical("critical message: %d", random.randint(0, 1000)) + time.sleep(5.0 + (random.random() * 5.0))