Use SR_CONF_OUTPUT_VOLTAGE_TARGET and _CURRENT_LIMIT.

[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 b05602a4f60b3718edf6130c7dc602b01d21cbe0..d4a65204c4b2b19d87eca2a81c4929c0c65a6268 100644 (file)
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -39,26 +39,28 @@ const char *get_vendor(const char *raw_vendor)
        return raw_vendor;
 }
 
+static const uint32_t devopts_none[] = { };
+
 /* Rigol DP800 series */
-static const int32_t rigol_dp800_devopts[] = {
+static const uint32_t rigol_dp800_devopts[] = {
        SR_CONF_POWER_SUPPLY,
        SR_CONF_CONTINUOUS,
-       SR_CONF_OVER_TEMPERATURE_PROTECTION,
+       SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const int32_t rigol_dp800_devopts_cg[] = {
-       SR_CONF_OUTPUT_REGULATION,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD,
-       SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
-       SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
-       SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD,
-       SR_CONF_OUTPUT_VOLTAGE,
-       SR_CONF_OUTPUT_VOLTAGE_MAX,
-       SR_CONF_OUTPUT_CURRENT,
-       SR_CONF_OUTPUT_CURRENT_MAX,
-       SR_CONF_OUTPUT_ENABLED,
+static const uint32_t rigol_dp800_devopts_cg[] = {
+       SR_CONF_OUTPUT_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_OUTPUT_VOLTAGE | SR_CONF_GET,
+       SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+       SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 struct channel_spec rigol_dp831_ch[] = {
@@ -84,49 +86,40 @@ struct scpi_command rigol_dp800_cmd[] = {
        { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT? CH%s" },
        { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR? CH%s" },
        { SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE? CH%s" },
-       { SCPI_CMD_GET_VOLTAGE_MAX, ":SOUR%s:VOLT?" },
-       { SCPI_CMD_SET_VOLTAGE_MAX, ":SOUR%s:VOLT %.6f" },
-       { SCPI_CMD_GET_CURRENT_MAX, ":SOUR%s:CURR?" },
-       { SCPI_CMD_SET_CURRENT_MAX, ":SOUR%s:CURR %.6f" },
+       { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR%s:VOLT?" },
+       { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR%s:VOLT %.6f" },
+       { SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR%s:CURR?" },
+       { SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR%s:CURR %.6f" },
        { SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP? CH%s" },
-       { SCPI_CMD_SET_OUTPUT_ENABLED, ":OUTP CH%s,%s" },
+       { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP CH%s,ON" },
+       { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP CH%s,OFF" },
        { SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE? CH%s" },
        { SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION, ":SYST:OTP?" },
-       { SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION, ":SYST:OTP %s" },
+       { SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE, ":SYST:OTP ON" },
+       { SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE, ":SYST:OTP OFF" },
        { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP? CH%s" },
-       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP CH%s,%s" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, ":OUTP:OVP CH%s,ON" },
+       { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, ":OUTP:OVP CH%s,OFF" },
        { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES? CH%s" },
        { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL? CH%s" },
        { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL CH%s,%.6f" },
        { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP? CH%s" },
-       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP CH%s,%s" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":OUTP:OCP CH%s,ON" },
+       { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":OUTP:OCP CH%s,OFF" },
        { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES? CH%s" },
        { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL? CH%s" },
        { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL CH%s,%.6f" },
 };
 
-/* HP 663x series */
-static const int32_t hp_6632b_devopts[] = {
+/* HP 663xx series */
+static const uint32_t hp_6632b_devopts[] = {
        SR_CONF_POWER_SUPPLY,
        SR_CONF_CONTINUOUS,
-       SR_CONF_OUTPUT_ENABLED,
-       SR_CONF_OUTPUT_VOLTAGE,
-       SR_CONF_OUTPUT_CURRENT,
-       SR_CONF_OUTPUT_VOLTAGE_MAX,
-       SR_CONF_OUTPUT_CURRENT_MAX,
-//     SR_CONF_OVER_TEMPERATURE_PROTECTION,
-};
-
-static const int32_t hp_6632b_devopts_cg[] = {
-/*
-       SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD,
-       SR_CONF_OUTPUT_REGULATION,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
-       SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
-       SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
-       SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD,
-*/
+       SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+       SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+       SR_CONF_OUTPUT_VOLTAGE_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 struct channel_spec hp_6632b_ch[] = {
@@ -139,13 +132,14 @@ struct channel_group_spec hp_6632b_cg[] = {
 
 struct scpi_command hp_6632b_cmd[] = {
        { SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
-       { SCPI_CMD_SET_OUTPUT_ENABLED, "OUTP:STAT %s" },
+       { SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" },
+       { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" },
        { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
        { SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
-       { SCPI_CMD_GET_VOLTAGE_MAX, ":SOUR:VOLT?" },
-       { SCPI_CMD_SET_VOLTAGE_MAX, ":SOUR:VOLT %.6f" },
-       { SCPI_CMD_GET_CURRENT_MAX, ":SOUR:CURR?" },
-       { SCPI_CMD_SET_CURRENT_MAX, ":SOUR:CURR %.6f" },
+       { 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" },
 };
 
 
@@ -153,7 +147,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
        /* HP 6632B */
        { "HP", "6632B", 0,
                ARRAY_AND_SIZE(hp_6632b_devopts),
-               ARRAY_AND_SIZE(hp_6632b_devopts_cg),
+               ARRAY_AND_SIZE(devopts_none),
                ARRAY_AND_SIZE(hp_6632b_ch),
                ARRAY_AND_SIZE(hp_6632b_cg),
                ARRAY_AND_SIZE(hp_6632b_cmd),