more RF functions

1 files changed, 56 insertions, 1 deletions

diff --git a/qolab/hardware/rf_generator/agilent_e8257d.py b/qolab/hardware/rf_generator/agilent_e8257d.py
index dab2277..e765d85 100644
--- a/qolab/hardware/rf_generator/agilent_e8257d.py
+++ b/qolab/hardware/rf_generator/agilent_e8257d.py
@@ -13,6 +13,13 @@ class AgilentE8257D(RFGeneratorSCPI):
             'RFPowerState',
             'RFAmplitude',
             'ModulationState',
+            'FM1State',
+            'FM1Source',
+            'FM1ModulationDepth',
+            'FM2State',
+            'FM2Source',
+            'FM2ModulationDepth',
+            'FrequencyMode', # sweep or continious
             'SweepCentralFreq', 'SweepSpan',
             ])
 
@@ -66,9 +73,57 @@ class AgilentE8257D(RFGeneratorSCPI):
     def getRFAmplitude(self):
         return(float(self.query(f':POWer:AMPLitude?')))
 
-    def seRFAmplitude(self, val):
+    def setRFAmplitude(self, val):
         rstr = self.write(f':POWer:AMPLitude {val}')
 
+    def getFM1ModulationDepth(self):
+        return(float(self.query(f':FM1:Deviation?')))
+
+    def setFM1ModulationDepth(self, val):
+        rstr = self.write(f':FM1:Deviation {val}')
+
+    def getFM2ModulationDepth(self):
+        return(float(self.query(f':FM2:Deviation?')))
+
+    def setFM2ModulationDepth(self, val):
+        rstr = self.write(f':FM2:Deviation {val}')
+
+    def getFM1Source(self):
+        return(str(self.query(f':FM1:Source?')))
+
+    def setFM1Source(self, val):
+        rstr = self.write(f':FM1:Source {val}')
+
+    def getFM2Source(self):
+        return(str(self.query(f':FM2:Source?')))
+
+    def setFM2Source(self, val):
+        rstr = self.write(f':FM2:Source {val}')
+
+    def getFM1State(self):
+        return(int(self.query(f':FM1:State?')))
+
+    def setFM1State(self, val):
+        rstr = self.write(f':FM1:State {val}')
+
+    def getFM2State(self):
+        return(int(self.query(f':FM2:State?')))
+
+    def setFM2State(self, val):
+        rstr = self.write(f':FM2:State {val}')
+
+    def getFrequencyMode(self):
+        return(str(self.query(f':Frequency:Mode?')))
+
+    def setFrequencyMode(self, val):
+        rstr = self.write(f':Frequency:Mode {val}')
+
+    def startFrequencySweep(self):
+        self.setFrequencyMode('Sweep')
+
+    def stopFrequencySweep(self):
+        self.setFrequencyMode('FIXED')
+
 if __name__ == '__main__': 
     import pyvisa
     print("testing")