From 809ec948c0dc727f7ab2a68a2e54c7ae60284e25 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Sun, 30 Jul 2023 12:29:31 -0700 Subject: [PATCH 1/4] Add error message with prog_type is None Inform the user that no programmer has been selected and the target will not be programmed --- software/chipwhisperer/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/software/chipwhisperer/__init__.py b/software/chipwhisperer/__init__.py index 5729f5296..ed9718eaa 100644 --- 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) From ad621632433669915d2b31f59d9a2485adaac8bd Mon Sep 17 00:00:00 2001 From: jpcrypt Date: Thu, 17 Aug 2023 14:52:27 -0400 Subject: [PATCH 2/4] CW310: fix typo on current_vccint property --- software/chipwhisperer/capture/targets/CW310.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/chipwhisperer/capture/targets/CW310.py b/software/chipwhisperer/capture/targets/CW310.py index 815959947..3b36bdcb8 100644 --- 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') From b5a67fc56634469628d3b7c16d4dc4c70c9e3f9f Mon Sep 17 00:00:00 2001 From: jpcrypt Date: Thu, 17 Aug 2023 15:00:30 -0400 Subject: [PATCH 3/4] Allow CW310/340 to use all CW305 properties. --- software/chipwhisperer/capture/targets/CW305.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/chipwhisperer/capture/targets/CW305.py b/software/chipwhisperer/capture/targets/CW305.py index b06046f5c..3086e996c 100644 --- 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) From c7f2e7b05380420d60721056e161957f73817497 Mon Sep 17 00:00:00 2001 From: jpcrypt Date: Thu, 17 Aug 2023 15:02:26 -0400 Subject: [PATCH 4/4] CW340: update jumper connection warning/info --- software/chipwhisperer/capture/targets/CW340.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/software/chipwhisperer/capture/targets/CW340.py b/software/chipwhisperer/capture/targets/CW340.py index 7fad6e090..7668c038a 100644 --- 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. """)