Merge pull request #76 from mndza/add-force-offline

apollo_fpga.commands: avoid automatic FPGA takeover for info commands

apollo_fpga/__init__.py

@@ -79,7 +79,7 @@ class ApolloDebugger:
     }
 
 
-    def __init__(self):
+    def __init__(self, force_offline=False):
         """ Sets up a connection to the debugger. """
 
         # Try to create a connection to our Apollo debug firmware.
@@ -95,6 +95,9 @@ def __init__(self):
             if fpga_device is None:
                 raise DebuggerNotFound("No Apollo or valid LUNA device found. "
                     "The LUNA_USB_IDS environment variable can be used to add custom VID:PID pairs.")
+            elif not force_offline:
+                raise DebuggerNotFound("Apollo stub interface found. "
+                    "Switch the device to Apollo mode or add the `--force-offline` option.")
 
             # ... and now request a USB handoff to Apollo
             try:

apollo_fpga/commands/cli.py

@@ -341,11 +341,11 @@ def jtag_debug_spi_register(device, args):
 
 COMMANDS = [
     # Info queries
-    Command("info", handler=print_device_info,
+    Command("info", handler=print_device_info, args=[(("--force-offline",), dict(action='store_true'))],
             help="Print device info.", ),
     Command("jtag-scan", handler=print_chain_info,
             help="Prints information about devices on the onboard JTAG chain."),
-    Command("flash-info", handler=print_flash_info,
+    Command("flash-info", handler=print_flash_info, args=[(("--force-offline",), dict(action='store_true'))],
             help="Prints information about the FPGA's attached configuration flash."),
 
     # Flash commands
@@ -408,7 +408,9 @@ def main():
         parser.print_help()
         return
 
-    device = ApolloDebugger()
+    # Force the FPGA offline by default in most commands to force Apollo mode if needed.
+    force_offline = args.force_offline if "force_offline" in args else True
+    device = ApolloDebugger(force_offline=force_offline)
 
     # Set up python's logging to act as a simple print, for now.
     logging.basicConfig(level=logging.INFO, format="%(message)-s")