X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=eb56f72d40786b8996cd09f3b92ef206188a8059;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=c8c7e3720f0ba077730ca3391087411ff72e1a28;hpb=9a5185c736b8ab2fdfb7a1b55e5a3a4ad4ff5cfb;p=libsigrok.git
diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index c8c7e372..eb56f72d 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,32 +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", "Chroma" },
- { "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[] = {
@@ -64,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 },
};
/*
@@ -96,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[] = {
@@ -141,12 +126,13 @@ 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 | SR_CONF_SET,
+ SR_CONF_CONTINUOUS,
};
static const uint32_t chroma_62000_devopts_cg[] = {
@@ -183,6 +169,7 @@ static const struct scpi_command chroma_62000_cmd[] = {
{ 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,
@@ -227,7 +214,7 @@ static int chroma_62000p_probe_channels(struct sr_dev_inst *sdi,
/* 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,
};
@@ -307,11 +294,24 @@ 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_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_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,
@@ -319,14 +319,31 @@ static const uint32_t hp_6632b_devopts[] = {
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 },
+};
+
static const struct channel_spec hp_6632b_ch[] = {
{ "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 }, FREQ_DC_ONLY },
};
-static const struct channel_group_spec hp_6632b_cg[] = {
+static const struct channel_group_spec hp_663xx_cg[] = {
{ "1", CH_IDX(0), 0 },
};
+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" },
@@ -337,11 +354,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[] = {
@@ -483,16 +501,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 */
@@ -501,7 +529,7 @@ 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 */
@@ -510,16 +538,26 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
ARRAY_AND_SIZE(chroma_62000_devopts_cg),
NULL, 0,
NULL, 0,
- ARRAY_AND_SIZE(chroma_62000_cmd),
+ 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,
},
@@ -529,7 +567,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,
@@ -537,7 +575,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,
@@ -545,7 +583,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,
},
@@ -555,7 +593,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,
},
};