meshcore-cli 1.3.5__tar.gz → 1.3.11__tar.gz

{meshcore_cli-1.3.5 → meshcore_cli-1.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.3.5
+Version: 1.3.11
 Summary: Command line interface to meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore-cli
 Project-URL: Issues, https://github.com/fdlamotte/meshcore-cli/issues
@@ -10,7 +10,8 @@ License-File: LICENSE
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: meshcore>=2.2.2
+Requires-Dist: bleak<2.0,>=0.22
+Requires-Dist: meshcore>=2.2.3
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pycryptodome
 Requires-Dist: requests>=2.28.0

{meshcore_cli-1.3.5 → meshcore_cli-1.3.11}/flake.nix

@@ -4,9 +4,11 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
 
-  outputs = inputs:
+  outputs =
+    inputs:
     inputs.flake-utils.lib.eachDefaultSystem (
-      system: let
+      system:
+      let
         pkgs = inputs.nixpkgs.legacyPackages.${system};
 
         lib = pkgs.lib;
@@ -15,15 +17,15 @@
 
         meshcore = python3Packages.buildPythonPackage rec {
           pname = "meshcore";
-          version = "2.2.1";
+          version = "2.2.2";
           pyproject = true;
 
           src = python3Packages.fetchPypi {
             inherit pname version;
-            sha256 = "sha256-HpCbGG+ZQdVWIeE3mJFFQ7w5W+JjcNb+Tb53i9uT5CA=";
+            sha256 = "sha256-vn/vF4avMDwDLL0EMVrrMWkZrZ1GTiUxGyTBOtKvG1I=";
           };
 
-          build-system = [python3Packages.hatchling];
+          build-system = [ python3Packages.hatchling ];
 
           dependencies = [
             python3Packages.bleak
@@ -31,12 +33,13 @@
             python3Packages.pyserial-asyncio
           ];
 
-          pythonImportsCheck = ["meshcore"];
+          pythonImportsCheck = [ "meshcore" ];
         };
 
         pyproject = lib.importTOML ./pyproject.toml;
         version = pyproject.project.version;
-      in {
+      in
+      {
         packages.meshcore-cli = python3Packages.buildPythonPackage {
           pname = "meshcore-cli";
           inherit version;
@@ -57,7 +60,7 @@
             python3Packages.prompt_toolkit
             python3Packages.pyserial
             python3Packages.requests
-			python3Packages.pycryptodome
+            python3Packages.pycryptodome
           ];
 
           doCheck = false;

{meshcore_cli-1.3.5 → meshcore_cli-1.3.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.3.5"
+version = "1.3.11"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
 ]
@@ -17,7 +17,11 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 2.2.2", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0", "pycryptodome" ]
+dependencies = [ "meshcore >= 2.2.3",
+				 "bleak >= 0.22, <2.0", 
+				 "prompt_toolkit >= 3.0.50", 
+				 "requests >= 2.28.0", 
+				 "pycryptodome" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-1.3.5 → meshcore_cli-1.3.11}/src/meshcore_cli/meshcore_cli.py

@@ -10,7 +10,7 @@ import getopt, json, shlex, re
 import logging
 import requests
 from bleak import BleakScanner, BleakClient
-from bleak.exc import BleakError
+from bleak.exc import BleakError, BleakDBusError
 import serial.tools.list_ports
 from pathlib import Path
 import traceback
@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.3.5"
+VERSION = "v1.3.11"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -130,10 +130,23 @@ async def process_event_message(mc, ev, json_output, end="\n", above=False):
         await mc.ensure_contacts()
         data = ev.payload
 
+        path_str = ""
+
+        if process_event_message.timestamp != "" and process_event_message.timestamp != "off":
+            ts = data["sender_timestamp"]
+            if process_event_message.timestamp == "on":
+                if (abs(time.time()-ts) < 86400):
+                    fmt = "%H:%M"
+                else:
+                    fmt = "%y-%m-%d %H:%M"
+            else:
+                fmt = process_event_message.timestamp
+            path_str += f'{datetime.datetime.fromtimestamp(ts).strftime(fmt)},'
+
         if data['path_len'] == 255 :
-            path_str = "D"
+            path_str += "D"
         else :
-            path_str = f"{data['path_len']}"
+            path_str += f"{data['path_len']}"
         if "SNR" in data and process_event_message.print_snr:
             path_str = path_str + f",{data['SNR']}dB"
 
@@ -206,6 +219,7 @@ async def process_event_message(mc, ev, json_output, end="\n", above=False):
 process_event_message.print_snr=False
 process_event_message.color=True
 process_event_message.last_node=None
+process_event_message.timestamp=""
 
 async def handle_log_rx(event):
     mc = handle_log_rx.mc
@@ -292,6 +306,57 @@ async def handle_log_rx(event):
                 else:
                     print(txt)
 
+    elif payload_type == 0x04: # Advert
+        if handle_log_rx.advert_echoes:
+            pk_buf = io.BytesIO(pkt_payload)
+            adv_key = pk_buf.read(32).hex()
+            adv_timestamp = int.from_bytes(pk_buf.read(4), "little", signed=False)
+            signature = pk_buf.read(64).hex()
+            flags = pk_buf.read(1)[0]
+            adv_type = flags & 0x0F
+            adv_lat = None
+            adv_lon = None
+            if flags & 0x10 > 0: #has location
+                adv_lat = int.from_bytes(pk_buf.read(4), "little", signed=True)/1000000.0
+                adv_lon = int.from_bytes(pk_buf.read(4), "little", signed=True)/1000000.0
+            if flags & 0x20 > 0: #has feature1
+                adv_feat1 = pk_buf.read(2).hex()
+            if flags & 0x40 > 0: #has feature2
+                adv_feat2 = pk_buf.read(2).hex()
+            if flags & 0x80 > 0: #has name
+                adv_name = pk_buf.read().decode("utf-8").strip("\x00")
+
+            if adv_name is None: 
+                # try to get the name from the contact 
+                ct = handle_log_rx.mc.get_contact_by_key_prefix(adv_key)
+                if ct is None:
+                    adv_name = adv_key[0:12]
+                else:
+                    adv_name = ct["adv_name"]
+
+            ts_str = ""
+            if process_event_message.timestamp != "" and process_event_message.timestamp != "off":
+                ts = adv_timestamp
+                if process_event_message.timestamp == "on":
+                    if (abs(time.time()-ts) < 86400):
+                        fmt = "%H:%M"
+                    else:
+                        fmt = "%y-%m-%d %H:%M"
+                else:
+                    fmt = process_event_message.timestamp
+                ts_str = f' at {datetime.datetime.fromtimestamp(ts).strftime(fmt)}'
+
+            txt = f"{ANSI_LIGHT_GRAY}Advert for{ANSI_END} {adv_name}{ANSI_GREEN}/{CONTACT_TYPENAMES[adv_type]}{ts_str}{ANSI_END}"
+            if not adv_lat is None:
+                txt += f" {ANSI_LIGHT_GRAY}coords: {adv_lat},{adv_lon}"
+            txt += f" {ANSI_YELLOW}path: [{path}] {ANSI_LIGHT_GRAY}snr: {event.payload['snr']:.2f}dB{ANSI_END}"
+
+            if handle_message.above:
+                print_above(txt)
+            else:
+                print(txt)
+
+
     if handle_log_rx.json_log_rx: # json mode ... raw dump
         msg = json.dumps(event.payload)
         if handle_message.above:
@@ -302,6 +367,7 @@ async def handle_log_rx(event):
 
 handle_log_rx.json_log_rx = False
 handle_log_rx.channel_echoes = False
+handle_log_rx.advert_echoes = False
 handle_log_rx.mc = None
 handle_log_rx.echo_unk_chans=False
 
@@ -473,6 +539,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
 
     completion_list = {
         "to" : to_list,
+        "/to" : to_list,
         "public" : None,
         "chan" : None,
     }
@@ -518,6 +585,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "self_telemetry" : None,
         "get_channel": None,
         "set_channel": None,
+        "add_channel": None,
         "get_channels": None,
         "remove_channel": None,
         "apply_to": None,
@@ -532,12 +600,15 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "lat" : None,
             "lon" : None,
             "coords" : None,
+            "private_key": None,
             "print_snr" : {"on":None, "off": None},
+            "print_timestamp" : {"on":None, "off": None, "%Y:%M":None},
             "json_msgs" : {"on":None, "off": None},
             "color" : {"on":None, "off":None},
             "print_adverts" : {"on":None, "off":None},
             "json_log_rx" : {"on":None, "off":None},
             "channel_echoes" : {"on":None, "off":None},
+            "advert_echoes" : {"on":None, "off":None},
             "echo_unk_chans" : {"on":None, "off":None},
             "print_new_contacts" : {"on": None, "off":None},
             "print_path_updates" : {"on":None,"off":None},
@@ -561,12 +632,15 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "coords":None,
             "lat":None,
             "lon":None,
+            "private_key":None,
             "print_snr":None,
+            "print_timestamp":None,
             "json_msgs":None,
             "color":None,
             "print_adverts":None,
             "json_log_rx":None,
             "channel_echoes":None,
+            "advert_echoes":None,
             "echo_unk_chans":None,
             "print_path_updates":None,
             "print_new_contacts":None,
@@ -594,6 +668,12 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "?pending_contacts":None,
         "?add_pending":None,
         "?flush_pending":None,
+        "?get_channels":None,
+        "?set_channel":None,
+        "?get_channel":None,
+        "?set_channel":None,
+        "?add_channel":None,
+        "?remove_channel":None,
     }
 
     contact_completion_list = {
@@ -782,8 +862,6 @@ Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
 
     await subscribe_to_msgs(mc, above=True)
 
-    handle_new_contact.print_new_contacts = True
-
     try:
         if os.path.isdir(MCCLI_CONFIG_DIR) :
             our_history = FileHistory(MCCLI_HISTORY_FILE)
@@ -923,6 +1001,9 @@ Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
                     except IndexError:
                         print(scope)
 
+            elif line == "quit" or line == "q" or line == "/quit" or line == "/q" :
+                break
+
             elif contact is None and (line.startswith("apply_to ") or line.startswith("at ")) or\
                  line.startswith("/apply_to ") or line.startswith("/at ") :
                 try:
@@ -930,52 +1011,8 @@ Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
                 except IndexError:
                     logger.error(f"Error with apply_to command parameters")
 
-            elif line.startswith("/") :
-                path = line.split(" ", 1)[0]
-                if path.count("/") == 1:
-                    args = line[1:].split(" ")
-                    dest = args[0]
-                    dest_scope = None
-                    if "%" in dest :
-                        dest_scope = dest.split("%")[-1]
-                        dest = dest[:-len(dest_scope)-1]
-                        await set_scope (mc, dest_scope)
-                    tct = mc.get_contact_by_name(dest)
-                    if len(args)>1 and not tct is None: # a contact, send a message
-                        if tct["type"] == 1 or tct["type"] == 3: # client or room
-                            last_ack = await msg_ack(mc, tct, line.split(" ", 1)[1])
-                        else:
-                            print("Can only send msg to chan, client or room")
-                    else :
-                        ch = await get_channel_by_name(mc, dest)
-                        if len(args)>1 and not ch is None: # a channel, send message
-                            await send_chan_msg(mc, ch["channel_idx"], line.split(" ", 1)[1])
-                        else :
-                            try :
-                                await process_cmds(mc, shlex.split(line[1:]))
-                            except ValueError:
-                                logger.error(f"Error processing line{line[1:]}")
-                else:
-                    cmdline = line[1:].split("/",1)[1]
-                    contact_name = path[1:].split("/",1)[0]
-                    dest_scope = None
-                    if "%" in contact_name:
-                        dest_scope = contact_name.split("%")[-1]
-                        contact_name = contact_name[:-len(dest_scope)-1]
-                        await set_scope (mc, dest_scope)
-                    tct = mc.get_contact_by_name(contact_name)
-                    if tct is None:
-                        print(f"{contact_name} is not a contact")
-                    else:
-                        if not await process_contact_chat_line(mc, tct, cmdline):
-                            if cmdline != "":
-                                if tct["type"] == 1:
-                                    last_ack = await msg_ack(mc, tct, cmdline)
-                                else :
-                                    await process_cmds(mc, ["cmd", tct["adv_name"], cmdline])
-
-            elif line.startswith("to ") : # dest
-                dest = line[3:]
+            elif line.startswith("to ") or line.startswith("/to "): # dest
+                dest = line.split(" ", 1)[1]
                 if dest.startswith("\"") or dest.startswith("\'") : # if name starts with a quote
                     dest = shlex.split(dest)[0] # use shlex.split to get contact name between quotes
                 dest_scope = None
@@ -1021,14 +1058,55 @@ Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
                     if not dest_scope is None:
                         scope = await set_scope(mc, dest_scope)
 
-            elif line == "to" :
+            elif line == "to" or line == "/to" :
                 if contact is None :
                     print(mc.self_info['name'])
                 else:
                     print(contact["adv_name"])
 
-            elif line == "quit" or line == "q" :
-                break
+            elif line.startswith("/") :
+                path = line.split(" ", 1)[0]
+                if path.count("/") == 1:
+                    args = line[1:].split(" ")
+                    dest = args[0]
+                    dest_scope = None
+                    if "%" in dest :
+                        dest_scope = dest.split("%")[-1]
+                        dest = dest[:-len(dest_scope)-1]
+                        await set_scope (mc, dest_scope)
+                    tct = mc.get_contact_by_name(dest)
+                    if len(args)>1 and not tct is None: # a contact, send a message
+                        if tct["type"] == 1 or tct["type"] == 3: # client or room
+                            last_ack = await msg_ack(mc, tct, line.split(" ", 1)[1])
+                        else:
+                            print("Can only send msg to chan, client or room")
+                    else :
+                        ch = await get_channel_by_name(mc, dest)
+                        if len(args)>1 and not ch is None: # a channel, send message
+                            await send_chan_msg(mc, ch["channel_idx"], line.split(" ", 1)[1])
+                        else :
+                            try :
+                                await process_cmds(mc, shlex.split(line[1:]))
+                            except ValueError:
+                                logger.error(f"Error processing line{line[1:]}")
+                else:
+                    cmdline = line[1:].split("/",1)[1]
+                    contact_name = path[1:].split("/",1)[0]
+                    dest_scope = None
+                    if "%" in contact_name:
+                        dest_scope = contact_name.split("%")[-1]
+                        contact_name = contact_name[:-len(dest_scope)-1]
+                        await set_scope (mc, dest_scope)
+                    tct = mc.get_contact_by_name(contact_name)
+                    if tct is None:
+                        print(f"{contact_name} is not a contact")
+                    else:
+                        if not await process_contact_chat_line(mc, tct, cmdline):
+                            if cmdline != "":
+                                if tct["type"] == 1:
+                                    last_ack = await msg_ack(mc, tct, cmdline)
+                                else :
+                                    await process_cmds(mc, ["cmd", tct["adv_name"], cmdline])
 
             # commands that take one parameter (don't need quotes)
             elif line.startswith("public ") :
@@ -1527,8 +1605,11 @@ async def set_scope (mc, scope) :
         return scope
 
     res = await mc.commands.set_flood_scope(scope)
-    if res is None or res.type == EventType.ERROR:
-        if not res is None and res.payload["error_code"] == 1: #unsupported
+    if res is None :
+        return None
+
+    if res.type == EventType.ERROR:
+        if "error_code" in res.payload and res.payload["error_code"] == 1: #unsupported
             set_scope.has_scope = False
         return None
 
@@ -1556,13 +1637,18 @@ async def get_channel (mc, chan) :
 
 async def set_channel (mc, chan, name, key=None):
 
-    if chan.isnumeric():
-        nb = int(chan)
+    if isinstance(chan, str):
+        if chan.isnumeric():
+            nb = int(chan)
+        else:
+            c = await get_channel_by_name(mc, chan)
+            if c is None:
+                return None
+            nb = c['channel_idx']
+    elif isinstance(chan, int):
+        nb = chan
     else:
-        c = await get_channel_by_name(mc, chan)
-        if c is None:
-            return None
-        nb = c['channel_idx']
+        return None
 
     res = await mc.commands.set_channel(nb, name, key)
 
@@ -1874,6 +1960,10 @@ async def next_cmd(mc, cmds, json_output=False):
                         process_event_message.color = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
+                    case "print_timestamp" :
+                        process_event_message.timestamp = cmds[2]
+                        if json_output :
+                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
                     case "print_snr" :
                         process_event_message.print_snr = (cmds[2] == "on")
                         if json_output :
@@ -1886,6 +1976,10 @@ async def next_cmd(mc, cmds, json_output=False):
                         handle_log_rx.channel_echoes = (cmds[2] == "on")
                         if json_output :
                             print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
+                    case "advert_echoes" :
+                        handle_log_rx.advert_echoes = (cmds[2] == "on")
+                        if json_output :
+                            print(json.dumps({"cmd" : cmds[1], "param" : cmds[2]}))
                     case "echo_unk_chans" :
                         handle_log_rx.echo_unk_chans = (cmds[2] == "on")
                         if json_output :
@@ -1983,6 +2077,16 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps(res.payload, indent=4))
                         else:
                             print("ok")
+                    case "private_key":
+                        params=bytes.fromhex(cmds[2])
+                        res = await mc.commands.import_private_key(params)
+                        logger.debug(res)
+                        if res.type == EventType.ERROR:
+                            print(f"Error: {res}")
+                        elif json_output :
+                            print(json.dumps(res.payload, indent=4))
+                        else:
+                            print("ok")
                     case "tuning":
                         params=cmds[2].commands.split(",")
                         res = await mc.commands.set_tuning(
@@ -2101,6 +2205,11 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"color" : process_event_message.color}))
                         else:
                             print(f"{'on' if process_event_message.color else 'off'}")
+                    case "print_timestamp":
+                        if json_output :
+                            print(json.dumps({"timestamp" : process_event_message.timestamp}))
+                        else:
+                            print(f"{process_event_message.timestamp}")
                     case "json_log_rx":
                         if json_output :
                             print(json.dumps({"json_log_rx" : handle_log_rx.json_log_rx}))
@@ -2111,6 +2220,11 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"channel_echoes" : handle_log_rx.channel_echoes}))
                         else:
                             print(f"{'on' if handle_log_rx.channel_echoes else 'off'}")
+                    case "advert_echoes":
+                        if json_output :
+                            print(json.dumps({"advert_echoes" : handle_log_rx.channel_echoes}))
+                        else:
+                            print(f"{'on' if handle_log_rx.advert_echoes else 'off'}")
                     case "echo_unk_chans":
                         if json_output :
                             print(json.dumps({"echo_unk_chans" : handle_log_rx.echo_unk_chans}))
@@ -2185,6 +2299,16 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps(res.payload, indent=4))
                         else:
                             print(f"Battery level : {res.payload['level']}")
+                    case "private_key":
+                        res = await mc.commands.export_private_key()
+                        logger.debug(res)
+                        if res.type == EventType.ERROR:
+                            print(f"Error exporting private key {res}")
+                        elif json_output :
+                            res.payload["private_key"] = res.payload["private_key"].hex()
+                            print(json.dumps(res.payload))
+                        else:
+                            print(f"Private key: {res.payload['private_key'].hex()}")
                     case "fstats" :
                         res = await mc.commands.get_bat()
                         logger.debug(res)
@@ -2313,11 +2437,17 @@ async def next_cmd(mc, cmds, json_output=False):
                 if res is None:
                     print("Error setting channel")
 
-            case "scope":
-                argnum = 1
-                res = await set_scope(mc, cmds[1])
+            case "add_channel":
+                argnum = 2
+                if cmds[1].startswith("#") or len(cmds) == 2:
+                    argnum = 1
+                    res = await set_channel(mc, "", cmds[1])
+                elif len(cmds[2]) != 32:
+                    res = None
+                else:
+                    res = await set_channel(mc, "", cmds[1], bytes.fromhex(cmds[3]))
                 if res is None:
-                    print(f"Error while setting scope")
+                    print("Error adding channel")
 
             case "remove_channel":
                 argnum = 1
@@ -2325,6 +2455,12 @@ async def next_cmd(mc, cmds, json_output=False):
                 if res is None:
                     print("Error deleting channel")
 
+            case "scope":
+                argnum = 1
+                res = await set_scope(mc, cmds[1])
+                if res is None:
+                    print(f"Error while setting scope")
+
             case "reboot" :
                 res = await mc.commands.reboot()
                 logger.debug(res)
@@ -3202,7 +3338,8 @@ def command_help():
     msgs_subscribe         : display msgs as they arrive            ms
     get_channels           : prints all channel info
     get_channel <n>        : get info for channel (by number or name)
-    set_channel n nm k     : set channel info (nb, name, key)
+    set_channel n nm [k]   : set channel info (nb, name, key)
+    add_channel name [key] : add new channel with optional key
     remove_channel <n>     : remove channel (by number or name)
     scope <s>              : sets scope for flood messages
   Management
@@ -3318,6 +3455,7 @@ def get_help_for (cmdname, context="line") :
     lon                : longitude
     radio              : radio parameters
     tx                 : tx power
+    private_key        : private key of the node
     print_snr          : snr display in messages
     print_adverts      : display adverts as they come
     print_new_contacts : display new pending contacts when available
@@ -3336,6 +3474,7 @@ def get_help_for (cmdname, context="line") :
     name <name>                 : node name
     lat <lat>                   : latitude
     lon <lon>                   : longitude
+    private_key                 : private key 
     coords <lat,lon>            : coordinates
     multi_ack <on/off>          : multi-acks feature
     telemetry_mode_base <mode>  : set basic telemetry mode all/selected/off
@@ -3347,12 +3486,14 @@ def get_help_for (cmdname, context="line") :
       - when on contacts must be added manually using add_pending 
         (pending contacts list is built by meshcli from adverts while connected) 
   display:
+    print_timestamp <on/off/fmt>: toggle printing of timestamp, can be strftime format
     print_snr <on/off>          : toggle snr display in messages
     print_adverts <on/off>      : display adverts as they come
     print_new_contacts <on/off> : display new pending contacts when available
     print_path_updates <on/off> : display path updates as they come
     json_log_rx <on/off>        : logs packets incoming to device as json
     channel_echoes <on/off>     : print repeats for channel data
+    advert_echoes <on/off>      : print repeats for adverts
     echo_unk_channels <on/off>  : also dump unk channels (encrypted)
     color <on/off>              : color off should remove ANSI codes from output
   meshcore-cli behaviour:
@@ -3397,6 +3538,30 @@ With growing number of users, it becomes necessary to manage contact list and on
 This feature only really works in interactive mode.
 
 Note: There is also an auto_update_contacts setting that has nothing to do with adding contacts, it permits to automatically sync contact lists between device and meshcore-cli (when there is an update in name, location or path).
+""")
+
+    elif "channel" in cmdname:
+        print("""Channel management
+
+Channels are used to send messages to a group of people. This group of people share a common key, used to encrypt, identify and decrypt the messages that are sent flood over the network (possibly with a scope).
+
+    Channel commands are the following:
+        - get_channels
+        - get_channel chan
+        - add_channel name [key]
+        - set_channel chan name [key]
+        - remove_channel chan
+
+There is a fixed number of slots on companions to store channel messages, each channel has a number, a name and a key, the get_channels command lists theses slots.
+
+You can also call get_channel (with number or name) to get information about one channel.
+
+Adding a channel can be done using the set_channel command, taking as parameters the channel number, the name and the key. Key is optional, if not provided, it will be computed from the name.
+ The add_channel command won't take a number as it will use first available slot.
+
+There is a special case for auto channels, which starts with a #, these have always their key computed from the name (note that mccli does not lowercase and strip characters so you should be carefull when sharing when users of the android app or ripple).
+
+To remove a channel, use remove_channel, either with channel name or number.
 """)
 
     else:
@@ -3473,7 +3638,7 @@ async def main(argv):
                     for d in devices :
                         if not d.name is None and d.name.startswith("MeshCore-"):
                             print(f" {d.address}  {d.name}")
-                except BleakError:
+                except (BleakError, BleakDBusError):
                     print(" No BLE HW")
                 print("\nSerial ports:")
                 ports = serial.tools.list_ports.comports()
@@ -3488,7 +3653,7 @@ async def main(argv):
                     for d in devices:
                         if not d.name is None and d.name.startswith("MeshCore-"):
                             choices.append(({"type":"ble","device":d}, f"{d.address:<22} {d.name}"))
-                except BleakError:
+                except (BleakError, BleakDBusError):
                     logger.info("No BLE Device")
 
                 ports = serial.tools.list_ports.comports()
@@ -3537,7 +3702,14 @@ async def main(argv):
                 logger.info(f"Searching first MC BLE device")
             else:
                 logger.info(f"Scanning BLE for device matching {address}")
-            devices = await BleakScanner.discover(timeout=timeout)
+            try:
+                devices = await BleakScanner.discover(timeout=timeout)
+            except (BleakError, BleakDBusError):
+                print("BLE connection asked (default behaviour), but no BLE HW found")
+                print("Call meshcore-cli with -h for some more help (on commands)")
+                command_usage()
+                return            
+
             found = False
             for d in devices:
                 if not d.name is None and d.name.startswith("MeshCore-") and\
@@ -3559,7 +3731,7 @@ async def main(argv):
 
         try :
             mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
-        except BleakError :
+        except (BleakError, BleakDBusError):
             print("BLE connection asked (default behaviour), but no BLE HW found")
             print("Call meshcore-cli with -h for some more help (on commands)")
             command_usage()