Merge branch 'develop' of github.com:newaetech/chipwhisperer into dev…

…elop
newaetech · Aug 17, 2023 · 732046c · 732046c
2 parents 10a2cd6 + c7f2e7b
commit 732046c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/software/chipwhisperer/__init__.py b/software/chipwhisperer/__init__.py
@@ -165,6 +165,7 @@ def program_target(scope : scopes.ScopeTypes, prog_type, fw_path : str, **kwargs
         Simplified programming target
     """
     if prog_type is None: #[makes] automating notebooks much easier
+        scope_logger.warning("prog_type is None, target will not be programmed")
         return
     prog = prog_type(**kwargs)
 

diff --git a/software/chipwhisperer/capture/targets/CW305.py b/software/chipwhisperer/capture/targets/CW305.py
@@ -44,7 +44,7 @@
 
 def check_cw305(fn):
     def inner(self=None, *args, **kwargs):
-        if self.platform != 'cw305':
+        if self.platform not in ['cw305', 'cw310', 'cw340']:
             target_logger.warning("%s is a CW305 method for hardware which does not exist on this target." % fn.__name__)
         else:
             return fn(self, *args, **kwargs)

diff --git a/software/chipwhisperer/capture/targets/CW310.py b/software/chipwhisperer/capture/targets/CW310.py
@@ -269,7 +269,7 @@ def max_vccaux(self):
         return self.get_xadc_vcc('vccaux', maximum=True)
     @property
     def current_vccint(self):
-        self.get_xadc_vcc('vccint')
+        return self.get_xadc_vcc('vccint')
     @property
     def current_vccbram(self):
         return self.get_xadc_vcc('vccbram')

diff --git a/software/chipwhisperer/capture/targets/CW340.py b/software/chipwhisperer/capture/targets/CW340.py
@@ -94,10 +94,10 @@ def inner(self=None, *args, **kwargs):
             if not self.jumper_warned:
                 target_logger.warning("""
                     Reading/writing the FPGA with this class requires a jumper cable from:
-                    - the lower left pin of the blue J24 header (pin 13, USBSPARE3 on the schematic) 
+                    - the third bottom left pin of the blue J24 header (pin 9, USB_SPI_CS on the schematic) 
                     to:
-                    - pin 1 of the J2 header (part of the long 47x2 header next to the FPGA connector, 
-                      OT_IOA0 on the schematic).
+                    - the third bottom left pin of the blue J23 header (pin 9, OT_SPI_DEV_CS_L on the schematic)
+                    You can also simply connect a ribbon cable between J23 and J24.
                     This warning is printed once as a reminder; set target.jumper_warned to True to
                     avoid seeing it.
                     """)