Merge pull request #556 from ianmcorvidae/enter-dfu

Add --enter-dfu for entering DFU mode on NRF52 devices via admin message

meshtastic/__main__.py

@@ -375,6 +375,11 @@ def onConnected(interface):
             waitForAckNak = True
             interface.getNode(args.dest, False).rebootOTA()
 
+        if args.enter_dfu:
+            closeNow = True
+            waitForAckNak = True
+            interface.getNode(args.dest, False).enterDFUMode()
+
         if args.shutdown:
             closeNow = True
             waitForAckNak = True
@@ -1364,7 +1369,13 @@ def initParser():
 
     group.add_argument(
         "--reboot-ota",
-        help="Tell the destination node to reboot into factory firmware",
+        help="Tell the destination node to reboot into factory firmware (ESP32)",
+        action="store_true",
+    )
+
+    group.add_argument(
+        "--enter-dfu",
+        help="Tell the destination node to enter DFU mode (NRF52)",
         action="store_true",
     )
 

meshtastic/node.py

@@ -571,6 +571,19 @@ class Node:
             onResponse = self.onAckNak
         return self._sendAdmin(p, onResponse=onResponse)
 
+    def enterDFUMode(self):
+        """Tell the node to enter DFU mode (NRF52)."""
+        p = admin_pb2.AdminMessage()
+        p.enter_dfu_mode_request = True
+        logging.info(f"Telling node to enable DFU mode")
+
+        # If sending to a remote node, wait for ACK/NAK
+        if self == self.iface.localNode:
+            onResponse = None
+        else:
+            onResponse = self.onAckNak
+        return self._sendAdmin(p, onResponse=onResponse)
+
     def shutdown(self, secs: int = 10):
         """Tell the node to shutdown."""
         p = admin_pb2.AdminMessage()