scpi-pps: Add HP 6631B, HP 66332A, HP 6633B and HP 6634B power supplies

[libsigrok.git] / src / hardware / scpi-pps / profiles.c

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index c0ab6f4b1011020820c17c5505b89e4373c195d0..e74645eec0d92ccd921703459c943ec12dca093f 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2015 Google, Inc.
  * (Written by Alexandru Gagniuc <mrnuke@google.com> for Google, Inc.)
+ * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -384,26 +385,44 @@ static const uint32_t hp_6630a_devopts_cg[] = {
        SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
 };
 
-static const uint32_t hp_6632b_devopts[] = {
+static const uint32_t hp_6630b_devopts[] = {
        SR_CONF_CONTINUOUS,
 };
 
-static const uint32_t hp_6632b_devopts_cg[] = {
+static const uint32_t hp_6630b_devopts_cg[] = {
        SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_VOLTAGE | SR_CONF_GET,
        SR_CONF_CURRENT | SR_CONF_GET,
        SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const struct channel_spec hp_6633a_ch[] = {
        { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY },
 };
 
+static const struct channel_spec hp_6631b_ch[] = {
+       { "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 10.237, 0.00263, 4, 5 }, { 0, 83.84103 }, FREQ_DC_ONLY },
+};
+
 static const struct channel_spec hp_6632b_ch[] = {
        { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY },
 };
 
+static const struct channel_spec hp_66332a_ch[] = {
+       { "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY },
+};
+
+static const struct channel_spec hp_6633b_ch[] = {
+       { "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.000526, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY },
+};
+
+static const struct channel_spec hp_6634b_ch[] = {
+       { "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.000263, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY },
+};
+
 static const struct channel_group_spec hp_663xx_cg[] = {
        { "1", CH_IDX(0), 0 },
 };
@@ -421,7 +440,9 @@ static const struct scpi_command hp_6630a_cmd[] = {
        ALL_ZERO
 };
 
-static const struct scpi_command hp_6632b_cmd[] = {
+static const struct scpi_command hp_6630b_cmd[] = {
+       { SCPI_CMD_REMOTE, "SYST:REM" },
+       { SCPI_CMD_LOCAL, "SYST:LOC" },
        { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
        { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" },
        { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" },
@@ -431,6 +452,11 @@ static const struct scpi_command hp_6632b_cmd[] = {
        { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" },
        { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" },
        { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" },
+       { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":CURR:PROT:STAT?" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":CURR:PROT:STAT 1" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT 0" },
+       { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" },
        ALL_ZERO
 };
 
@@ -681,13 +707,53 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
                .probe_channels = NULL,
        },
 
+       /* HP 6631B */
+       { "HP", "6631B", PPS_OVP | PPS_OCP | PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6631b_ch),
+               ARRAY_AND_SIZE(hp_663xx_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+       },
+
        /* HP 6632B */
-       { "HP", "6632B", 0,
-               ARRAY_AND_SIZE(hp_6632b_devopts),
-               ARRAY_AND_SIZE(hp_6632b_devopts_cg),
+       { "HP", "6632B", PPS_OVP | PPS_OCP | PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
                ARRAY_AND_SIZE(hp_6632b_ch),
                ARRAY_AND_SIZE(hp_663xx_cg),
-               hp_6632b_cmd,
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+       },
+
+       /* HP 66332A */
+       { "HP", "66332A", PPS_OVP | PPS_OCP | PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_66332a_ch),
+               ARRAY_AND_SIZE(hp_663xx_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+       },
+
+       /* HP 6633B */
+       { "HP", "6633B", PPS_OVP | PPS_OCP | PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6633b_ch),
+               ARRAY_AND_SIZE(hp_663xx_cg),
+               hp_6630b_cmd,
+               .probe_channels = NULL,
+       },
+
+       /* HP 6634B */
+       { "HP", "6634B", PPS_OVP | PPS_OCP | PPS_OTP,
+               ARRAY_AND_SIZE(hp_6630b_devopts),
+               ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+               ARRAY_AND_SIZE(hp_6634b_ch),
+               ARRAY_AND_SIZE(hp_663xx_cg),
+               hp_6630b_cmd,
                .probe_channels = NULL,
        },