diff --git a/pyproject.toml b/pyproject.toml index 2f95dbf..55319d1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "meshcore-cli" -version = "1.1.22" +version = "1.1.23" authors = [ { name="Florent de Lamotte", email="florent@frizoncorrea.fr" }, ] @@ -17,7 +17,7 @@ classifiers = [ ] license = "MIT" license-files = ["LICEN[CS]E*"] -dependencies = [ "meshcore >= 2.1.6", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ] +dependencies = [ "meshcore >= 2.1.7", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ] [project.urls] Homepage = "https://github.com/fdlamotte/meshcore-cli" diff --git a/src/meshcore_cli/meshcore_cli.py b/src/meshcore_cli/meshcore_cli.py index 694af88..3bb1e82 100644 --- a/src/meshcore_cli/meshcore_cli.py +++ b/src/meshcore_cli/meshcore_cli.py @@ -23,7 +23,7 @@ from prompt_toolkit.shortcuts import radiolist_dialog from meshcore import MeshCore, EventType, logger # Version -VERSION = "v1.1.22" +VERSION = "v1.1.23" # default ble address is stored in a config file MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/" @@ -1413,7 +1413,11 @@ async def next_cmd(mc, cmds, json_output=False): case "set_channel": argnum = 3 - res = await mc.commands.set_channel(int(cmds[1]), cmds[2], bytes.fromhex(cmds[3])) + if cmds[2].startswith("#") or len(cmds) == 3: + argnum = 2 + res = await mc.commands.set_channel(int(cmds[1]), cmds[2]) + else: + res = await mc.commands.set_channel(int(cmds[1]), cmds[2], bytes.fromhex(cmds[3])) logger.debug(res) if res.type == EventType.ERROR: print(f"Error while setting channel")