Ver Fonte

gw: Remove 'auto' string for automatic cmd parameter defaults. Default to None instead.

Keir Fraser há 4 anos atrás
pai
commit
0e4f9ebe3c

+ 1 - 2
scripts/greaseweazle/tools/bandwidth.py

@@ -56,8 +56,7 @@ def measure_bandwidth(usb, args):
 def main(argv):
 
     parser = util.ArgumentParser()
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/delays.py

@@ -28,8 +28,7 @@ def main(argv):
                         help="delay after motor on (msecs)")
     parser.add_argument("--auto-off", type=int,
                         help="quiescent time until auto deselect (msecs)")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/erase.py

@@ -42,8 +42,7 @@ def main(argv):
                         help="last cylinder to write")
     parser.add_argument("--single-sided", action="store_true",
                         help="single-sided write")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/info.py

@@ -29,8 +29,7 @@ def print_info_line(name, value, tab=0):
 def main(argv):
 
     parser = util.ArgumentParser()
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/pin.py

@@ -27,8 +27,7 @@ def main(argv):
                         help="pin number")
     parser.add_argument("level", type=level,
                         help="pin level (H,L)")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/read.py

@@ -95,8 +95,7 @@ def main(argv):
     parser.add_argument("--rpm", type=int, nargs="?",
                         help="normalise to RPM")
     parser.add_argument("file", help="output filename")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 1 - 2
scripts/greaseweazle/tools/reset.py

@@ -17,8 +17,7 @@ from greaseweazle import usb as USB
 def main(argv):
 
     parser = util.ArgumentParser()
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])

+ 3 - 5
scripts/greaseweazle/tools/update.py

@@ -23,7 +23,7 @@ def update_firmware(usb, args):
     req_type = b'BL' if args.bootloader else b'GW'
 
     filename = args.file
-    if filename == "auto":
+    if filename is None:
         # Get the absolute path to the root Greaseweazle folder.
         path = os.path.dirname(os.path.abspath(__file__))
         for _ in range(3):
@@ -89,10 +89,8 @@ def update_firmware(usb, args):
 def main(argv):
 
     parser = util.ArgumentParser(allow_abbrev=False)
-    parser.add_argument("file", nargs="?", default="auto",
-                        help="update filename")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("file", nargs="?", help="update filename")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.add_argument("--bootloader", action="store_true",
                         help="update the bootloader (use with caution!)")
     parser.description = description

+ 1 - 1
scripts/greaseweazle/tools/util.py

@@ -142,7 +142,7 @@ def usb_reopen(usb, is_update):
 
 def usb_open(devicename, is_update=False, mode_check=True):
 
-    if devicename == "auto":
+    if devicename is None:
         devicename = find_port()
     
     usb = USB.Unit(serial.Serial(devicename))

+ 1 - 2
scripts/greaseweazle/tools/write.py

@@ -80,8 +80,7 @@ def main(argv):
     parser.add_argument("--single-sided", action="store_true",
                         help="single-sided write")
     parser.add_argument("file", help="input filename")
-    parser.add_argument("device", nargs="?", default="auto",
-                        help="serial device")
+    parser.add_argument("device", nargs="?", help="serial device")
     parser.description = description
     parser.prog += ' ' + argv[1]
     args = parser.parse_args(argv[2:])