Skip to content

Commit afc42f0

Browse files
committed
Big update to PLL programming.
Updates all PLL registers, in the prescribed order, whenever any of them needs to be updated. Towards fixing #490. Functional (but not fully tested) for XIN case; not tested at all with external clock.
1 parent a9527b5 commit afc42f0

File tree

2 files changed

+366
-132
lines changed

2 files changed

+366
-132
lines changed

software/chipwhisperer/capture/scopes/OpenADC.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ def _default_setup(self):
317317
self.adc.samples = self.DEFAULT_ADC_SAMPLES
318318
self.adc.offset = 0
319319
self.adc.basic_mode = 'rising_edge'
320-
self.clock.clkgen_freq = self.DEFAULT_CLOCKGEN_FREQ
321320
self.trigger.triggers = 'tio4'
322321
self.io.tio1 = self.io.GPIO_MODE_SERIAL_RX
323322
self.io.tio2 = self.io.GPIO_MODE_SERIAL_TX
@@ -329,6 +328,7 @@ def _default_setup(self):
329328
self.clock.clkgen_freq = self.DEFAULT_CLOCKGEN_FREQ
330329
self.clock.adc_mul = self.DEFAULT_ADC_MUL
331330
else:
331+
self.clock.clkgen_freq = self.DEFAULT_CLOCKGEN_FREQ
332332
self.clock.adc_src = 'clkgen_x4'
333333

334334
def default_setup(self, verbose=True, sleep=0.2):
@@ -684,7 +684,6 @@ def con(self, sn=None, idProduct=None, bitstream=None, force=False, prog_speed=1
684684
self.decode_IO = ChipWhispererDecodeTrigger.ChipWhispererDecodeTrigger(self.sc)
685685

686686
if cwtype in ["cwhusky", "cwhusky-plus"]:
687-
# self.pll = ChipWhispererHuskyClock.CDCI6214(self.sc)
688687
self._fpga_clk = ClockSettings(self.sc, hwinfo=self.hwinfo, is_husky=True)
689688
self.glitch_drp1 = XilinxDRP(self.sc, "CG1_DRP_DATA", "CG1_DRP_ADDR", "CG1_DRP_RESET")
690689
self.glitch_drp2 = XilinxDRP(self.sc, "CG2_DRP_DATA", "CG2_DRP_ADDR", "CG2_DRP_RESET")

0 commit comments

Comments
 (0)