diff --git a/pyproject.toml b/pyproject.toml index 8ecc19c..7f771cb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "meshcore-cli" -version = "1.0.2" +version = "1.0.3" authors = [ { name="Florent de Lamotte", email="florent@frizoncorrea.fr" }, ] @@ -17,7 +17,7 @@ classifiers = [ ] license = "MIT" license-files = ["LICEN[CS]E*"] -dependencies = [ "meshcore >= 1.9.11", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ] +dependencies = [ "meshcore >= 1.9.12", "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 18982a5..71df29d 100644 --- a/src/meshcore_cli/meshcore_cli.py +++ b/src/meshcore_cli/meshcore_cli.py @@ -22,7 +22,7 @@ from meshcore import TCPConnection, BLEConnection, SerialConnection from meshcore import MeshCore, EventType, logger # Version -VERSION = "v1.0.2" +VERSION = "v1.0.3" # default ble address is stored in a config file MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/" @@ -271,6 +271,7 @@ def make_completion_dict(contacts, to=None): }, "get" : {"name":None, "bat":None, + "fstats": None, "radio":None, "tx":None, "coords":None, @@ -890,6 +891,7 @@ async def next_cmd(mc, cmds, json_output=False): print("""Gets parameters from node name : node name bat : battery level in mV + fstats : fs statistics coords : adv coordinates lat : latitude lon : longitude @@ -972,6 +974,15 @@ 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 "fstats" : + res = await mc.commands.get_bat() + logger.debug(res) + if res.type == EventType.ERROR or not "used_kb" in res.payload: + print(f"Error getting fs stats {res}") + elif json_output : + print(json.dumps(res.payload, indent=4)) + else: + print(f"Using {res.payload['used_kb']}kB of {res.payload['total_kb']}kB") case "manual_add_contacts" : await mc.commands.send_appstart() if json_output :