X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=02f6940a70f0595ac27981e952dfc19f942df969;hb=c80cf3e02eaa8e3154a69a7cae48c361d45ebb4f;hp=a532e792b0aeca9034df0d0fd8e6d329d0d40c50;hpb=6c0c9dd257353c5942d51024270dc82d7099a6de;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index a532e792..02f6940a 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -26,11 +26,12 @@
 #define CH_IDX(x) (1 << x)
 #define FREQ_DC_ONLY {0, 0, 0}
 
-const char *pps_vendors[][2] = {
+static const char *pps_vendors[][2] = {
 	{ "RIGOL TECHNOLOGIES", "Rigol" },
 	{ "HEWLETT-PACKARD", "HP" },
 	{ "PHILIPS", "Philips" },
 	{ "Chroma ATE", "Chroma" },
+	{ "Agilent Technologies", "Agilent" },
 };
 
 const char *get_vendor(const char *raw_vendor)
@@ -47,6 +48,55 @@ const char *get_vendor(const char *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,
+};
+
+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_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_ENABLED | SR_CONF_GET | SR_CONF_SET,
+};
+
+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 },
+};
+
+/*
+ * 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 cmd. sad */
+	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR?" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":SOUR:CURR %.6f" },
+};
+
 /* Chroma 61600 series AC source */
 static const uint32_t chroma_61604_devopts[] = {
 	SR_CONF_CONTINUOUS | SR_CONF_SET,
@@ -63,15 +113,15 @@ static const uint32_t chroma_61604_devopts_cg[] = {
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
-const struct channel_spec chroma_61604_ch[] = {
+static const struct channel_spec chroma_61604_ch[] = {
 	{ "1", { 0, 300, 0.1 }, { 0, 16, 0.1 }, { 1.0, 1000.0, 0.01 } },
 };
 
-const struct channel_group_spec chroma_61604_cg[] = {
+static const struct channel_group_spec chroma_61604_cg[] = {
 	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
 };
 
-const struct scpi_command chroma_61604_cmd[] = {
+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?" },
@@ -113,35 +163,35 @@ static const uint32_t rigol_dp800_devopts_cg[] = {
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
-const struct channel_spec rigol_dp821a_ch[] = {
+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 },
 };
 
-const struct channel_spec rigol_dp831_ch[] = {
+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 },
 };
 
-const struct channel_spec rigol_dp832_ch[] = {
+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 },
 };
 
-const struct channel_group_spec rigol_dp820_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 },
 };
 
-const struct channel_group_spec rigol_dp830_cg[] = {
+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 },
 };
 
-const 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?" },
@@ -186,15 +236,15 @@ static const uint32_t hp_6632b_devopts[] = {
 	SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-const struct channel_spec hp_6632b_ch[] = {
+static const struct channel_spec hp_6632b_ch[] = {
 	{ "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 }, FREQ_DC_ONLY },
 };
 
-const struct channel_group_spec hp_6632b_cg[] = {
+static const struct channel_group_spec hp_6632b_cg[] = {
 	{ "1", CH_IDX(0), 0 },
 };
 
-const struct scpi_command hp_6632b_cmd[] = {
+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" },
@@ -331,7 +381,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-const 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?" },
@@ -353,6 +403,15 @@ const struct scpi_command philips_pm2800_cmd[] = {
 };
 
 SR_PRIV const struct scpi_pps pps_profiles[] = {
+	/* 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),
+		.probe_channels = NULL,
+	},
 	/* Chroma 61604 */
 	{ "Chroma", "61604", 0,
 		ARRAY_AND_SIZE(chroma_61604_devopts),