meshcore-cli 1.1.38__tar.gz → 1.1.40__tar.gz

{meshcore_cli-1.1.38 → meshcore_cli-1.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.1.38
+Version: 1.1.40
 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,7 @@ License-File: LICENSE
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: meshcore>=2.1.17
+Requires-Dist: meshcore>=2.1.19
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: requests>=2.28.0
 Description-Content-Type: text/markdown

{meshcore_cli-1.1.38 → meshcore_cli-1.1.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.1.38"
+version = "1.1.40"
 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.17", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
+dependencies = [ "meshcore >= 2.1.19", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-1.1.38 → meshcore_cli-1.1.40}/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.38"
+VERSION = "v1.1.40"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -398,6 +398,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
                     "telemetry_mode_env" : {"always" : None, "device":None, "never":None},
                     "advert_loc_policy" : {"none" : None, "share" : None},
                     "auto_update_contacts" : {"on":None, "off":None},
+                    "multi_acks" : {"on": None, "off":None},
                     "max_attempts" : None,
                     "max_flood_attempts" : None,
                     "flood_after" : None,
@@ -424,6 +425,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
                      "telemetry_mode_env":None,
                      "advert_loc_policy":None,
                      "auto_update_contacts":None,
+                     "multi_acks":None,
                      "max_attempts":None,
                      "max_flood_attempts":None,
                      "flood_after":None,
@@ -1135,7 +1137,12 @@ async def print_disc_trace_to (mc, contact):
 
     for i in range(0, inp_l):
         elem = inp[2*i:2*(i+1)]
-        trace = elem if trace == "" else f"{trace},{elem}"
+        if trace == "":
+            trace = elem
+        elif trace[-2:] != elem:
+            trace = f"{trace},{elem}"
+
+    logger.info(f"Trying {trace}")
 
     await next_cmd(mc, ["trace", trace])
 
@@ -1384,6 +1391,13 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(f"Error : {res}")
                         else :
                             print(f"manual add contact: {mac}")
+                    case "multi_acks":
+                        ma = (cmds[2] == "on") or (cmds[2] == "true") or (cmds[2] == "yes") or (cmds[2] == "1")
+                        res = await mc.commands.set_multi_acks(ma)
+                        if res.type == EventType.ERROR:
+                            print(f"Error : {res}")
+                        else :
+                            print(f"multi_acks: {ma}")
                     case "auto_update_contacts":
                         auc = (cmds[2] == "on") or (cmds[2] == "true") or (cmds[2] == "yes") or (cmds[2] == "1")
                         mc.auto_update_contacts=auc
@@ -1574,6 +1588,12 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps(res.payload, indent=4))
                         else:
                             print(f"Using {res.payload['used_kb']}kB of {res.payload['total_kb']}kB")
+                    case "multi_acks" :
+                        await mc.commands.send_appstart()
+                        if json_output :
+                            print(json.dumps({"multi_acks" : mc.self_info["multi_acks"]}))
+                        else :
+                            print(f"multi_acks: {mc.self_info['multi_acks']}")
                     case "manual_add_contacts" :
                         await mc.commands.send_appstart()
                         if json_output :