* This file is part of the libsigrok project.
*
* Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2015 Google, Inc.
+ * (Written by Alexandru Gagniuc <mrnuke@google.com> for Google, Inc.)
*
* 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
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <string.h>
+#include <strings.h>
#include "protocol.h"
#define CH_IDX(x) (1 << x)
+#define FREQ_DC_ONLY {0, 0, 0}
-const char *pps_vendors[][2] = {
- { "RIGOL TECHNOLOGIES", "Rigol" },
- { "HEWLETT-PACKARD", "HP" },
- { "PHILIPS", "Philips" },
+static const uint32_t devopts_none[] = { };
+
+/* Agilent/Keysight N5700A series */
+static const uint32_t agilent_n5700a_devopts[] = {
+ SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t agilent_n5700a_devopts_cg[] = {
+ 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_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_ENABLED | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const struct channel_group_spec agilent_n5700a_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+};
+
+static const struct channel_spec agilent_n5767a_ch[] = {
+ { "1", { 0, 60, 0.0001 }, { 0, 25, 0.1 }, FREQ_DC_ONLY },
+};
+
+static const struct channel_spec agilent_n5763a_ch[] = {
+ { "1", { 0, 12.5, 0.001 }, { 0, 25, 0.01 }, FREQ_DC_ONLY },
+};
+
+/*
+ * TODO: OVER_CURRENT_PROTECTION_ACTIVE status can be determined by the OC bit
+ * in STAT:QUES:EVEN?, but this is not implemented.
+ */
+static const struct scpi_command agilent_n5700a_cmd[] = {
+ { SCPI_CMD_REMOTE, "SYST:COMM:RLST REM" },
+ { SCPI_CMD_LOCAL, "SYST:COMM:RLST LOC" },
+ { SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
+ { SCPI_CMD_GET_MEAS_CURRENT, "MEAS:CURR?" },
+ { 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:STAT?" },
+ { SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" },
+ { SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" },
+ { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT?" },
+ { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":VOLT:PROT %.6f" },
+ { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":CURR:PROT:STAT?" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":CURR:PROT:STAT ON?"},
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":CURR:PROT:STAT OFF?"},
+ /* Current limit (CC mode) and OCP are set using the same command. */
+ { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR?" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR %.6f" },
+ ALL_ZERO
+};
+
+/* Chroma 61600 series AC source */
+static const uint32_t chroma_61604_devopts[] = {
+ SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t chroma_61604_devopts_cg[] = {
+ SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+ 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_OUTPUT_FREQUENCY | SR_CONF_GET,
+ SR_CONF_OUTPUT_FREQUENCY_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_CURRENT | SR_CONF_GET,
+ SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const struct channel_spec chroma_61604_ch[] = {
+ { "1", { 0, 300, 0.1 }, { 0, 16, 0.1 }, { 1.0, 1000.0, 0.01 } },
+};
+
+static const struct channel_group_spec chroma_61604_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+};
+
+static const struct scpi_command chroma_61604_cmd[] = {
+ { SCPI_CMD_REMOTE, "SYST:REM" },
+ { SCPI_CMD_LOCAL, "SYST:LOC" },
+ { SCPI_CMD_GET_MEAS_VOLTAGE, ":FETC:VOLT:ACDC?" },
+ { SCPI_CMD_GET_MEAS_FREQUENCY, ":FETC:FREQ?" },
+ { SCPI_CMD_GET_MEAS_CURRENT, ":FETC:CURR:AC?" },
+ { SCPI_CMD_GET_MEAS_POWER, ":FETC:POW:AC?" },
+ { SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT:AC?" },
+ { SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT:AC %.1f" },
+ { SCPI_CMD_GET_FREQUENCY_TARGET, ":SOUR:FREQ?" },
+ { SCPI_CMD_SET_FREQUENCY_TARGET, ":SOUR:FREQ %.2f" },
+ { 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_THRESHOLD, ":SOUR:VOLT:LIM:AC?" },
+ { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:LIM:AC %.1f" },
+ /* This is not a current limit mode. It is overcurrent protection. */
+ { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM?" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:LIM %.2f" },
+ ALL_ZERO
+};
+
+/* Chroma 62000 series DC source */
+
+static const uint32_t chroma_62000_devopts[] = {
+ SR_CONF_CONTINUOUS,
+};
+
+static const uint32_t chroma_62000_devopts_cg[] = {
+ SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+ 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_group_spec chroma_62000_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
};
-const char *get_vendor(const char *raw_vendor)
+static const struct scpi_command chroma_62000_cmd[] = {
+ { SCPI_CMD_REMOTE, ":CONF:REM ON" },
+ { SCPI_CMD_LOCAL, ":CONF:REM OFF" },
+ { SCPI_CMD_BEEPER, ":CONF:BEEP?" },
+ { SCPI_CMD_BEEPER_ENABLE, ":CONF:BEEP ON" },
+ { SCPI_CMD_BEEPER_DISABLE, ":CONF:BEEP OFF" },
+ { 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, ":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, ":CONF:OUTP?" },
+ { SCPI_CMD_SET_OUTPUT_ENABLE, ":CONF:OUTP ON" },
+ { SCPI_CMD_SET_OUTPUT_DISABLE, ":CONF:OUTP OFF" },
+ { SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:HIGH?" },
+ { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":SOUR:VOLT:PROT:HIGH %.6f" },
+ { SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:PROT:HIGH?" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR:PROT:HIGH %.6f" },
+ ALL_ZERO
+};
+
+static int chroma_62000p_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)
{
- unsigned int i;
+ unsigned int volts, amps;
+ struct channel_spec *channel;
+
+ (void)sdi;
- for (i = 0; i < ARRAY_SIZE(pps_vendors); i++) {
- if (!strcasecmp(raw_vendor, pps_vendors[i][0]))
- return pps_vendors[i][1];
+ sscanf(hw_info->model, "%*[^P]P-%u-%u", &volts, &s);
+ sr_dbg("Found device rated for %d V and %d A", volts, amps);
+
+ if (volts > 600) {
+ sr_err("Probed max voltage of %u V is out of spec.", volts);
+ return SR_ERR_BUG;
}
- return raw_vendor;
-}
+ if (volts > 120) {
+ sr_err("Probed max current of %u A is out of spec.", amps);
+ return SR_ERR_BUG;
+ }
-static const uint32_t devopts_none[] = { };
+ channel = g_malloc0(sizeof(struct channel_spec));
+ channel->name = "1";
+ channel->voltage[0] = channel->current[0] = 0.0;
+ channel->voltage[1] = (float)volts;
+ channel->current[1] = (float)amps;
+ channel->voltage[2] = channel->current[2] = 0.01;
+ *channels = channel;
+ *num_channels = 1;
+
+ *channel_groups = g_malloc(sizeof(struct channel_group_spec));
+ **channel_groups = chroma_62000_cg[0];
+ *num_channel_groups = 1;
+
+ return SR_OK;
+}
/* Rigol DP800 series */
static const uint32_t rigol_dp800_devopts[] = {
- SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
};
static const uint32_t rigol_dp800_devopts_cg[] = {
- SR_CONF_OUTPUT_REGULATION | SR_CONF_GET,
+ 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_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,
+ 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_dp821a_ch[] = {
+ { "1", { 0, 60, 0.001 }, { 0, 1, 0.0001 }, FREQ_DC_ONLY },
+ { "2", { 0, 8, 0.001 }, { 0, 10, 0.001 }, FREQ_DC_ONLY },
};
-struct channel_spec rigol_dp831_ch[] = {
- { "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 } },
- { "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 } },
- { "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 } },
+static const struct channel_spec rigol_dp831_ch[] = {
+ { "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 }, FREQ_DC_ONLY },
+ { "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 }, FREQ_DC_ONLY },
+ { "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 }, FREQ_DC_ONLY },
};
-struct channel_spec rigol_dp832_ch[] = {
- { "1", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
- { "2", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
- { "3", { 0, 5, 0.001 }, { 0, 3, 0.001 } },
+static const struct channel_spec rigol_dp832_ch[] = {
+ { "1", { 0, 30, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY },
+ { "2", { 0, 30, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY },
+ { "3", { 0, 5, 0.001 }, { 0, 3, 0.001 }, FREQ_DC_ONLY },
};
-struct channel_group_spec rigol_dp800_cg[] = {
+static const struct channel_group_spec rigol_dp820_cg[] = {
+ { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+ { "2", CH_IDX(1), PPS_OVP | PPS_OCP },
+};
+
+static const struct channel_group_spec rigol_dp830_cg[] = {
{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
{ "2", CH_IDX(1), PPS_OVP | PPS_OCP },
{ "3", CH_IDX(2), PPS_OVP | PPS_OCP },
};
-struct scpi_command rigol_dp800_cmd[] = {
+static const struct scpi_command rigol_dp800_cmd[] = {
{ SCPI_CMD_REMOTE, "SYST:REMOTE" },
{ SCPI_CMD_LOCAL, "SYST:LOCAL" },
{ SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" },
{ 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
};
/* HP 663xx series */
+
+static const uint32_t hp_6630a_devopts[] = {
+ SR_CONF_CONTINUOUS,
+ SR_CONF_ENABLED | SR_CONF_SET,
+ SR_CONF_VOLTAGE | SR_CONF_GET,
+ SR_CONF_CURRENT | SR_CONF_GET,
+ SR_CONF_VOLTAGE_TARGET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_CURRENT_LIMIT | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_SET,
+ SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
+};
+
static const uint32_t hp_6632b_devopts[] = {
- SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
- 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,
+ 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,
+};
+
+static const struct channel_spec hp_6633a_ch[] = {
+ { "1", { 0, 51.188, 0.0125 }, { 0, 2.0475, 0.0005 }, FREQ_DC_ONLY },
};
-struct channel_spec hp_6632b_ch[] = {
- { "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 } },
+static const struct channel_spec hp_6632b_ch[] = {
+ { "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 }, FREQ_DC_ONLY },
};
-struct channel_group_spec hp_6632b_cg[] = {
+static const struct channel_group_spec hp_663xx_cg[] = {
{ "1", CH_IDX(0), 0 },
};
-struct scpi_command hp_6632b_cmd[] = {
+static const struct scpi_command hp_6630a_cmd[] = {
+ { SCPI_CMD_SET_OUTPUT_ENABLE, "OUT 1" },
+ { SCPI_CMD_SET_OUTPUT_DISABLE, "OUT 0" },
+ { SCPI_CMD_GET_MEAS_VOLTAGE, "VOUT?" },
+ { SCPI_CMD_GET_MEAS_CURRENT, "IOUT?" },
+ { SCPI_CMD_SET_VOLTAGE_TARGET, "VSET %.4f" },
+ { SCPI_CMD_SET_CURRENT_LIMIT, "ISET %.4f" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, "OCP 1" },
+ { SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, "OCP 0" },
+ { SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "OVSET %.4f" },
+ ALL_ZERO
+};
+
+static const struct scpi_command hp_6632b_cmd[] = {
{ SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
{ SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" },
{ SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" },
{ SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" },
{ SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" },
{ SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" },
+ ALL_ZERO
};
/* Philips/Fluke PM2800 series */
static const uint32_t philips_pm2800_devopts[] = {
- SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
};
static const uint32_t philips_pm2800_devopts_cg[] = {
- SR_CONF_OUTPUT_ENABLED | 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_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_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_OUTPUT_REGULATION | SR_CONF_GET,
+ SR_CONF_REGULATION | SR_CONF_GET,
};
enum philips_pm2800_modules {
PM2800_MOD_120V_1A,
};
-static struct philips_pm2800_module_spec {
+static const struct philips_pm2800_module_spec {
/* Min, max, programming resolution. */
float voltage[3];
float current[3];
[PM2800_MOD_120V_1A] = { { 0, 120, 0.030 }, { -1, 1, 0.00025 } },
};
-static struct philips_pm2800_model {
+static const struct philips_pm2800_model {
unsigned int chassis;
unsigned int num_modules;
unsigned int set;
{ 3, 2, 3, { PM2800_MOD_8V_15A, PM2800_MOD_8V_15A, 0 } },
};
-static char *philips_pm2800_names[] = { "1", "2", "3" };
+static const char *philips_pm2800_names[] = { "1", "2", "3" };
static int philips_pm2800_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 philips_pm2800_model *model;
- struct philips_pm2800_module_spec *spec;
+ const struct philips_pm2800_model *model;
+ const struct philips_pm2800_module_spec *spec;
unsigned int chassis, num_modules, set, module, m, i;
(void)sdi;
sr_dbg("output %d: %.0f - %.0fV, %.0f - %.0fA", i + 1,
spec->voltage[0], spec->voltage[1],
spec->current[0], spec->current[1]);
- (*channels)[i].name = philips_pm2800_names[i];
+ (*channels)[i].name = (char *)philips_pm2800_names[i];
memcpy(&((*channels)[i].voltage), spec, sizeof(float) * 6);
- (*channel_groups)[i].name = philips_pm2800_names[i];
+ (*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;
}
return SR_OK;
}
-struct scpi_command philips_pm2800_cmd[] = {
+static const struct scpi_command philips_pm2800_cmd[] = {
{ SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" },
{ SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
{ SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":SOUR:CURR:PROT:STAT ON" },
{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":SOUR:CURR:PROT:STAT OFF" },
{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":SOUR:CURR:PROT:TRIP?" },
+ ALL_ZERO
};
-
SR_PRIV const struct scpi_pps pps_profiles[] = {
+ /* Agilent N5763A */
+ { "Agilent", "N5763A", 0,
+ ARRAY_AND_SIZE(agilent_n5700a_devopts),
+ ARRAY_AND_SIZE(agilent_n5700a_devopts_cg),
+ ARRAY_AND_SIZE(agilent_n5763a_ch),
+ ARRAY_AND_SIZE(agilent_n5700a_cg),
+ agilent_n5700a_cmd,
+ .probe_channels = NULL,
+ },
+ /* Agilent N5767A */
+ { "Agilent", "N5767A", 0,
+ ARRAY_AND_SIZE(agilent_n5700a_devopts),
+ ARRAY_AND_SIZE(agilent_n5700a_devopts_cg),
+ ARRAY_AND_SIZE(agilent_n5767a_ch),
+ ARRAY_AND_SIZE(agilent_n5700a_cg),
+ agilent_n5700a_cmd,
+ .probe_channels = NULL,
+ },
+ /* Chroma 61604 */
+ { "Chroma", "61604", 0,
+ ARRAY_AND_SIZE(chroma_61604_devopts),
+ ARRAY_AND_SIZE(chroma_61604_devopts_cg),
+ ARRAY_AND_SIZE(chroma_61604_ch),
+ ARRAY_AND_SIZE(chroma_61604_cg),
+ 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),
+ ARRAY_AND_SIZE(chroma_62000_devopts_cg),
+ NULL, 0,
+ NULL, 0,
+ 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_6633a_ch),
+ ARRAY_AND_SIZE(hp_663xx_cg),
+ hp_6630a_cmd,
+ .probe_channels = NULL,
+ },
+
/* HP 6632B */
{ "HP", "6632B", 0,
ARRAY_AND_SIZE(hp_6632b_devopts),
ARRAY_AND_SIZE(devopts_none),
ARRAY_AND_SIZE(hp_6632b_ch),
- ARRAY_AND_SIZE(hp_6632b_cg),
- ARRAY_AND_SIZE(hp_6632b_cmd),
+ ARRAY_AND_SIZE(hp_663xx_cg),
+ hp_6632b_cmd,
.probe_channels = NULL,
},
/* Rigol DP800 series */
+ { "Rigol", "^DP821A$", PPS_OTP,
+ ARRAY_AND_SIZE(rigol_dp800_devopts),
+ ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
+ ARRAY_AND_SIZE(rigol_dp821a_ch),
+ ARRAY_AND_SIZE(rigol_dp820_cg),
+ rigol_dp800_cmd,
+ .probe_channels = NULL,
+ },
{ "Rigol", "^DP831A$", PPS_OTP,
ARRAY_AND_SIZE(rigol_dp800_devopts),
ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
ARRAY_AND_SIZE(rigol_dp831_ch),
- ARRAY_AND_SIZE(rigol_dp800_cg),
- ARRAY_AND_SIZE(rigol_dp800_cmd),
+ ARRAY_AND_SIZE(rigol_dp830_cg),
+ rigol_dp800_cmd,
.probe_channels = NULL,
},
{ "Rigol", "^(DP832|DP832A)$", PPS_OTP,
ARRAY_AND_SIZE(rigol_dp800_devopts),
ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
ARRAY_AND_SIZE(rigol_dp832_ch),
- ARRAY_AND_SIZE(rigol_dp800_cg),
- ARRAY_AND_SIZE(rigol_dp800_cmd),
+ ARRAY_AND_SIZE(rigol_dp830_cg),
+ rigol_dp800_cmd,
.probe_channels = NULL,
},
ARRAY_AND_SIZE(philips_pm2800_devopts_cg),
NULL, 0,
NULL, 0,
- ARRAY_AND_SIZE(philips_pm2800_cmd),
+ philips_pm2800_cmd,
philips_pm2800_probe_channels,
},
};
-SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);
+SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);
projects / libsigrok.git / blobdiff