X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=686987f68729368f5622d3da60d8e45d64ec1459;hb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;hp=ed776bceac1762386c509fbcf1cca285e824f7c6;hpb=da005885c8ebbf98772f75126764f758b2640d11;p=libsigrok.git
diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index ed776bce..686987f6 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -19,6 +19,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "protocol.h"
@@ -26,31 +27,11 @@
#define CH_IDX(x) (1 << x)
#define FREQ_DC_ONLY {0, 0, 0}
-static const char *pps_vendors[][2] = {
- { "RIGOL TECHNOLOGIES", "Rigol" },
- { "HEWLETT-PACKARD", "HP" },
- { "PHILIPS", "Philips" },
- { "Chroma ATE", "Chroma" },
- { "Agilent Technologies", "Agilent" },
-};
-
-SR_PRIV const char *get_vendor(const char *raw_vendor)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(pps_vendors); i++) {
- if (!strcasecmp(raw_vendor, pps_vendors[i][0]))
- return pps_vendors[i][1];
- }
-
- return raw_vendor;
-}
-
static const uint32_t devopts_none[] = { };
/* Agilent/Keysight N5700A series */
static const uint32_t agilent_n5700a_devopts[] = {
- SR_CONF_CONTINUOUS | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
};
static const uint32_t agilent_n5700a_devopts_cg[] = {
@@ -63,12 +44,16 @@ static const uint32_t agilent_n5700a_devopts_cg[] = {
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_group_spec agilent_n5767a_cg[] = {
- { "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+static const struct channel_spec agilent_n5763a_ch[] = {
+ { "1", { 0, 12.5, 0.001 }, { 0, 25, 0.01 }, FREQ_DC_ONLY },
};
/*
@@ -95,11 +80,12 @@ static const struct scpi_command agilent_n5700a_cmd[] = {
/* 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 | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
};
static const uint32_t chroma_61604_devopts_cg[] = {
@@ -140,11 +126,95 @@ static const struct scpi_command chroma_61604_cmd[] = {
/* 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 },
+};
+
+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 volts, amps;
+ struct channel_spec *channel;
+
+ (void)sdi;
+
+ 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;
+ }
+
+ if (volts > 120) {
+ sr_err("Probed max current of %u A is out of spec.", amps);
+ return SR_ERR_BUG;
+ }
+
+ 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_CONTINUOUS | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
};
@@ -224,11 +294,12 @@ static const struct scpi_command rigol_dp800_cmd[] = {
{ 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_6632b_devopts[] = {
- SR_CONF_CONTINUOUS | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
SR_CONF_ENABLED | SR_CONF_GET | SR_CONF_SET,
SR_CONF_VOLTAGE | SR_CONF_GET,
SR_CONF_CURRENT | SR_CONF_GET,
@@ -254,11 +325,12 @@ static const struct scpi_command hp_6632b_cmd[] = {
{ 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_CONTINUOUS | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
};
static const uint32_t philips_pm2800_devopts_cg[] = {
@@ -400,16 +472,26 @@ static const struct scpi_command philips_pm2800_cmd[] = {
{ 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_n5767a_cg),
- ARRAY_AND_SIZE(agilent_n5700a_cmd),
+ ARRAY_AND_SIZE(agilent_n5700a_cg),
+ agilent_n5700a_cmd,
.probe_channels = NULL,
},
/* Chroma 61604 */
@@ -418,16 +500,25 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(chroma_61604_devopts_cg),
ARRAY_AND_SIZE(chroma_61604_ch),
ARRAY_AND_SIZE(chroma_61604_cg),
- ARRAY_AND_SIZE(chroma_61604_cmd),
+ 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 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),
+ hp_6632b_cmd,
.probe_channels = NULL,
},
@@ -437,7 +528,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
ARRAY_AND_SIZE(rigol_dp821a_ch),
ARRAY_AND_SIZE(rigol_dp820_cg),
- ARRAY_AND_SIZE(rigol_dp800_cmd),
+ rigol_dp800_cmd,
.probe_channels = NULL,
},
{ "Rigol", "^DP831A$", PPS_OTP,
@@ -445,7 +536,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
ARRAY_AND_SIZE(rigol_dp831_ch),
ARRAY_AND_SIZE(rigol_dp830_cg),
- ARRAY_AND_SIZE(rigol_dp800_cmd),
+ rigol_dp800_cmd,
.probe_channels = NULL,
},
{ "Rigol", "^(DP832|DP832A)$", PPS_OTP,
@@ -453,7 +544,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
ARRAY_AND_SIZE(rigol_dp832_ch),
ARRAY_AND_SIZE(rigol_dp830_cg),
- ARRAY_AND_SIZE(rigol_dp800_cmd),
+ rigol_dp800_cmd,
.probe_channels = NULL,
},
@@ -463,7 +554,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(philips_pm2800_devopts_cg),
NULL, 0,
NULL, 0,
- ARRAY_AND_SIZE(philips_pm2800_cmd),
+ philips_pm2800_cmd,
philips_pm2800_probe_channels,
},
};