X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=c0ab6f4b1011020820c17c5505b89e4373c195d0;hb=17a82e83ff4c2a7dc1bcc4f5ab6197c16a3b72de;hp=f2cbf7378c3d0c438aabfcf017ef61e5c90f6246;hpb=d9251a2c9f1ca4380c27240ccca90c9f9ed46d3f;p=libsigrok.git diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c index f2cbf737..c0ab6f4b 100644 --- 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, @@ -130,7 +128,6 @@ static const struct scpi_command chroma_61604_cmd[] = { }; /* Chroma 62000 series DC source */ - static const uint32_t chroma_62000_devopts[] = { SR_CONF_CONTINUOUS, }; @@ -205,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; @@ -221,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, @@ -307,9 +370,11 @@ 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, @@ -321,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, @@ -395,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 } }, @@ -483,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; @@ -515,6 +583,53 @@ static const struct scpi_command philips_pm2800_cmd[] = { ALL_ZERO }; +static const uint32_t rs_hmc8043_devopts[] = { + SR_CONF_CONTINUOUS, +}; + +static const uint32_t rs_hmc8043_devopts_cg[] = { + 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_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 rs_hmc8043_ch[] = { + { "1", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY }, + { "2", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY }, + { "3", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 3, 0.001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY }, +}; + +static const struct channel_group_spec rs_hmc8043_cg[] = { + { "1", CH_IDX(0), PPS_OVP }, + { "2", CH_IDX(1), PPS_OVP }, + { "3", CH_IDX(2), PPS_OVP }, +}; + +static const struct scpi_command rs_hmc8043_cmd[] = { + { SCPI_CMD_SELECT_CHANNEL, "INST:NSEL %s" }, + { SCPI_CMD_GET_MEAS_VOLTAGE, "MEAS:VOLT?" }, + { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" }, + { SCPI_CMD_GET_VOLTAGE_TARGET, "VOLT?" }, + { SCPI_CMD_SET_VOLTAGE_TARGET, "VOLT %.6f" }, + { SCPI_CMD_GET_CURRENT_LIMIT, "CURR?" }, + { SCPI_CMD_SET_CURRENT_LIMIT, "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_OVER_VOLTAGE_PROTECTION_ACTIVE, "VOLT:PROT:TRIP?" }, + { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:PROT:LEV?" }, + { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:PROT:LEV %.6f" }, + { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, "VOLT:PROT:STAT?" }, + { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, "VOLT:PROT:STAT ON" }, + { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, "VOLT:PROT:STAT OFF" }, + ALL_ZERO +}; + SR_PRIV const struct scpi_pps pps_profiles[] = { /* Agilent N5763A */ { "Agilent", "N5763A", 0, @@ -525,6 +640,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { agilent_n5700a_cmd, .probe_channels = NULL, }, + /* Agilent N5767A */ { "Agilent", "N5767A", 0, ARRAY_AND_SIZE(agilent_n5700a_devopts), @@ -534,6 +650,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { agilent_n5700a_cmd, .probe_channels = NULL, }, + /* Chroma 61604 */ { "Chroma", "61604", 0, ARRAY_AND_SIZE(chroma_61604_devopts), @@ -543,6 +660,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { chroma_61604_cmd, .probe_channels = NULL, }, + /* Chroma 62000 series */ { "Chroma", "620[0-9]{2}P-[0-9]{2,3}-[0-9]{1,3}", 0, ARRAY_AND_SIZE(chroma_62000_devopts), @@ -552,10 +670,11 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { chroma_62000_cmd, .probe_channels = chroma_62000p_probe_channels, }, + /* 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, @@ -565,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), @@ -607,6 +744,16 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { philips_pm2800_cmd, philips_pm2800_probe_channels, }, + + /* Rohde & Schwarz HMC8043 */ + { "Rohde&Schwarz", "HMC8043", 0, + ARRAY_AND_SIZE(rs_hmc8043_devopts), + ARRAY_AND_SIZE(rs_hmc8043_devopts_cg), + ARRAY_AND_SIZE(rs_hmc8043_ch), + ARRAY_AND_SIZE(rs_hmc8043_cg), + rs_hmc8043_cmd, + .probe_channels = NULL, + }, }; SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);