diff --git a/meshtastic/__main__.py b/meshtastic/__main__.py index 143adb6..44cc0cf 100644 --- a/meshtastic/__main__.py +++ b/meshtastic/__main__.py @@ -1649,7 +1649,6 @@ def addRemoteActionArgs(parser: argparse.ArgumentParser) -> argparse.ArgumentPar "You need pass the destination ID as argument, like " "this: '--traceroute !ba4bf9d0' " "Only nodes with a shared channel can be traced.", - nargs=1, metavar=("!XXXXXXXX", "0xXXXXXXXX"), ) @@ -1730,31 +1729,26 @@ def addRemoteAdminArgs(parser: argparse.ArgumentParser) -> argparse.ArgumentPars group.add_argument( "--remove-node", help="Tell the destination node to remove a specific node from its DB, by node number or ID", - nargs=1, metavar=("!XXXXXXXX", "0xXXXXXXXX") ) group.add_argument( "--set-favorite-node", help="Tell the destination node to set the specified node to be favorited on the NodeDB on the devicein its DB, by number or ID", - nargs=1, metavar=("!XXXXXXXX", "0xXXXXXXXX") ) group.add_argument( "--remove-favorite-node", help="Tell the destination node to set the specified node to be un-favorited on the NodeDB on the device, by number or ID", - nargs=1, metavar=("!XXXXXXXX", "0xXXXXXXXX") ) group.add_argument( "--set-ignored-node", help="Tell the destination node to set the specified node to be ignored on the NodeDB on the devicein its DB, by number or ID", - nargs=1, - metavar=("!XXXXXXXX", "0xXXXXXXXX") + metavar="!XXXXXXXX" ) group.add_argument( "--remove-ignored-node", help="Tell the destination node to set the specified node to be un-ignored on the NodeDB on the device, by number or ID", - nargs=1, metavar=("!XXXXXXXX", "0xXXXXXXXX") ) group.add_argument( diff --git a/meshtastic/mesh_interface.py b/meshtastic/mesh_interface.py index 24f1c39..d21059b 100644 --- a/meshtastic/mesh_interface.py +++ b/meshtastic/mesh_interface.py @@ -345,7 +345,7 @@ class MeshInterface: # pylint: disable=R0902 if new_index != last_index: retries_left = requestChannelAttempts - 1 if retries_left <= 0: - our_exit(f"Error: Timed out waiting for channels, giving up") + our_exit("Error: Timed out waiting for channels, giving up") print("Timed out trying to retrieve channel info, retrying") n.requestChannels(startingIndex=new_index) last_index = new_index @@ -929,7 +929,7 @@ class MeshInterface: # pylint: disable=R0902 toRadio.packet.CopyFrom(meshPacket) if self.noProto: logging.warning( - f"Not sending packet because protocol use is disabled by noProto" + "Not sending packet because protocol use is disabled by noProto" ) else: logging.debug(f"Sending packet: {stripnl(meshPacket)}")