return SR_OK;
}
+/* Envox EEZ PSU Series */
+static const uint32_t eez_psu_devopts[] = {
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const uint32_t eez_psu_devopts_cg[] = {
+ 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,
+ SR_CONF_REGULATION | SR_CONF_GET,
+ SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET,
+ SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET,
+ SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET,
+ SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET,
+};
+
+static const struct scpi_command eez_psu_cmd[] = {
+ { SCPI_CMD_REMOTE, "SYST:REMOTE" },
+ { SCPI_CMD_LOCAL, "SYST:LOCAL" },
+ { 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:POWER?" },
+ { SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE?" },
+ { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" },
+ { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.2f" },
+ { 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_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:PROT?" },
+ { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT?" },
+ ALL_ZERO
+};
+
+/*
+ * The EEZ BB3 protocol currently specifies up to six channels. The older
+ * EEZ PSU design only has room for two in its enclosure design.
+ *
+ * If a future model's SCPI spec allows more than six models then we can
+ * extend this to support more.
+ */
+static const char *eez_psu_channel_names[] = { "1", "2", "3", "4", "5", "6", };
+
+static int eez_psu_probe_channels(struct sr_dev_inst *sdi,
+ struct sr_scpi_hw_info *hw_info,
+ struct channel_spec **channels, unsigned int *num_channels,
+ struct channel_group_spec **channel_groups,
+ unsigned int *num_channel_groups)
+{
+ struct sr_scpi_dev_inst *scpi;
+ int ret, intval;
+ size_t i, channel_count;
+ double limit_val;
+ const char *channel_name;
+
+ /*
+ * The EEZ PSU family is intended by the designer to be end-user
+ * customizable, so this is intentionally a little more dynamic
+ * than strictly necessary for the "stock" models, to make it
+ * more likely to automatically support end-user upgrades of the
+ * various ranges.
+ *
+ * The BB3 in particular supports various different modular
+ * power supply frontends that offer different voltage/current
+ * limits and different numbers of independent channels, such as
+ * three PSU modules that have two channels each for a total of
+ * six controllable channels.
+ *
+ * This currently supports both the original EEZ PSU design
+ * (H24005, when in its stock build configuration) and the
+ * successor EEZ BB3 design.
+ */
+
+ scpi = sdi->conn;
+ ret = sr_scpi_get_int(scpi, ":SYST:CHAN:COUN?", &intval);
+ if (ret != SR_OK) {
+ sr_err("Failed to probe EEZ PSU channel count.");
+ return ret;
+ }
+ if (intval < 0) {
+ sr_err("Suspicious channel count %d, ignoring.", intval);
+ return SR_ERR_DATA;
+ }
+ channel_count = intval;
+ if (channel_count > ARRAY_SIZE(eez_psu_channel_names)) {
+ /*
+ * No known EEZ PSU specifies more than six channels at
+ * the time of writing, so it would be weird to get here
+ * but we'll allow it to be robust.
+ */
+ sr_warn("Only using first %zu of %zu EEZ PSU channels.",
+ channel_count, ARRAY_SIZE(eez_psu_channel_names));
+ channel_count = ARRAY_SIZE(eez_psu_channel_names);
+ }
+
+ sr_spew("EEZ PSU (%s) has channel count %zu.",
+ hw_info->model, channel_count);
+
+ *channels = g_malloc0(sizeof(**channels) * channel_count);
+ *channel_groups = g_malloc0(sizeof(**channel_groups) * channel_count);
+ for (i = 0; i < channel_count; i++) {
+ channel_name = eez_psu_channel_names[i];
+
+ /*
+ * Select the channel to prepare for our various "get"
+ * calls below.
+ */
+ ret = sr_scpi_send(scpi, ":INST:NSEL %s", channel_name);
+ if (ret != SR_OK) {
+ sr_err("Failed to select %s to retrieve its limits.",
+ channel_name);
+ return ret;
+ }
+
+ (*channel_groups)[i].name = channel_name;
+ (*channel_groups)[i].channel_index_mask = CH_IDX(i);
+ (*channel_groups)[i].features = PPS_OVP | PPS_OCP;
+ (*channel_groups)[i].mqflags = SR_MQFLAG_DC;
+
+ (*channels)[i].name = channel_name;
+
+ ret = sr_scpi_get_double(scpi,
+ ":SYST:CHAN:INFO:CURR?", &limit_val);
+ if (ret != SR_OK) {
+ sr_err("Failed to read the current limit for %s.",
+ channel_name);
+ return ret;
+ }
+ (*channels)[i].current[0] = 0.0;
+ (*channels)[i].current[1] = limit_val;
+ (*channels)[i].current[2] = 0.01; /* Programming resolution. */
+ (*channels)[i].current[3] = 2; /* Spec digits. */
+ (*channels)[i].current[4] = 2; /* Encoding digits. */
+
+ ret = sr_scpi_get_double(scpi,
+ ":SYST:CHAN:INFO:VOLT?", &limit_val);
+ if (ret != SR_OK) {
+ sr_err("Failed to read the voltage limit for %s.",
+ channel_name);
+ return ret;
+ }
+ (*channels)[i].voltage[0] = 0.0;
+ (*channels)[i].voltage[1] = limit_val;
+ (*channels)[i].voltage[2] = 0.01; /* Programming resolution. */
+ (*channels)[i].voltage[3] = 2; /* Spec digits. */
+ (*channels)[i].voltage[4] = 2; /* Encoding digits. */
+
+ ret = sr_scpi_get_double(scpi,
+ ":SYST:CHAN:INFO:POW?", &limit_val);
+ if (ret != SR_OK) {
+ sr_err("Failed to read the power limit for %s.",
+ channel_name);
+ return ret;
+ }
+ (*channels)[i].power[0] = 0.0;
+ (*channels)[i].power[1] = limit_val;
+ (*channels)[i].power[2] = 0.01; /* Programming resolution. */
+ (*channels)[i].power[3] = 2; /* Spec digits. */
+ (*channels)[i].power[4] = 2; /* Encoding digits. */
+ }
+ *num_channels = *num_channel_groups = channel_count;
+
+ return SR_OK;
+}
+
/* Rigol DP700 series */
static const uint32_t rigol_dp700_devopts[] = {
SR_CONF_CONTINUOUS,
ALL_ZERO
};
-static int hp_6630a_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630a_init_acquisition(const struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi;
- int ret;
scpi = sdi->conn;
* Monitor CV (1), CC+ (2), UR (4), OVP (8), OTP (16), OCP (64) and
* CC- (256) bits of the Status Register for the FAULT? query.
*/
- ret = sr_scpi_send(scpi, "UNMASK 607");
- if (ret != SR_OK)
- return ret;
-
- return SR_OK;
+ return sr_scpi_send(scpi, "UNMASK 607");
}
static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
regulation_changed = (fault & (1 << 9)) | regulation_changed;
if (regulation_changed) {
- if (cv && !cc_pos && !cc_neg &&!unreg)
+ if (cv && !cc_pos && !cc_neg && !unreg)
regulation = "CV";
else if (cc_pos && !cv && !cc_neg && !unreg)
regulation = "CC";
regulation = "CC-";
else if (unreg && !cv && !cc_pos && !cc_neg)
regulation = "UR";
- else if (!cv && !cc_pos && !cc_neg &&!unreg)
+ else if (!cv && !cc_pos && !cc_neg && !unreg)
regulation = "";
else {
sr_dbg("Undefined regulation for HP 66xxA "
{ "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00132, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
};
+static const struct channel_spec hp_66312a_ch[] = {
+ { "1", { 0, 20.475, 0.0001, 4, 5 }, { 0, 2.0475, 0.0001, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.01 }, NO_OCP_LIMITS },
+};
+
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, { 0, 22, 0.1 }, NO_OCP_LIMITS },
};
ALL_ZERO
};
-static int hp_6630b_init_aquisition(const struct sr_dev_inst *sdi)
+static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi;
int ret;
/*
* Check if output state has changed, due to one of the
* questionable states changed.
- * NOTE: The output state is send even if it hasn't changed, but that
- * only happends rarely.
+ * NOTE: The output state is sent even if it hasn't changed,
+ * but that only happens rarely.
*/
ret = sr_scpi_get_bool(scpi, "OUTP:STAT?", &output_enabled);
if (ret != SR_OK)
}
if (regulation_changed) {
- if (cv && !cc_pos && !cc_neg &&!unreg)
+ if (cv && !cc_pos && !cc_neg && !unreg)
regulation = "CV";
else if (cc_pos && !cv && !cc_neg && !unreg)
regulation = "CC";
regulation = "CC-";
else if (unreg && !cv && !cc_pos && !cc_neg)
regulation = "UR";
- else if (!cv && !cc_pos && !cc_neg &&!unreg)
- /* This happends in case of OCP active */
+ else if (!cv && !cc_pos && !cc_neg && !unreg)
+ /* This happens in case of OCP active. */
regulation = "";
else {
- /* This happends from time to time (CV and CC+ active). */
+ /* This happens from time to time (CV and CC+ active). */
sr_dbg("Undefined regulation for HP 66xxB "
"(CV=%i, CC+=%i, CC-=%i, UR=%i).",
cv, cc_pos, cc_neg, unreg);
return SR_OK;
}
+/* Owon P4000 series */
+static const uint32_t owon_p4000_devopts[] = {
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET
+};
+
+static const uint32_t owon_p4000_devopts_cg[] = {
+ SR_CONF_ENABLED | 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_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const struct channel_spec owon_p4603_ch[] = {
+ { "1", { 0.01, 60, 0.001, 3, 3 }, { 0.001, 3, 0.001, 3, 3 }, { 0, 180, 0, 3, 3 }, FREQ_DC_ONLY, { 0.01, 61, 0.001}, { 0.001, 3.1, 0.001} },
+};
+
+static const struct channel_spec owon_p4305_ch[] = {
+ { "1", { 0.01, 30, 0.001, 3, 3 }, { 0.001, 5, 0.001, 3, 3 }, { 0, 180, 0, 3, 3 }, FREQ_DC_ONLY, { 0.01, 31, 0.001}, { 0.001, 3.1, 0.001} },
+};
+
+static const struct channel_group_spec owon_p4000_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
+};
+
+static const struct scpi_command owon_p4000_cmd[] = {
+ { SCPI_CMD_GET_MEAS_VOLTAGE, "MEAS:VOLT?" },
+ { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" },
+ { SCPI_CMD_GET_MEAS_POWER, "MEAS:POW?" },
+ { 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 1" },
+ { SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP 0" },
+ { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:LIM?" },
+ { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "VOLT:LIM %.6f" },
+ { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, "CURR:LIM?" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, "CURR:LIM %.6f" },
+ ALL_ZERO
+};
+
/* Philips/Fluke PM2800 series */
static const uint32_t philips_pm2800_devopts[] = {
SR_CONF_CONTINUOUS,
ALL_ZERO
};
+static const uint32_t rs_hmp4040_devopts[] = {
+ SR_CONF_CONTINUOUS,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const uint32_t rs_hmp4040_devopts_cg[] = {
+ SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET,
+ 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,
+ SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
+ SR_CONF_REGULATION | SR_CONF_GET,
+};
+
+static const struct channel_spec rs_hmp2020_ch[] = {
+ { "1", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 10.01, 0.0002, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "2", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 5.01, 0.0001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec rs_hmp2030_ch[] = {
+ { "1", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 5.01, 0.0001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "2", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 5.01, 0.0001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "3", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 5.01, 0.0001, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec rs_hmp4040_ch[] = {
+ { "1", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 10.01, 0.0002, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "2", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 10.01, 0.0002, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "3", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 10.01, 0.0002, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+ { "4", { 0, 32.050, 0.001, 3, 4 }, { 0.001, 10.01, 0.0002, 3, 4 }, { 0, 0, 0, 0, 4 }, FREQ_DC_ONLY, NO_OVP_LIMITS, NO_OCP_LIMITS },
+};
+
+static const struct channel_group_spec rs_hmp4040_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OTP, SR_MQFLAG_DC },
+ { "2", CH_IDX(1), PPS_OVP | PPS_OTP, SR_MQFLAG_DC },
+ { "3", CH_IDX(2), PPS_OVP | PPS_OTP, SR_MQFLAG_DC },
+ { "4", CH_IDX(3), PPS_OVP | PPS_OTP, SR_MQFLAG_DC },
+};
+
+/*
+ * Developer's note: Currently unused device commands. Some of them
+ * are not in use because SCPI_CMD codes are not defined yet.
+ * OUTP:GEN
+ * VOLT? MAX, CURR? MAX
+ * VOLT:PROT:CLE (could set SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE)
+ * VOLT:PROT:MODE
+ * FUSE:STAT, FUSE:TRIP?, FUSE:LINK, FUSE:UNL
+ * ARB:...
+ * SYST:LOC, SYST:REM, SYST:RWL, SYST:MIX
+ * SYST:BEEP:IMM
+ */
+static const struct scpi_command rs_hmp4040_cmd[] = {
+ { SCPI_CMD_REMOTE, "SYST:REM" },
+ { SCPI_CMD_LOCAL, "SYST:LOC" },
+ { 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_OUTPUT_REGULATION, "STAT:QUES:INST:ISUM%s:COND?" },
+ { 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_TEMPERATURE_PROTECTION_ACTIVE, "STAT:QUES:INST:ISUM%s:COND?" },
+ ALL_ZERO
+};
+
SR_PRIV const struct scpi_pps pps_profiles[] = {
/* Agilent N5763A */
{ "Agilent", "N5763A", SCPI_DIALECT_UNKNOWN, 0,
ARRAY_AND_SIZE(agilent_n5700a_cg),
agilent_n5700a_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(agilent_n5700a_cg),
agilent_n5700a_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(bk_9130_cg),
bk_9130_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(chroma_61604_cg),
chroma_61604_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
NULL, 0,
chroma_62000_cmd,
.probe_channels = chroma_62000p_probe_channels,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+
+ /*
+ * Envox EEZ PSU Series
+ * The documented identification strings disagree with the behavior
+ * of at least some real units (returning "EEZ"). The first of these
+ * is the documented one, while the second seems to be returned by
+ * firmware v1.02 and earlier.
+ */
+ { "Envox", "^EEZ H24005 ", SCPI_DIALECT_UNKNOWN, 0,
+ ARRAY_AND_SIZE(eez_psu_devopts),
+ ARRAY_AND_SIZE(eez_psu_devopts_cg),
+ NULL, 0,
+ NULL, 0,
+ eez_psu_cmd,
+ .probe_channels = eez_psu_probe_channels,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "EEZ", "^PSU ", SCPI_DIALECT_UNKNOWN, 0,
+ ARRAY_AND_SIZE(eez_psu_devopts),
+ ARRAY_AND_SIZE(eez_psu_devopts_cg),
+ NULL, 0,
+ NULL, 0,
+ eez_psu_cmd,
+ .probe_channels = eez_psu_probe_channels,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+
+ /* Envox EEZ BB3 Series */
+ { "Envox", "^BB3 ", SCPI_DIALECT_UNKNOWN, 0,
+ ARRAY_AND_SIZE(eez_psu_devopts),
+ ARRAY_AND_SIZE(eez_psu_devopts_cg),
+ NULL, 0,
+ NULL, 0,
+ eez_psu_cmd,
+ .probe_channels = eez_psu_probe_channels,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd,
.probe_channels = NULL,
- hp_6630a_init_aquisition,
+ hp_6630a_init_acquisition,
hp_6630a_update_status,
},
*/
ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd,
.probe_channels = NULL,
- hp_6630a_init_aquisition,
+ hp_6630a_init_acquisition,
hp_6630a_update_status,
},
ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd,
.probe_channels = NULL,
- hp_6630a_init_aquisition,
+ hp_6630a_init_acquisition,
hp_6630a_update_status,
},
ARRAY_AND_SIZE(hp_6630a_cg),
hp_6630a_cmd,
.probe_channels = NULL,
- hp_6630a_init_aquisition,
+ hp_6630a_init_acquisition,
hp_6630a_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
+ hp_6630b_update_status,
+ },
+
+ /* HP 66312A */
+ { "HP", "66312A", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+ ARRAY_AND_SIZE(hp_6630b_devopts),
+ ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+ ARRAY_AND_SIZE(hp_66312a_ch),
+ ARRAY_AND_SIZE(hp_6630b_cg),
+ hp_6630b_cmd,
+ .probe_channels = NULL,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(hp_6630b_cg),
hp_6630b_cmd,
.probe_channels = NULL,
- hp_6630b_init_aquisition,
+ hp_6630b_init_acquisition,
hp_6630b_update_status,
},
ARRAY_AND_SIZE(rigol_dp700_cg),
rigol_dp700_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
{ "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
ARRAY_AND_SIZE(rigol_dp700_cg),
rigol_dp700_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(rigol_dp820_cg),
rigol_dp800_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
{ "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
ARRAY_AND_SIZE(rigol_dp830_cg),
rigol_dp800_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
{ "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
ARRAY_AND_SIZE(rigol_dp830_cg),
rigol_dp800_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+
+ /* Owon P4000 series */
+ { "OWON", "^P4305$", SCPI_DIALECT_UNKNOWN, 0,
+ ARRAY_AND_SIZE(owon_p4000_devopts),
+ ARRAY_AND_SIZE(owon_p4000_devopts_cg),
+ ARRAY_AND_SIZE(owon_p4305_ch),
+ ARRAY_AND_SIZE(owon_p4000_cg),
+ owon_p4000_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "OWON", "^P4603$", SCPI_DIALECT_UNKNOWN, 0,
+ ARRAY_AND_SIZE(owon_p4000_devopts),
+ ARRAY_AND_SIZE(owon_p4000_devopts_cg),
+ ARRAY_AND_SIZE(owon_p4603_ch),
+ ARRAY_AND_SIZE(owon_p4000_cg),
+ owon_p4000_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
NULL, 0,
philips_pm2800_cmd,
philips_pm2800_probe_channels,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
ARRAY_AND_SIZE(rs_hmc8043_cg),
rs_hmc8043_cmd,
.probe_channels = NULL,
- .init_aquisition = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+
+ /* Hameg / Rohde&Schwarz HMP4000 series */
+ /* TODO Match on regex, pass scpi_pps item to .probe_channels(). */
+ { "HAMEG", "HMP4030", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ rs_hmp4040_ch, 3,
+ rs_hmp4040_cg, 3,
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "HAMEG", "HMP4040", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ ARRAY_AND_SIZE(rs_hmp4040_ch),
+ ARRAY_AND_SIZE(rs_hmp4040_cg),
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "ROHDE&SCHWARZ", "HMP2020", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ rs_hmp2020_ch, 2,
+ rs_hmp4040_cg, 2,
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "ROHDE&SCHWARZ", "HMP2030", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ rs_hmp2030_ch, 3,
+ rs_hmp4040_cg, 3,
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "ROHDE&SCHWARZ", "HMP4030", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ rs_hmp4040_ch, 3,
+ rs_hmp4040_cg, 3,
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
+ .update_status = NULL,
+ },
+ { "ROHDE&SCHWARZ", "HMP4040", SCPI_DIALECT_HMP, 0,
+ ARRAY_AND_SIZE(rs_hmp4040_devopts),
+ ARRAY_AND_SIZE(rs_hmp4040_devopts_cg),
+ ARRAY_AND_SIZE(rs_hmp4040_ch),
+ ARRAY_AND_SIZE(rs_hmp4040_cg),
+ rs_hmp4040_cmd,
+ .probe_channels = NULL,
+ .init_acquisition = NULL,
.update_status = NULL,
},
};
projects / libsigrok.git / blobdiff