auracaster/bumble_mirror
3
0
Fork 1
mirror of https://github.com/google/bumble.git synced 2026-04-16 00:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Gilles Boccon-Gibod
2025-07-26 21:20:52 -07:00
parent cce2e4d4e3
commit d611d25802
66 changed files with 180 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/intel_util.py
View File

@@ -17,7 +17,6 @@
# -----------------------------------------------------------------------------
import logging
import asyncio
import os
from typing import Any, Optional
import click
@@ -26,6 +25,8 @@ from bumble.colors import color
from bumble import transport
from bumble.drivers import intel
from bumble.host import Host
import bumble.logging
# -----------------------------------------------------------------------------
# Logging
@@ -107,7 +108,7 @@ async def do_bootloader(usb_transport: str, force: bool) -> None:
# -----------------------------------------------------------------------------
@click.group()
def main():
logging.basicConfig(level=os.environ.get('BUMBLE_LOGLEVEL', 'INFO').upper())
bumble.logging.setup_basic_logging()
@main.command

7
tools/rtk_util.py
View File

@@ -15,15 +15,16 @@
# -----------------------------------------------------------------------------
# Imports
# -----------------------------------------------------------------------------
import logging
import asyncio
import os
import logging
import click
from bumble import transport
from bumble.host import Host
from bumble.drivers import rtk
import bumble.logging
# -----------------------------------------------------------------------------
# Logging
@@ -112,7 +113,7 @@ async def do_info(usb_transport, force):
# -----------------------------------------------------------------------------
@click.group()
def main():
logging.basicConfig(level=os.environ.get('BUMBLE_LOGLEVEL', 'INFO').upper())
bumble.logging.setup_basic_logging()
@main.command