From 86d58e39f3eeb9fa7a817ec000c2d4bca2f21d3d Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 30 Mar 2017 10:25:25 +0200
Subject: [PATCH 1/3] fix: correct typo zidriver

---
 qcodes/instrument_drivers/ZI/ZIUHFLI.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcodes/instrument_drivers/ZI/ZIUHFLI.py b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
index ad27db21e43..85c67dc2237 100644
--- a/qcodes/instrument_drivers/ZI/ZIUHFLI.py
+++ b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
@@ -1448,7 +1448,7 @@ def offset_valid():
             nonlocal value
             nonlocal number
             range_val = params['signal_output{}_range'.format(number+1)].get()
-            range_val = round(val, 3)
+            range_val = round(range_val, 3)
             amp_val = params['signal_output{}_amplitude'.format(number+1)].get()
             amp_val = round(amp_val, 3)
             toget = params['signal_output{}_autorange'.format(number+1)]

From dfa54bf5a2051c09084172c03a9eed4b1aaca0da Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 30 Mar 2017 10:28:48 +0200
Subject: [PATCH 2/3] fix: remove unused lines

---
 qcodes/instrument_drivers/ZI/ZIUHFLI.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qcodes/instrument_drivers/ZI/ZIUHFLI.py b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
index 85c67dc2237..1308c0cd004 100644
--- a/qcodes/instrument_drivers/ZI/ZIUHFLI.py
+++ b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
@@ -1451,8 +1451,6 @@ def offset_valid():
             range_val = round(range_val, 3)
             amp_val = params['signal_output{}_amplitude'.format(number+1)].get()
             amp_val = round(amp_val, 3)
-            toget = params['signal_output{}_autorange'.format(number+1)]
-            autorange_val = toget.get()
             if -range_val< value+amp_val > range_val:
                 raise ValueError('Signal Output: Offset too high for '
                                  'chosen range.')

From 2c9e197c78b0ca3be58b2897e4088a757b7417ff Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 30 Mar 2017 10:45:13 +0200
Subject: [PATCH 3/3] fix: add Demod units

---
 qcodes/instrument_drivers/ZI/ZIUHFLI.py | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/qcodes/instrument_drivers/ZI/ZIUHFLI.py b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
index 1308c0cd004..68876d9a3ae 100644
--- a/qcodes/instrument_drivers/ZI/ZIUHFLI.py
+++ b/qcodes/instrument_drivers/ZI/ZIUHFLI.py
@@ -290,6 +290,38 @@ def prepare_scope(self):
                       'AU Cartesian 2': 'arb. un',
                       'AU Polar 1': 'arb. un.',
                       'AU Polar 2': 'arb. un.',
+                      'Demod 1 X': 'V',
+                      'Demod 1 Y': 'V',
+                      'Demod 1 R': 'V',
+                      'Demod 1 Phase':  '°',
+                      'Demod 2 X': 'V',
+                      'Demod 2 Y': 'V',
+                      'Demod 2 R': 'V',
+                      'Demod 2 Phase': '°',
+                      'Demod 3 X': 'V',
+                      'Demod 3 Y': 'V',
+                      'Demod 3 R': 'V',
+                      'Demod 3 Phase': '°',
+                      'Demod 4 X': 'V',
+                      'Demod 4 Y': 'V',
+                      'Demod 4 R': 'V',
+                      'Demod 4 Phase': '°',
+                      'Demod 5 X': 'V',
+                      'Demod 5 Y': 'V',
+                      'Demod 5 R': 'V',
+                      'Demod 5 Phase': '°',
+                      'Demod 6 X': 'V',
+                      'Demod 6 Y': 'V',
+                      'Demod 6 R': 'V',
+                      'Demod 6 Phase': '°',
+                      'Demod 7 X': 'V',
+                      'Demod 7 Y': 'V',
+                      'Demod 7 R': 'V',
+                      'Demod 7 Phase': '°',
+                      'Demod 8 X': 'V',
+                      'Demod 8 Y': 'V',
+                      'Demod 8 R': 'V',
+                      'Demod 8 Phase': '°',
                       }
 
         #TODO: what are good names?