From c52c29b998fef9ff9cd3f70a598e38eceb26bfd3 Mon Sep 17 00:00:00 2001
From: mtiggelman <m.j.tiggelman@tudelft.nl>
Date: Fri, 7 Jul 2017 11:16:37 +0200
Subject: [PATCH] D5a fix & S5i improvement

Fixed jump to -4V from 3.999 and PLL lock problem on S5i.
---
 setup.py              |  4 ++--
 spirack/D5a_module.py |  4 ++--
 spirack/S5i_module.py | 34 +++++++++++++++++++++++++++++-----
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index 7795e43..274d2f8 100644
--- a/setup.py
+++ b/setup.py
@@ -21,10 +21,10 @@ def get_version(verbose=0):
     return FULLVERSION
 
 setup(name='spirack',
-      version='0.1.0.dev5',
+      version='0.1.0.dev6',
       description='Drivers for the QuTech SPI-rack',
       url='https://github.com/Rubenknex/SPI-rack',
-      download_url='https://github.com/Rubenknex/SPI-rack/archive/0.1.0.dev4.tar.gz',
+      download_url='https://github.com/Rubenknex/SPI-rack/archive/0.1.0.dev6.tar.gz',
       author='Marijn Tiggelman',
       author_email='qutechdev@gmail.com',
       license='MIT',
diff --git a/spirack/D5a_module.py b/spirack/D5a_module.py
index e94bc8a..2eb1934 100644
--- a/spirack/D5a_module.py
+++ b/spirack/D5a_module.py
@@ -225,11 +225,11 @@ def set_voltage(self, DAC, voltage):
             maxV = 2.0
             minV = -2.0
 
-        if voltage > maxV:
+        if voltage >= maxV:
             bit_value = (2**18)-1
             self.voltages[DAC] = maxV
             print("Voltage too high for set span, DAC set to max value")
-        elif voltage < minV:
+        elif voltage <= minV:
             self.voltages[DAC] = minV
             bit_value = 0
             print("Voltage too low for set span, DAC set to min value")
diff --git a/spirack/S5i_module.py b/spirack/S5i_module.py
index 145c071..86dd869 100644
--- a/spirack/S5i_module.py
+++ b/spirack/S5i_module.py
@@ -42,6 +42,9 @@ def __init__(self, spi_rack, module, frequency=100e6, enable_output=1, output_le
 
         self.set_output_power(output_level)
 
+        self.double = 0
+        self.div2 = 0
+
         # These are the 6 registers present in the ADF4351
         self.registers = 6*[0]
         # In REG3: set ABP=1 (3 ns, INT-N) and CHARGE CANCEL=1
@@ -67,6 +70,12 @@ def write_registers(self):
             # Write to ADF at SPI address 0
             self.spi_rack.write_data(self.module, 0, ADF4351_MODE, ADF4351_SPEED, data)
 
+    def set_doubler(self, value):
+        self.double = value
+
+    def set_div2(self, value):
+        self.div2 = value
+
     def set_output_power(self, level):
         """Sets the source output power
 
@@ -132,6 +141,13 @@ def set_frequency(self, frequency):
         if frequency > 4.4e9 or frequency < 40e6:
             raise ValueError('Frequency {} not possible. Allowed frequencies: {}<f<{}'.format(frequency, 40e6, 4.4e9))
 
+        if self.div2:
+            local_ref = self.ref_frequency/2
+        elif self.double:
+            local_ref = self.ref_frequency*2
+        else:
+            local_ref = self.ref_frequency
+
         #Calculate VCO output divider:
         div = 0
         for n in range(0,7):
@@ -142,14 +158,14 @@ def set_frequency(self, frequency):
 
         #Prescaler: 0 (4/5) if < 3.6 GHz, 1 (8/9) if >= 3.6 GHz
         #Nmin changes with prescaler:
-        if frequency >= 3.6e9:
+        if frequency >= 1.0e9:
             prescaler = 1
             Nmin = 75
         else:
             prescaler = 0
             Nmin = 23
         #Get R from stepsize and reference frequency
-        R = int(self.ref_frequency / self.stepsize)
+        R = int(local_ref / self.stepsize)
 
         if frequency % self.stepsize != 0.0:
             raise ValueError('Frequency must be integer multiple of stepsize: {}'.format(self.stepsize))
@@ -162,18 +178,26 @@ def set_frequency(self, frequency):
 
         #Check that band select is smaller than 10 kHz, otherwise divide
         #until it is
-        fpfd = self.ref_frequency/R
+        fpfd = local_ref/R
+
         band_sel = 1
         if fpfd > 10e3:
             band_sel = int(math.ceil(fpfd/10e3))
         if band_sel > 255:
             band_sel = 255
 
+        #print("Div: " + str(div))
+        #print("prescaler: " + str(prescaler))
+        #print("R: " + str(R))
+        #print("INT: " + str(INT))
+        #print("fpfd: " + str(fpfd))
+        #print("band_sel: " + str(band_sel))
+
         self.rf_frequency = frequency
         # In REG4: Set calculated divider and band select, enable RF out at max power
         self.registers[4] = (div<<20) | (band_sel<<12) | (self.output_status<<5) | (3<<3) | 4
         # In REG2: Set calculated R value, enable double buffer, LDF=INT-N, LDP=6ns, PD_POL = Positive
-        self.registers[2] = (R<<14) | (1<<13) | (7<<9) | (1<<8) | (1<<7) | (1<<6) | 2
+        self.registers[2] = (self.double<<25) | (self.div2<<24) | (R<<14) | (1<<13) | (7<<9) | (1<<8) | (1<<7) | (1<<6) | 2
         # In REG1: Set prescaler value
         self.registers[1] = (prescaler <<27) | (1<<15) | (2<<3) | 1
         # In REG0: Set calculated INT value
@@ -208,7 +232,7 @@ def set_frequency_optimally(self, frequency):
 
         #Prescaler: 0 (4/5) if < 3.6 GHz, 1 (8/9) if >= 3.6 GHz
         #Nmin changes with prescaler:
-        if frequency >= 3.6e9:
+        if frequency >= 1.0e9:
             prescaler = 1
             Nmin = 75
         else: