meshcore-cli 1.3.16__py3-none-any.whl → 1.3.17__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.3.16"
+VERSION = "v1.3.17"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -591,6 +591,9 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
         "req_telemetry" : contact_list,
         "req_binary" : contact_list,
         "req_mma" : contact_list,
+        "req_owner" : contact_list,
+        "req_regions" : contact_list,
+        "req_clock" : contact_list,
         "self_telemetry" : None,
         "get_channel": None,
         "set_channel": None,
@@ -623,6 +626,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_path_updates" : {"on":None,"off":None},
             "classic_prompt" : {"on" : None, "off":None},
             "manual_add_contacts" : {"on" : None, "off":None},
+            "autoadd_config" : None,
             "telemetry_mode_base" : {"always" : None, "device":None, "never":None},
             "telemetry_mode_loc" : {"always" : None, "device":None, "never":None},
             "telemetry_mode_env" : {"always" : None, "device":None, "never":None},
@@ -655,6 +659,7 @@ def make_completion_dict(contacts, pending={}, to=None, channels=None):
             "print_new_contacts":None,
             "classic_prompt":None,
             "manual_add_contacts":None,
+            "autoadd_config":None,
             "telemetry_mode_base":None,
             "telemetry_mode_loc":None,
             "telemetry_mode_env":None,
@@ -1290,7 +1295,10 @@ async def process_contact_chat_line(mc, contact, line):
             line.startswith("req_status") or line.startswith("rs") or\
             line.startswith("req_neighbours") or line.startswith("rn") or\
             line.startswith("req_telemetry") or line.startswith("rt") or\
-            line.startswith("req_acl") or\
+            line.startswith("req_regions") or line.startswith("rr") or\
+            line.startswith("req_owner") or line.startswith("ro") or\
+            line.startswith("req_clock") or line.startswith("rc") or\
+            line.startswith("req_acl") or line.startswith("ra") or\
             line.startswith("path") or\
             line.startswith("logout") :
         args = [line.split()[0], contact['adv_name']]
@@ -2138,6 +2146,11 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(f"Error : {res}")
                         else :
                             print(f"manual add contact: {mac}")
+                    case "autoadd_config":
+                        flags = int(cmds[2], 0)
+                        res = await mc.commands.set_autoadd_config(flags)
+                        if res.type == EventType.ERROR:
+                            print(f"Error : {res}")
                     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)
@@ -2363,6 +2376,12 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"manual_add_contacts" : mc.self_info["manual_add_contacts"]}))
                         else :
                             print(f"manual_add_contacts: {mc.self_info['manual_add_contacts']}")
+                    case "autoadd_config" :
+                        res = await mc.commands.get_autoadd_config()
+                        if res is None or res.type == EventType.ERROR:
+                            logger.error("Can't get autoadd_config")
+                        else :
+                            print(f"0x{res.payload['config']:02x}")
                     case "telemetry_mode_base" :
                         await mc.commands.send_appstart()
                         if json_output :
@@ -2791,6 +2810,75 @@ async def next_cmd(mc, cmds, json_output=False):
 
                             print(f" {name:22} {type:>4} SNR: {n['SNR_in']:6,.2f}->{n['SNR']:6,.2f} RSSI: ->{n['RSSI']:4}")
 
+            case "req_regions"|"rr":
+                argnum = 1
+                await mc.ensure_contacts()
+                contact = await get_contact_from_arg(mc, cmds[1])
+                if contact is None:
+                    if json_output :
+                        print(json.dumps({"error" : "unknown contact"}))
+                    else:
+                        print(f"Unknown contact {cmds[1]}")
+                else:
+                    timeout = 0 if not "timeout" in contact else contact["timeout"]
+                    res = await mc.commands.req_regions_sync(contact, timeout)
+                    if res is None :
+                        if json_output :
+                            print(json.dumps({"error" : "Getting data"}))
+                        else:
+                            print("Error getting data")
+                    else :
+                        if json_output :
+                            print(json.dumps({"repeater": contact["adv_name"]}, {"regions": res}))
+                        else :
+                            print(f"{contact['adv_name']} repeats {res}")
+
+            case "req_owner"|"ro":
+                argnum = 1
+                await mc.ensure_contacts()
+                contact = await get_contact_from_arg(mc, cmds[1])
+                if contact is None:
+                    if json_output :
+                        print(json.dumps({"error" : "unknown contact"}))
+                    else:
+                        print(f"Unknown contact {cmds[1]}")
+                else:
+                    timeout = 0 if not "timeout" in contact else contact["timeout"]
+                    res = await mc.commands.req_owner_sync(contact, timeout)
+                    if res is None :
+                        if json_output :
+                            print(json.dumps({"error" : "Getting data"}))
+                        else:
+                            print("Error getting data")
+                    else :
+                        if json_output:
+                            print(json.dumps(res))
+                        else:
+                            if res["owner"] == "":
+                                print(f"{res['name']} has no owner set")
+                            else:
+                                print(f"{res['name']} is owned by {res['owner']}") 
+
+            case "req_clock"|"rc":
+                argnum = 1
+                await mc.ensure_contacts()
+                contact = await get_contact_from_arg(mc, cmds[1])
+                if contact is None:
+                    if json_output :
+                        print(json.dumps({"error" : "unknown contact"}))
+                    else:
+                        print(f"Unknown contact {cmds[1]}")
+                else:
+                    timeout = 0 if not "timeout" in contact else contact["timeout"]
+                    res = await mc.commands.req_basic_sync(contact, timeout)
+                    if res is None :
+                        if json_output :
+                            print(json.dumps({"error" : "Getting data"}))
+                        else:
+                            print("Error getting data")
+                    else :
+                        print(int.from_bytes(bytes.fromhex(res["data"][0:8]), byteorder="little", signed=False))
+
             case "req_telemetry"|"rt" :
                 argnum = 1
                 await mc.ensure_contacts()
@@ -2870,7 +2958,7 @@ async def next_cmd(mc, cmds, json_output=False):
                     else :
                         print(json.dumps(res, indent=4))
 
-            case "req_acl" :
+            case "req_acl"|"ra" :
                 argnum = 1
                 contact = await get_contact_from_arg(mc, cmds[1])
                 if contact is None:
@@ -3434,9 +3522,12 @@ def command_help():
     reset_path <ct>        : resets path to a contact to flood      rp
     change_path <ct> <pth> : change the path to a contact           cp
     change_flags <ct> <f>  : change contact flags (tel_l|tel_a|star)cf
+    req_acl <ct>           : requests access control list for node  ra
     req_telemetry <ct>     : prints telemetry data as json          rt
+    req_regions <ct>       : prints regions from repeater           rr
+    req_owner <ct>         : prints owner for a repeater            ro
+    req_clock <ct>         : prints repeater timestamp (for sync)   rc
     req_mma <ct>           : requests min/max/avg for a sensor      rm
-    req_acl <ct>           : requests access control list for sensor
     pending_contacts       : show pending contacts
     add_pending <pending>  : manually add pending contact
     flush_pending          : flush pending contact list
@@ -3555,6 +3646,7 @@ def get_help_for (cmdname, context="line") :
       - when off device automatically adds contacts from adverts
       - when on contacts must be added manually using add_pending 
         (pending contacts list is built by meshcli from adverts while connected) 
+    autoadd_config              : set autoadd_config flags
   display:
     print_timestamp <on/off/fmt>: toggle printing of timestamp, can be strftime format
     print_snr <on/off>          : toggle snr display in messages
@@ -3607,6 +3699,17 @@ With growing number of users, it becomes necessary to manage contact list and on
 
 This feature only really works in interactive mode.
 
+You can also set autoadd_config flag to filter contacts that are automatically added to your contact list 
+
+// Auto-add config bitmask
+// Bit 0: If set, overwrite oldest non-favourite contact when contacts file is full
+// Bits 1-4: these indicate which contact types to auto-add when manual_contact_mode = 0x01
+#define AUTO_ADD_OVERWRITE_OLDEST (1 << 0)  // 0x01 - overwrite oldest non-favourite when full
+#define AUTO_ADD_CHAT             (1 << 1)  // 0x02 - auto-add Chat (Companion) (ADV_TYPE_CHAT)
+#define AUTO_ADD_REPEATER         (1 << 2)  // 0x04 - auto-add Repeater (ADV_TYPE_REPEATER)
+#define AUTO_ADD_ROOM_SERVER      (1 << 3)  // 0x08 - auto-add Room Server (ADV_TYPE_ROOM)
+#define AUTO_ADD_SENSOR           (1 << 4)  // 0x10 - auto-add Sensor (ADV_TYPE_SENSOR)
+
 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).
 """)
 

{meshcore_cli-1.3.16.dist-info → meshcore_cli-1.3.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.3.16
+Version: 1.3.17
 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

meshcore_cli-1.3.17.dist-info/RECORD

@@ -0,0 +1,8 @@
+meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
+meshcore_cli/meshcore_cli.py,sha256=CFReb2iTlJs7y3IPwWn85ZaJJSr0nrP1G3nl9Fbge6A,177380
+meshcore_cli-1.3.17.dist-info/METADATA,sha256=IpwXoqN-QTRy0kRj--PGcFEVYyF3tApxysedF-btxpY,18194
+meshcore_cli-1.3.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+meshcore_cli-1.3.17.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.3.17.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.3.17.dist-info/RECORD,,

meshcore_cli-1.3.16.dist-info/RECORD

@@ -1,8 +0,0 @@
-meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
-meshcore_cli/meshcore_cli.py,sha256=AjAqHDZ2LCPAaDqtZV7kWN07feXuu3Il7YMPxhS_vkg,172001
-meshcore_cli-1.3.16.dist-info/METADATA,sha256=kRcTR55u3pSOzEaaAs6KwNqtUIZT5VJuVD2MyzIts64,18194
-meshcore_cli-1.3.16.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-meshcore_cli-1.3.16.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.3.16.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.3.16.dist-info/RECORD,,