From 7aa97c9dba1b4e24af4d287ec726d68c9b9e57a2 Mon Sep 17 00:00:00 2001
From: Alex Dewar <alexldewar@gmail.com>
Date: Mon, 6 Jun 2022 12:58:12 -0300
Subject: [PATCH] update debug docs, fix typo in Makefile.hal, update jupyter

---
 cw_openocd.cfg                             |  2 +-
 docs/debugging.rst                         | 34 +++++++++++++++++++++-
 hardware/victims/firmware/hal/Makefile.hal |  2 +-
 jupyter                                    |  2 +-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/cw_openocd.cfg b/cw_openocd.cfg
index 5703317f1e..7acb664b50 100644
--- a/cw_openocd.cfg
+++ b/cw_openocd.cfg
@@ -16,7 +16,7 @@ adapter driver ftdi
 
 ftdi channel 1
 ftdi layout_init 0x001B 0x001B
-ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
+#ftdi layout_signal nTRST -data 0x0010 -oe 0x0010
 
 ftdi layout_signal SWD_EN -data 0x0100
 ftdi layout_signal SWDIO_OE -data 0x0200
diff --git a/docs/debugging.rst b/docs/debugging.rst
index 1132a9dd92..ae1b7681aa 100644
--- a/docs/debugging.rst
+++ b/docs/debugging.rst
@@ -140,7 +140,7 @@ a firmware file onto the target:
     targets
     halt
     flash write_image erase /path/to/fw.elf
-    verify image /path/to/fw.elf
+    flash verify_image /path/to/fw.elf
     reset run
     shutdown
 
@@ -205,6 +205,38 @@ ChipWhisperer via the Python interface and via OpenOCD at the same time.
 General Limitations
 ===================
 
+Feature Limitations
+-------------------
+
+Pin Based Limitations
+^^^^^^^^^^^^^^^^^^^^^
+
+MPSSE mode takes control of some ChipWhisperer pins, meaning the following features will not be available:
+
+  * Non MPSSE target programming (STM32, XMEGA, AVR)
+  * ChipWhisperer-Husky stream mode
+  * Control of PDIC, PDID, and the SPI pins
+
+You can give normal functionality back to these pins by running the following::
+
+    scope.io.cwe.setAVRISPMode(0)
+
+MPSSE can be reenabled by running the following command::
+
+    scope.io.cwe.setAVRISPMode(1)
+
+Other Limitations
+^^^^^^^^^^^^^^^^^^^^^
+
+The following features are not available when MPSSE mode is active:
+
+  * CDC serial (normal cw.target based serial still works)
+  * ChipWhisperer-Pro stream mode
+
+To regain usage of these features, you must leave MPSSE mode by running::
+
+    scope.enable_MPSSE(0)
+
 Communication Speed
 -------------------
 
diff --git a/hardware/victims/firmware/hal/Makefile.hal b/hardware/victims/firmware/hal/Makefile.hal
index 8279ed9576..3434bedf69 100644
--- a/hardware/victims/firmware/hal/Makefile.hal
+++ b/hardware/victims/firmware/hal/Makefile.hal
@@ -105,7 +105,7 @@ define KNOWN_PLATFORMS
 | CW308_        | CW308T-MPC5676R (NXP MPC5676R)        |
 |   MPC5676R    |                                       |
 +---------------|---------------------------------------+
-| CW308_NEORV   | CW308/CW312-iCE40 with neorv32        |
+| CW308_NEORV32 | CW308/CW312-iCE40 with neorv32        |
 |               |   (RISC-V) soft-core processor.       |
 +---------------|---------------------------------------+
 
diff --git a/jupyter b/jupyter
index d2a1bd392a..68098c713c 160000
--- a/jupyter
+++ b/jupyter
@@ -1 +1 @@
-Subproject commit d2a1bd392aacaca2c0299f4593e7da4512b38dcd
+Subproject commit 68098c713c3bca7df6d2dc6ae1776e082f859ce1