Merge branch 'tektronix-generator'

Author: FlyingCurryMonster

pymeasure/instruments/tektronix/afg3152c.py

@@ -21,7 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-from math import sqrt, log10
+from math import sqrt, log10, pi
 from pymeasure.instruments import Instrument, Channel, SCPIUnknownMixin
 from pymeasure.instruments.validators import strict_range, strict_discrete_set
 
@@ -51,6 +51,10 @@ class AFG3152CChannel(Channel):
         ),
     }  # Vpp, Vrms and dBm limits
     UNIT_LIMIT = ["VPP", "VRMS", "DBM"]
+    PHASE_LIMIT = {
+        "DEG": [-180, 180],
+        "RAD": [-pi, pi]
+    }
     IMP_LIMIT = [1, 1e4]
 
     shape = Instrument.control(
@@ -108,6 +112,21 @@ class AFG3152CChannel(Channel):
         values=FREQ_LIMIT,
     )
 
+    phase_rad = Instrument.control(
+        "phase:adjust?", "phase:adjust %e RAD",
+        """Controls the phase in radians (float).""",
+        validator=strict_range,
+        values=PHASE_LIMIT['RAD']
+    )
+
+    phase_deg = Instrument.control(
+        "phase:adjust?", "phase:adjust %e DEG",
+        """Controls the phase in degrees (float)""",
+        validator=strict_range,
+        values=PHASE_LIMIT['DEG'],
+        get_process=lambda x: x * 180 / pi
+    )
+
     duty = Instrument.control(
         "pulse:dcycle?",
         "pulse:dcycle %.3f",