meshcore-cli 1.1.39__tar.gz → 1.1.41__tar.gz

{meshcore_cli-1.1.39 → meshcore_cli-1.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.1.39
+Version: 1.1.41
 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.39 → meshcore_cli-1.1.41}/flake.nix

@@ -4,11 +4,9 @@
     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;
@@ -17,15 +15,15 @@
 
         meshcore = python3Packages.buildPythonPackage rec {
           pname = "meshcore";
-          version = "2.1.9";
+          version = "2.1.19";
           pyproject = true;
 
           src = python3Packages.fetchPypi {
             inherit pname version;
-            sha256 = "sha256-FhTOuVHhpYvmITgxfhXys8AJhRfYnMwCJ3fWJhMf53w=";
+            sha256 = "sha256-R11puo30ozFVqsIZcbNtg/NFukm8ahFzkMVqX4XEIe0=";
           };
 
-          build-system = [ python3Packages.hatchling ];
+          build-system = [python3Packages.hatchling];
 
           dependencies = [
             python3Packages.bleak
@@ -33,13 +31,12 @@
             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;

{meshcore_cli-1.1.39 → meshcore_cli-1.1.41}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "1.1.39"
+version = "1.1.41"
 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.39 → meshcore_cli-1.1.41}/src/meshcore_cli/meshcore_cli.py

@@ -9,6 +9,7 @@ import getopt, json, shlex, re
 import logging
 import requests
 from bleak import BleakScanner, BleakClient
+from bleak.exc import BleakError
 import serial.tools.list_ports
 from pathlib import Path
 import traceback
@@ -23,7 +24,7 @@ from prompt_toolkit.shortcuts import radiolist_dialog
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.1.39"
+VERSION = "v1.1.41"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -398,6 +399,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 +426,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,
@@ -1389,6 +1392,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
@@ -1579,6 +1589,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 :
@@ -2585,23 +2601,30 @@ async def main(argv):
                 return
             case "-l" :
                 print("BLE devices:")
-                devices = await BleakScanner.discover(timeout=timeout)
-                if len(devices) == 0:
-                    print(" No ble device found")
-                for d in devices :
-                    if not d.name is None and d.name.startswith("MeshCore-"):
-                        print(f" {d.address}  {d.name}")
+                try :
+                    devices = await BleakScanner.discover(timeout=timeout)
+                    if len(devices) == 0:
+                        print(" No ble device found")
+                    for d in devices :
+                        if not d.name is None and d.name.startswith("MeshCore-"):
+                            print(f" {d.address}  {d.name}")
+                except BleakError:
+                    print(" No BLE HW") 
                 print("\nSerial ports:")
                 ports = serial.tools.list_ports.comports()
                 for port, desc, hwid in sorted(ports):
                     print(f" {port:<18} {desc} [{hwid}]")
                 return
             case "-S" :
-                devices = await BleakScanner.discover(timeout=timeout)
                 choices = []
-                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}"))
+
+                try :
+                    devices = await BleakScanner.discover(timeout=timeout)
+                    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:
+                    logger.info("No BLE Device")
 
                 ports = serial.tools.list_ports.comports()
                 for port, desc, hwid in sorted(ports):