Skip to content

New LogRecord protobuf BLE logging #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianmcorvidae merged 7 commits into from
Jul 2, 2024
Merged

New LogRecord protobuf BLE logging #627

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
188f9d5
Add handler for new log-record BLE characteristic
thebentern Jul 1, 2024
d5a4d86
Merge remote-tracking branch 'origin/master' into protobuf-ble-logging
thebentern Jul 1, 2024
bef9b48
Log Recod logging with new characterstic
thebentern Jul 1, 2024
ce6c096
Fix
thebentern Jul 2, 2024
1936396
Shut up linter
thebentern Jul 2, 2024
5eafc2c
Remove newline handling
thebentern Jul 2, 2024
32b4575
Reorganize imports for pylint
ianmcorvidae Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions meshtastic/ble_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,28 @@
"""
import asyncio
import atexit
import google.protobuf
import logging
import struct
import time
from threading import Thread
from typing import List, Optional

import print_color # type: ignore[import-untyped]

from bleak import BleakClient, BleakScanner, BLEDevice
from bleak.exc import BleakDBusError, BleakError

from meshtastic.mesh_interface import MeshInterface

from .protobuf import (
mesh_pb2,
)
SERVICE_UUID = "6ba1b218-15a8-461f-9fa8-5dcae273eafd"
TORADIO_UUID = "f75c76d2-129e-4dad-a1dd-7866124401e7"
FROMRADIO_UUID = "2c55e69e-4993-11ed-b878-0242ac120002"
FROMNUM_UUID = "ed9da18c-a800-4f66-a670-aa7547e34453"
LOGRADIO_UUID = "6c6fd238-78fa-436b-aacf-15c5be1ef2e2"
LEGACY_LOGRADIO_UUID = "6c6fd238-78fa-436b-aacf-15c5be1ef2e2"
LOGRADIO_UUID = "5a3d6e49-06e6-4423-9944-e9de8cdf9547"


class BLEInterface(MeshInterface):
Expand Down Expand Up @@ -56,6 +61,9 @@ def __init__(
self.close()
raise e

if self.client.has_characteristic(LEGACY_LOGRADIO_UUID):
self.client.start_notify(LEGACY_LOGRADIO_UUID, self.legacy_log_radio_handler)

if self.client.has_characteristic(LOGRADIO_UUID):
self.client.start_notify(LOGRADIO_UUID, self.log_radio_handler)

Expand All @@ -82,6 +90,27 @@ def from_num_handler(self, _, b): # pylint: disable=C0116
self.should_read = True

async def log_radio_handler(self, _, b): # pylint: disable=C0116
log_record = mesh_pb2.LogRecord()
try:
log_record.ParseFromString(bytes(b))
log_record.message = log_record.message.replace("\n", "")

@geeksville geeksville Jul 2, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about instead of this we not include the new line on the sending side? Looks great otherwise.

except google.protobuf.message.DecodeError:
return

message = f'[{log_record.source}] {log_record.message}' if log_record.source else log_record.message

if log_record.DEBUG:
print_color.print(message, color="cyan", end=None)
elif log_record.INFO:
print_color.print(message, color="white", end=None)
elif log_record.WARNING:
print_color.print(message, color="yellow", end=None)
elif log_record.ERROR:
print_color.print(message, color="red", end=None)
else:
print_color.print(message, end=None)

async def legacy_log_radio_handler(self, _, b): # pylint: disable=C0116
log_radio = b.decode("utf-8").replace("\n", "")
if log_radio.startswith("DEBUG"):
print_color.print(log_radio, color="cyan", end=None)
Expand Down