spirack 0.2.16__tar.gz → 0.2.18__tar.gz

{spirack-0.2.16 → spirack-0.2.18}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: spirack
-Version: 0.2.16
+Version: 0.2.18
 Summary: Drivers for the QuTech SPI-rack
-Home-page: https://github.com/mtiggelman/SPI-rack
-Author: Marijn Tiggelman
+Home-page: https://github.com/qutechdev/SPI-rack
+Author: QuTech Electronics Team
 Author-email: qutechdev@gmail.com
 License: MIT
 Keywords: SPI,Qcodes,SPI-rack,QuTech,TU Delft,SPI
@@ -35,7 +35,7 @@ D5a = D5a_module(spi, module=2)
 # Set the output of DAC 1 to the desired voltage
 D5a.set_voltage(0, voltage=2.1)
 ```
-More examples can be found as Jupyter notebooks in [examples](https://github.com/mtiggelman/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
+More examples can be found as Jupyter notebooks in [examples](https://github.com/qutechdev/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
 
 ## Installation
 **Windows 7&8 users:** before connecting the SPI-rack for the first time, install the drivers located
@@ -48,4 +48,4 @@ For a basic install use: `pip install spirack`. For more details see the website
 Qcodes wrappers for certain modules are available from https://github.com/QCoDeS/Qcodes
 
 ## License
-See [License](https://github.com/mtiggelman/SPI-rack/blob/master/LICENSE).
+See [License](https://github.com/qutechdev/SPI-rack/blob/master/LICENSE).

{spirack-0.2.16 → spirack-0.2.18}/README.md

@@ -18,7 +18,7 @@ D5a = D5a_module(spi, module=2)
 # Set the output of DAC 1 to the desired voltage
 D5a.set_voltage(0, voltage=2.1)
 ```
-More examples can be found as Jupyter notebooks in [examples](https://github.com/mtiggelman/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
+More examples can be found as Jupyter notebooks in [examples](https://github.com/qutechdev/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
 
 ## Installation
 **Windows 7&8 users:** before connecting the SPI-rack for the first time, install the drivers located
@@ -31,4 +31,4 @@ For a basic install use: `pip install spirack`. For more details see the website
 Qcodes wrappers for certain modules are available from https://github.com/QCoDeS/Qcodes
 
 ## License
-See [License](https://github.com/mtiggelman/SPI-rack/blob/master/LICENSE).
+See [License](https://github.com/qutechdev/SPI-rack/blob/master/LICENSE).

{spirack-0.2.16 → spirack-0.2.18}/setup.py

@@ -30,8 +30,8 @@ setup(name='spirack',
       description='Drivers for the QuTech SPI-rack',
       long_description=long_description,
       long_description_content_type="text/markdown",
-      url='https://github.com/mtiggelman/SPI-rack',
-      author='Marijn Tiggelman',
+      url='https://github.com/qutechdev/SPI-rack',
+      author='QuTech Electronics Team',
       author_email='qutechdev@gmail.com',
       license='MIT',
       packages=['spirack'],

{spirack-0.2.16 → spirack-0.2.18}/spirack/D5a_module.py

@@ -44,8 +44,8 @@ class D5a_module(object):
 
     # DAC software span constants
     range_4V_uni = 0
-    range_8V_uni = 1
     range_4V_bi = 2
+    range_8V_uni = 1
     range_8V_bi = 3
     range_2V_bi = 4
 
@@ -67,8 +67,8 @@ class D5a_module(object):
         self.spi_rack = spi_rack
         self.module = module
         self._num_dacs = num_dacs
-        self.span = [np.NaN]*self._num_dacs
-        self.voltages = [np.NaN]*self._num_dacs
+        self.span = [np.nan]*self._num_dacs
+        self.voltages = [np.nan]*self._num_dacs
 
         for i in range(self._num_dacs):
             self.get_settings(i)
@@ -254,34 +254,6 @@ class D5a_module(object):
         # send data via controller
         self.spi_rack.write_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_SPEED, data)
 
-    def update_multiple_this_is_a_test(self, DAC1, DAC2):
-        """Updates the output of the DAC to the written value
-
-        Updates the output of the DAC when called. Neccessary after using
-        change_value or change_span when wanting to update the DAC.
-
-        Args:
-            DAC (int: 0-15): DAC inside the module of which to update
-        """
-        if DAC not in range(self._num_dacs):
-            raise ValueError('D5a module {} [update]: DAC {} does not exist.'.format(self.module, DAC))
-
-        # Determine which DAC in IC by checking even/uneven
-        address = (DAC%2)<<1
-
-        # Update DAC to given span/value
-        command = 0b0100
-        b1 = (command<<4) | address
-        b2 = 0
-        b3 = 0
-        b4 = 0
-        data = bytearray([b1, b2, b3, b4])
-
-        # Determine in which IC the DAC is, for SPI chip select
-        DAC_ic = DAC//2
-        # send data via controller
-        self.spi_rack.write_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_SPEED, data)
-
     def set_voltage(self, DAC, voltage):
         """Sets the DAC output voltage and updates the DAC output
 
@@ -346,7 +318,7 @@ class D5a_module(object):
     def get_stepsize(self, DAC):
         """Returns the smallest voltage step for a given DAC
 
-        Calculates and returns the smalles voltage step of the DAC for the
+        Calculates and returns the smallest voltage step of the DAC for the
         set span. Voltage steps smaller than this will not change the DAC value.
         Recommended to only step the DAC in multiples of this value, as otherwise
         steps might not behave as expected.
@@ -360,13 +332,15 @@ class D5a_module(object):
             raise ValueError('D5a module {} [get_stepsize]: DAC {} does not exist.'.format(self.module, DAC))
 
         if self.span[DAC] == D5a_module.range_4V_uni:
-            return 4.0/(2**18)
-        if self.span[DAC] == (D5a_module.range_4V_bi or D5a_module.range_8V_uni):
-            return 8.0/(2**18)
-        if self.span[DAC] == D5a_module.range_8V_bi:
-            return 16.0/(2**18)
-        if self.span[DAC] == D5a_module.range_2V_bi:
-            return 4.0/(2**18)
+            return 4.0 / (2 ** 18)
+        elif self.span[DAC] == D5a_module.range_4V_bi or self.span[DAC] == D5a_module.range_8V_uni:
+            return 8.0 / (2 ** 18)
+        elif self.span[DAC] == D5a_module.range_8V_bi:
+            return 16.0 / (2 ** 18)
+        elif self.span[DAC] == D5a_module.range_2V_bi:
+            return 4.0 / (2 ** 18)
+        else:
+            raise ValueError(f"Span for DAC {DAC} not set to valid value. Span currently set to {self.span[DAC]}.")
 
     def get_settings(self, DAC):
         """Reads current DAC settings
@@ -388,14 +362,14 @@ class D5a_module(object):
         DAC_ic = DAC//2
 
         # Read code command
-        command = 0b1101                                       # 0xd
+        command = 0b1101
         data = bytearray([(command<<4) | address, 0, 0, 0])
 
         code_data = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
         code = (code_data[1]<<10) | (code_data[2]<<2) | (code_data[3]>>6)
 
         # Read span command
-        command = 0b1100                                       # 0xc
+        command = 0b1100
         data = bytearray([(command<<4) | address, 0, 0, 0])
 
         span_data = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
@@ -416,5 +390,43 @@ class D5a_module(object):
 
         self.voltages[DAC] = voltage
         self.span[DAC] = span
-        
+
         return [voltage, span]
+
+    def is_D5a_communicating(self):
+        """Checks proper communication with the D5a.
+        """
+        DAC = 0   # DAC 0 is expected available for any D5a version (any number of DACs)
+
+        # Determine which DAC in IC by checking even/uneven
+        address = (DAC%2)<<1
+        # Determine in which IC the DAC is, for SPI chip select
+        DAC_ic = DAC//2
+
+        # Read initial value of input code resgiter.
+        # Any value could be legal and user-given
+    
+        # Command to read input code register
+        command = 0b1011
+        data = bytearray([(command<<4) | address, 0, 0, 0])
+        orig_data_rd = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
+        orig_value = (orig_data_rd[1]<<10) | (orig_data_rd[2]<<2) | (orig_data_rd[3]>>6)
+
+        # Write a new value and read back to check
+        # First write to the input code register
+        test_value = 177033                           # Arbitrary, 0b10 1011 0011 1000 1001
+        self.change_value(DAC, test_value)
+        # Now read back the updated value
+        command = 0b1011
+        data = bytearray([(command<<4) | address, 0, 0, 0])
+        new_data_rd = self.spi_rack.read_data(self.module, DAC_ic, LTC2758_MODE, LTC2758_RD_SPEED, data)
+        new_value = (new_data_rd[1]<<10) | (new_data_rd[2]<<2) | (new_data_rd[3]>>6)
+    
+        # Write again the original value
+        self.change_value(DAC, orig_value)
+    
+        # Check and return the result
+        if (test_value != new_value):
+            return 0
+        else:
+            return 1

{spirack-0.2.16 → spirack-0.2.18}/spirack/spi_rack.py

@@ -381,3 +381,11 @@ class SPI_rack(serial.Serial):
 
             version = self.readline().decode('utf-8')
             return version[:-1]
+
+    def is_C1b_communicating(self):
+        """
+        """
+        if (self.get_battery()==[0.0,0.0]) and (self.get_temperature()==0.0):
+            if (self.get_battery()==[0.0,0.0]) and (self.get_temperature()==0.0):
+                return 0
+        return 1

spirack-0.2.18/spirack/version.py

@@ -0,0 +1 @@
+__version__ = '0.2.18'

{spirack-0.2.16 → spirack-0.2.18}/spirack.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: spirack
-Version: 0.2.16
+Version: 0.2.18
 Summary: Drivers for the QuTech SPI-rack
-Home-page: https://github.com/mtiggelman/SPI-rack
-Author: Marijn Tiggelman
+Home-page: https://github.com/qutechdev/SPI-rack
+Author: QuTech Electronics Team
 Author-email: qutechdev@gmail.com
 License: MIT
 Keywords: SPI,Qcodes,SPI-rack,QuTech,TU Delft,SPI
@@ -35,7 +35,7 @@ D5a = D5a_module(spi, module=2)
 # Set the output of DAC 1 to the desired voltage
 D5a.set_voltage(0, voltage=2.1)
 ```
-More examples can be found as Jupyter notebooks in [examples](https://github.com/mtiggelman/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
+More examples can be found as Jupyter notebooks in [examples](https://github.com/qutechdev/SPI-rack/tree/master/examples) or at the [website](http://qtwork.tudelft.nl/~mtiggelman/software/examples.html).
 
 ## Installation
 **Windows 7&8 users:** before connecting the SPI-rack for the first time, install the drivers located
@@ -48,4 +48,4 @@ For a basic install use: `pip install spirack`. For more details see the website
 Qcodes wrappers for certain modules are available from https://github.com/QCoDeS/Qcodes
 
 ## License
-See [License](https://github.com/mtiggelman/SPI-rack/blob/master/LICENSE).
+See [License](https://github.com/qutechdev/SPI-rack/blob/master/LICENSE).

spirack-0.2.16/spirack/version.py

@@ -1 +0,0 @@
-__version__ = '0.2.16'