update jupyter, fix bootloader_sam3u for fw updater

newaetech · Jan 16, 2023 · cea0a31 · cea0a31
1 parent db32b24
commit cea0a31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/jupyter b/jupyter
diff --git a/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py b/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py
@@ -37,9 +37,16 @@
 
 import serial # type: ignore
 import time
-from .serial import USART
-from ...capture.api.cwcommon import ChipWhispererCommonInterface
-from ...logging import *
+# from .serial import USART
+try:
+    from ...capture.api.cwcommon import ChipWhispererCommonInterface
+except:
+    ChipWhispererCommonInterface = None # type: ignore
+
+try:
+    from ...logging import *
+except:
+    target_logger = logging # type: ignore
 
 class XModem(object):
 
@@ -207,7 +214,7 @@ def write(self, ser, payload):
 class Samba(object):
 
     def con(self, port, usbmode=True):
-        if isinstance(port, ChipWhispererCommonInterface):
+        if ChipWhispererCommonInterface and isinstance(port, ChipWhispererCommonInterface): # type: ignore
             ser = port._get_usart()
             ser.init()
             usbmode = False
@@ -877,7 +884,7 @@ def readFRR1(self):
 
 if __name__ == "__main__":
     # Example usage
-    target_logger.setLevel(level=logging.INFO)
+    # target_logger.setLevel(level=logging.INFO)
     sam = Samba()
     sam.con('com131')
     sam.erase()