Merge branch 'update-docs' into python3

Author: florisla

stm32loader.py

@@ -4,7 +4,7 @@
 # vim: sw=4:ts=4:si:et:enc=utf-8
 
 # Author: Ivan A-R <[email protected]>
-# Project page: http://tuxotronic.org/wiki/projects/stm32loader
+# GitHub repository: https://github.com/jsnyder/stm32loader
 #
 # This file is part of stm32loader.
 #
@@ -338,7 +338,7 @@ def _encode_address(address):
 
 
 def usage():
-    print("""Usage: %s [-hqVewvr] [-l length] [-p port] [-b baud] [-a address] [-g address] [file.bin]
+    help_text = """Usage: %s [-hqVewvr] [-l length] [-p port] [-b baud] [-a address] [-g address] [file.bin]
     -h          This help
     -q          Quiet
     -V          Verbose
@@ -353,8 +353,9 @@ def usage():
     -g address  Address to start running at (0x08000000, usually)
 
     ./stm32loader.py -e -w -v example/main.bin
-
-    """ % sys.argv[0])
+    """
+    help_text = help_text % sys.argv[0]
+    print(help_text)
 
 
 if __name__ == "__main__":
@@ -379,9 +380,8 @@ def usage():
         'go_address': -1,
     }
 
-# http://www.python.org/doc/2.5.2/lib/module-getopt.html
-
     try:
+        # parse command-line arguments using getopt
         opts, args = getopt.getopt(sys.argv[1:], "hqVewvrp:b:a:l:g:")
     except getopt.GetoptError as err:
         # print help information and exit:
@@ -434,11 +434,6 @@ def usage():
         debug(0, "Bootloader version %X" % boot_version)
         device_id = interface.get_id()
         debug(0, "Chip id: 0x%x (%s)" % (device_id, CHIP_IDS.get(device_id, "Unknown")))
-#    interface.get_version()
-#    interface.get_id()
-#    interface.readout_unprotect()
-#    interface.write_unprotect()
-#    interface.write_protect([0, 1])
 
         binary_data = None
         data_file = args[0] if args else None