scpi-pps: Use thread safe SCPI functions, return float not double.

[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 f3c58dcaacb03d5c6b0f1be1a0359ee627ecce65..c0ab6f4b1011020820c17c5505b89e4373c195d0 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -27,8 +27,6 @@
 #define CH_IDX(x) (1 << x)
 #define FREQ_DC_ONLY {0, 0, 0, 0, 0}
 
-static const uint32_t devopts_none[] = { };
-
 /* Agilent/Keysight N5700A series */
 static const uint32_t agilent_n5700a_devopts[] = {
        SR_CONF_CONTINUOUS,
@@ -204,9 +202,9 @@ static int chroma_62000p_probe_channels(struct sr_dev_inst *sdi,
        channel = g_malloc0(sizeof(struct channel_spec));
        channel->name = "1";
        channel->voltage[0] = channel->current[0] = channel->power[0] = 0.0;
-       channel->voltage[1] = (float)volts;
-       channel->current[1] = (float)amps;
-       channel->power[1]   = (float)watts;
+       channel->voltage[1] = volts;
+       channel->current[1] = amps;
+       channel->power[1]   = watts;
        channel->voltage[2] = channel->current[2] = 0.01;
        channel->voltage[3] = channel->voltage[4] = 3;
        channel->current[3] = channel->current[4] = 4;
@@ -220,6 +218,72 @@ static int chroma_62000p_probe_channels(struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
+/* Rigol DP700 series */
+static const uint32_t rigol_dp700_devopts[] = {
+       SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t rigol_dp700_devopts_cg[] = {
+       SR_CONF_REGULATION | SR_CONF_GET,
+       SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET,
+       SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET,
+       SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_VOLTAGE | SR_CONF_GET,
+       SR_CONF_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_CURRENT | SR_CONF_GET,
+       SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const struct channel_spec rigol_dp711_ch[] = {
+       { "1", { 0, 30, 0.01, 3, 3 }, { 0, 5, 0.01, 3, 3 }, { 0, 150, 0, 3, 3 }, FREQ_DC_ONLY },
+};
+
+static const struct channel_spec rigol_dp712_ch[] = {
+       { "1", { 0, 50, 0.01, 3, 3 }, { 0, 3, 0.01, 3, 3 }, { 0, 150, 0, 3, 3 }, FREQ_DC_ONLY },
+};
+
+static const struct channel_group_spec rigol_dp700_cg[] = {
+       { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+};
+
+/* Same as the DP800 series, except for the missing :SYST:OTP* commands. */
+static const struct scpi_command rigol_dp700_cmd[] = {
+       { SCPI_CMD_REMOTE, "SYST:REMOTE" },
+       { SCPI_CMD_LOCAL, "SYST:LOCAL" },
+       { SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" },
+       { SCPI_CMD_BEEPER_ENABLE, "SYST:BEEP:STAT ON" },
+       { SCPI_CMD_BEEPER_DISABLE, "SYST:BEEP:STAT OFF" },
+       { SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" },
+       { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
+       { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
+       { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE?" },
+       { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" },
+       { 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_OUTPUT_ENABLED, ":OUTP?" },
+       { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" },
+       { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" },
+       { SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE?" },
+       { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP?" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, ":OUTP:OVP ON" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, ":OUTP:OVP OFF" },
+       { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES?" },
+       { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL?" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL %.6f" },
+       { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP?" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":OUTP:OCP:STAT ON" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":OUTP:OCP:STAT OFF" },
+       { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES?" },
+       { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL?" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL %.6f" },
+       ALL_ZERO
+};
+
 /* Rigol DP800 series */
 static const uint32_t rigol_dp800_devopts[] = {
        SR_CONF_CONTINUOUS,
@@ -308,6 +372,9 @@ static const struct scpi_command rigol_dp800_cmd[] = {
 /* HP 663xx series */
 static const uint32_t hp_6630a_devopts[] = {
        SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t hp_6630a_devopts_cg[] = {
        SR_CONF_ENABLED | SR_CONF_SET,
        SR_CONF_VOLTAGE | SR_CONF_GET,
        SR_CONF_CURRENT | SR_CONF_GET,
@@ -319,6 +386,9 @@ static const uint32_t hp_6630a_devopts[] = {
 
 static const uint32_t hp_6632b_devopts[] = {
        SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t hp_6632b_devopts_cg[] = {
        SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_VOLTAGE | SR_CONF_GET,
        SR_CONF_CURRENT | SR_CONF_GET,
@@ -393,9 +463,9 @@ enum philips_pm2800_modules {
 
 static const struct philips_pm2800_module_spec {
        /* Min, max, programming resolution. */
-       float voltage[5];
-       float current[5];
-       float power[5];
+       double voltage[5];
+       double current[5];
+       double power[5];
 } philips_pm2800_module_specs[] = {
        /* Autoranging modules. */
        [PM2800_MOD_30V_10A] = { { 0, 30, 0.0075, 2, 4 }, { 0, 10, 0.0025, 2, 4 }, { 0, 60 } },
@@ -481,7 +551,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
                                spec->current[0], spec->current[1],
                                spec->power[0], spec->power[1]);
                (*channels)[i].name = (char *)philips_pm2800_names[i];
-               memcpy(&((*channels)[i].voltage), spec, sizeof(float) * 15);
+               memcpy(&((*channels)[i].voltage), spec, sizeof(double) * 15);
                (*channel_groups)[i].name = (char *)philips_pm2800_names[i];
                (*channel_groups)[i].channel_index_mask = 1 << i;
                (*channel_groups)[i].features = PPS_OTP | PPS_OVP | PPS_OCP;
@@ -604,7 +674,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
        /* HP 6633A */
        { "HP", "6633A", 0,
                ARRAY_AND_SIZE(hp_6630a_devopts),
-               ARRAY_AND_SIZE(devopts_none),
+               ARRAY_AND_SIZE(hp_6630a_devopts_cg),
                ARRAY_AND_SIZE(hp_6633a_ch),
                ARRAY_AND_SIZE(hp_663xx_cg),
                hp_6630a_cmd,
@@ -614,13 +684,31 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
        /* HP 6632B */
        { "HP", "6632B", 0,
                ARRAY_AND_SIZE(hp_6632b_devopts),
-               ARRAY_AND_SIZE(devopts_none),
+               ARRAY_AND_SIZE(hp_6632b_devopts_cg),
                ARRAY_AND_SIZE(hp_6632b_ch),
                ARRAY_AND_SIZE(hp_663xx_cg),
                hp_6632b_cmd,
                .probe_channels = NULL,
        },
 
+       /* Rigol DP700 series */
+       { "Rigol", "^DP711$", 0,
+               ARRAY_AND_SIZE(rigol_dp700_devopts),
+               ARRAY_AND_SIZE(rigol_dp700_devopts_cg),
+               ARRAY_AND_SIZE(rigol_dp711_ch),
+               ARRAY_AND_SIZE(rigol_dp700_cg),
+               rigol_dp700_cmd,
+               .probe_channels = NULL,
+       },
+       { "Rigol", "^DP712$", 0,
+               ARRAY_AND_SIZE(rigol_dp700_devopts),
+               ARRAY_AND_SIZE(rigol_dp700_devopts_cg),
+               ARRAY_AND_SIZE(rigol_dp712_ch),
+               ARRAY_AND_SIZE(rigol_dp700_cg),
+               rigol_dp700_cmd,
+               .probe_channels = NULL,
+       },
+
        /* Rigol DP800 series */
        { "Rigol", "^DP821A$", PPS_OTP,
                ARRAY_AND_SIZE(rigol_dp800_devopts),