X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=c9e8632c7b0ed1001dcb122241c8edbce081be5f;hb=fd2433153a3e2c2681d637f715c19f2b6f40fcc9;hp=a72c90a2ffa9fd55f61849a46c1fb7d90901a7d9;hpb=8b5eadf427323318967da09a2824e57920e70a7d;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index a72c90a2..c9e8632c 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2015 Google, Inc.
  * (Written by Alexandru Gagniuc <mrnuke@google.com> for Google, Inc.)
- * Copyright (C) 2017 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2017,2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * 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
@@ -48,7 +48,7 @@ static const uint32_t agilent_n5700a_devopts_cg[] = {
 };
 
 static const struct channel_group_spec agilent_n5700a_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 static const struct channel_spec agilent_n5767a_ch[] = {
@@ -109,9 +109,9 @@ static const struct channel_spec bk_9130_ch[] = {
 };
 
 static const struct channel_group_spec bk_9130_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP },
-	{ "2", CH_IDX(1), PPS_OVP },
-	{ "3", CH_IDX(2), PPS_OVP },
+	{ "1", CH_IDX(0), PPS_OVP, SR_MQFLAG_DC },
+	{ "2", CH_IDX(1), PPS_OVP, SR_MQFLAG_DC },
+	{ "3", CH_IDX(2), PPS_OVP, SR_MQFLAG_DC },
 };
 
 static const struct scpi_command bk_9130_cmd[] = {
@@ -156,7 +156,7 @@ static const struct channel_spec chroma_61604_ch[] = {
 };
 
 static const struct channel_group_spec chroma_61604_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_AC },
 };
 
 static const struct scpi_command chroma_61604_cmd[] = {
@@ -199,7 +199,7 @@ static const uint32_t chroma_62000_devopts_cg[] = {
 };
 
 static const struct channel_group_spec chroma_62000_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 static const struct scpi_command chroma_62000_cmd[] = {
@@ -305,7 +305,7 @@ static const struct channel_spec rigol_dp712_ch[] = {
 };
 
 static const struct channel_group_spec rigol_dp700_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 /* Same as the DP800 series, except for the missing :SYST:OTP* commands. */
@@ -383,14 +383,14 @@ static const struct channel_spec rigol_dp832_ch[] = {
 };
 
 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 },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
+	{ "2", CH_IDX(1), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 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 },
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
+	{ "2", CH_IDX(1), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
+	{ "3", CH_IDX(2), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 static const struct scpi_command rigol_dp800_cmd[] = {
@@ -429,7 +429,7 @@ static const struct scpi_command rigol_dp800_cmd[] = {
 	ALL_ZERO
 };
 
-/* HP 663xx series */
+/* HP 663xA series */
 static const uint32_t hp_6630a_devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -442,10 +442,141 @@ static const uint32_t hp_6630a_devopts_cg[] = {
 	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_ACTIVE | SR_CONF_GET,
 	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
+	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_REGULATION | SR_CONF_GET,
+};
+
+static const struct channel_spec hp_6632a_ch[] = {
+	{ "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6633a_ch[] = {
+	{ "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS },
 };
 
+static const struct channel_spec hp_6634a_ch[] = {
+	{ "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_group_spec hp_6630a_cg[] = {
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
+};
+
+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_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, "STS?" },
+	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, "OVSET %.4f" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, "OCP 1" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, "OCP 0" },
+	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, "STS?" },
+	{ SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE, "STS?" },
+	{ SCPI_CMD_GET_OUTPUT_REGULATION, "STS?" },
+	ALL_ZERO
+};
+
+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;
+}
+
+static int hp_6630a_update_status(const struct sr_dev_inst *sdi)
+{
+	struct sr_scpi_dev_inst *scpi;
+	int ret;
+	int fault;
+	gboolean cv, cc_pos, unreg, cc_neg;
+	gboolean regulation_changed;
+	char *regulation;
+
+	scpi = sdi->conn;
+
+	/*
+	 * Use the FAULT register (only 0->1 transitions), this way multiple set
+	 * regulation bits in the STS/ASTS registers are ignored. In rare cases
+	 * we will miss some changes (1->0 transitions, e.g. no regulation at all),
+	 * but SPS/ASPS doesn't work either, unless all states are stored and
+	 * compared to the states in STS/ASTS.
+	 * TODO: Use SPoll or SRQ when SCPI over GPIB is used.
+	 */
+	ret = sr_scpi_get_int(scpi, "FAULT?", &fault);
+	if (ret != SR_OK)
+		return ret;
+
+	/* OVP */
+	if (fault & (1 << 3))
+		sr_session_send_meta(sdi, SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
+			g_variant_new_boolean(fault & (1 << 3)));
+
+	/* OCP */
+	if (fault & (1 << 6))
+		sr_session_send_meta(sdi, SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
+			g_variant_new_boolean(fault & (1 << 6)));
+
+	/* OTP */
+	if (fault & (1 << 4))
+		sr_session_send_meta(sdi, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,
+			g_variant_new_boolean(fault & (1 << 4)));
+
+	/* CV */
+	cv = (fault & (1 << 0));
+	regulation_changed = (fault & (1 << 0));
+	/* CC+ */
+	cc_pos = (fault & (1 << 1));
+	regulation_changed = (fault & (1 << 1)) | regulation_changed;
+	/* UNREG */
+	unreg = (fault & (1 << 2));
+	regulation_changed = (fault & (1 << 2)) | regulation_changed;
+	/* CC- */
+	cc_neg = (fault & (1 << 9));
+	regulation_changed = (fault & (1 << 9)) | regulation_changed;
+
+	if (regulation_changed) {
+		if (cv && !cc_pos && !cc_neg &&!unreg)
+			regulation = "CV";
+		else if (cc_pos && !cv && !cc_neg && !unreg)
+			regulation = "CC";
+		else if (cc_neg && !cv && !cc_pos && !unreg)
+			regulation = "CC-";
+		else if (unreg && !cv && !cc_pos && !cc_neg)
+			regulation = "UR";
+		else if (!cv && !cc_pos && !cc_neg &&!unreg)
+			regulation = "";
+		else {
+			sr_dbg("Undefined regulation for HP 66xxA "
+				"(CV=%i, CC+=%i, CC-=%i, UR=%i).",
+				cv, cc_pos, cc_neg, unreg);
+			return FALSE;
+		}
+		sr_session_send_meta(sdi, SR_CONF_REGULATION,
+			g_variant_new_string(regulation));
+	}
+
+	return SR_OK;
+}
+
+/* HP 663xB series */
 static const uint32_t hp_6630b_devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
@@ -466,8 +597,20 @@ static const uint32_t hp_6630b_devopts_cg[] = {
 	SR_CONF_REGULATION | SR_CONF_GET,
 };
 
-static const struct channel_spec hp_6633a_ch[] = {
-	{ "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 104.80743 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS },
+static const struct channel_spec hp_6611c_ch[] = {
+	{ "1", { 0, 8.19, 0.002, 3, 4 }, { 0, 5.1188, 0.00125, 4, 5 }, { 0, 41.92297 }, FREQ_DC_ONLY, { 0, 12, 0.06 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6612c_ch[] = {
+	{ "1", { 0, 20.475, 0.005, 3, 4 }, { 0, 2.0475, 0.0005, 4, 5 }, { 0, 41.92256 }, FREQ_DC_ONLY, { 0, 22, 0.1 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6613c_ch[] = {
+	{ "1", { 0, 51.188, 0.0125, 3, 4 }, { 0, 1.0238, 0.00025, 4, 5 }, { 0, 52.40627 }, FREQ_DC_ONLY, { 0, 55, 0.25 }, NO_OCP_LIMITS },
+};
+
+static const struct channel_spec hp_6614c_ch[] = {
+	{ "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 0.5118, 0.000125, 4, 5 }, { 0, 52.39808 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS },
 };
 
 static const struct channel_spec hp_6631b_ch[] = {
@@ -490,24 +633,15 @@ static const struct channel_spec hp_6634b_ch[] = {
 	{ "1", { 0, 102.38, 0.025, 3, 4 }, { 0, 1.0238, 0.000263, 4, 5 }, { 0, 104.81664 }, FREQ_DC_ONLY, { 0, 110, 0.5 }, NO_OCP_LIMITS },
 };
 
-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 channel_group_spec hp_6630b_cg[] = {
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP, SR_MQFLAG_DC },
 };
 
 static const struct scpi_command hp_6630b_cmd[] = {
+	/*
+	 * SCPI_CMD_REMOTE and SCPI_CMD_LOCAL are not used when GPIB is used,
+	 * otherwise the device will report (non critical) error 602.
+	 */
 	{ SCPI_CMD_REMOTE, "SYST:REM" },
 	{ SCPI_CMD_LOCAL, "SYST:LOC" },
 	{ SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
@@ -531,6 +665,178 @@ static const struct scpi_command hp_6630b_cmd[] = {
 	ALL_ZERO
 };
 
+static int hp_6630b_init_acquisition(const struct sr_dev_inst *sdi)
+{
+	struct sr_scpi_dev_inst *scpi;
+	int ret;
+
+	scpi = sdi->conn;
+
+	/*
+	 * Monitor CV (256), CC+ (1024) and CC- (2048) bits of the
+	 * Operational Status Register.
+	 * Use both positive and negative transitions of the status bits.
+	 */
+	ret = sr_scpi_send(scpi, "STAT:OPER:PTR 3328;NTR 3328;ENAB 3328");
+	if (ret != SR_OK)
+		return ret;
+
+	/*
+	 * Monitor OVP (1), OCP (2), OTP (16) and Unreg (1024) bits of the
+	 * Questionable Status Register.
+	 * Use both positive and negative transitions of the status bits.
+	 */
+	ret = sr_scpi_send(scpi, "STAT:QUES:PTR 1043;NTR 1043;ENAB 1043");
+	if (ret != SR_OK)
+		return ret;
+
+	/*
+	 * Service Request Enable Register set for Operational Status Register
+	 * bits (128) and Questionable Status Register bits (8).
+	 * This masks the Status Register generating a SRQ/RQS. Not implemented yet!
+	 */
+	/*
+	ret = sr_scpi_send(scpi, "*SRE 136");
+	if (ret != SR_OK)
+		return ret;
+	*/
+
+	return SR_OK;
+}
+
+static int hp_6630b_update_status(const struct sr_dev_inst *sdi)
+{
+	struct sr_scpi_dev_inst *scpi;
+	int ret;
+	int stb;
+	int ques_even, ques_cond;
+	int oper_even, oper_cond;
+	gboolean output_enabled;
+	gboolean unreg, cv, cc_pos, cc_neg;
+	gboolean regulation_changed;
+	char *regulation;
+
+	scpi = sdi->conn;
+
+	unreg = FALSE;
+	cv = FALSE;
+	cc_pos = FALSE;
+	cc_neg = FALSE;
+	regulation_changed = FALSE;
+
+	/*
+	 * Use SPoll when SCPI uses GPIB as transport layer.
+	 * SPoll is approx. twice as fast as a normal GPIB write + read would be!
+	 */
+#ifdef HAVE_LIBGPIB
+	char spoll_buf;
+
+	if (scpi->transport == SCPI_TRANSPORT_LIBGPIB) {
+		ret = sr_scpi_gpib_spoll(scpi, &spoll_buf);
+		if (ret != SR_OK)
+			return ret;
+		stb = (uint8_t)spoll_buf;
+	}
+	else {
+#endif
+		ret = sr_scpi_get_int(scpi, "*STB?", &stb);
+		if (ret != SR_OK)
+			return ret;
+#ifdef HAVE_LIBGPIB
+	}
+#endif
+
+	/* Questionable status summary bit */
+	if (stb & (1 << 3)) {
+		/* Read the event register to clear it! */
+		ret = sr_scpi_get_int(scpi, "STAT:QUES:EVEN?", &ques_even);
+		if (ret != SR_OK)
+			return ret;
+		/* Now get the values. */
+		ret = sr_scpi_get_int(scpi, "STAT:QUES:COND?", &ques_cond);
+		if (ret != SR_OK)
+			return ret;
+
+		/* OVP */
+		if (ques_even & (1 << 0))
+			sr_session_send_meta(sdi, SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
+				g_variant_new_boolean(ques_cond & (1 << 0)));
+
+		/* OCP */
+		if (ques_even & (1 << 1))
+			sr_session_send_meta(sdi, SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
+				g_variant_new_boolean(ques_cond & (1 << 1)));
+
+		/* OTP */
+		if (ques_even & (1 << 4))
+			sr_session_send_meta(sdi, SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE,
+				g_variant_new_boolean(ques_cond & (1 << 4)));
+
+		/* UNREG */
+		unreg = (ques_cond & (1 << 10));
+		regulation_changed = (ques_even & (1 << 10)) | regulation_changed;
+
+		/*
+		 * 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.
+		 */
+		ret = sr_scpi_get_bool(scpi, "OUTP:STAT?", &output_enabled);
+		if (ret != SR_OK)
+			return ret;
+		sr_session_send_meta(sdi, SR_CONF_ENABLED,
+			g_variant_new_boolean(output_enabled));
+	}
+
+	/* Operation status summary bit */
+	if (stb & (1 << 7)) {
+		/* Read the event register to clear it! */
+		ret = sr_scpi_get_int(scpi, "STAT:OPER:EVEN?", &oper_even);
+		if (ret != SR_OK)
+			return ret;
+		/* Now get the values. */
+		ret = sr_scpi_get_int(scpi, "STAT:OPER:COND?", &oper_cond);
+		if (ret != SR_OK)
+			return ret;
+
+		/* CV */
+		cv = (oper_cond & (1 << 8));
+		regulation_changed = (oper_even & (1 << 8)) | regulation_changed;
+		/* CC+ */
+		cc_pos = (oper_cond & (1 << 10));
+		regulation_changed = (oper_even & (1 << 10)) | regulation_changed;
+		/* CC- */
+		cc_neg = (oper_cond & (1 << 11));
+		regulation_changed = (oper_even & (1 << 11)) | regulation_changed;
+	}
+
+	if (regulation_changed) {
+		if (cv && !cc_pos && !cc_neg &&!unreg)
+			regulation = "CV";
+		else if (cc_pos && !cv && !cc_neg && !unreg)
+			regulation = "CC";
+		else if (cc_neg && !cv && !cc_pos && !unreg)
+			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 */
+			regulation = "";
+		else {
+			/* This happends 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 FALSE;
+		}
+		sr_session_send_meta(sdi, SR_CONF_REGULATION,
+			g_variant_new_string(regulation));
+	}
+
+	return SR_OK;
+}
+
 /* Philips/Fluke PM2800 series */
 static const uint32_t philips_pm2800_devopts[] = {
 	SR_CONF_CONTINUOUS,
@@ -654,6 +960,7 @@ static int philips_pm2800_probe_channels(struct sr_dev_inst *sdi,
 		(*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;
+		(*channel_groups)[i].mqflags = SR_MQFLAG_DC;
 	}
 	*num_channels = *num_channel_groups = num_modules;
 
@@ -706,9 +1013,9 @@ static const struct channel_spec rs_hmc8043_ch[] = {
 };
 
 static const struct channel_group_spec rs_hmc8043_cg[] = {
-	{ "1", CH_IDX(0), PPS_OVP },
-	{ "2", CH_IDX(1), PPS_OVP },
-	{ "3", CH_IDX(2), PPS_OVP },
+	{ "1", CH_IDX(0), PPS_OVP, SR_MQFLAG_DC },
+	{ "2", CH_IDX(1), PPS_OVP, SR_MQFLAG_DC },
+	{ "3", CH_IDX(2), PPS_OVP, SR_MQFLAG_DC },
 };
 
 static const struct scpi_command rs_hmc8043_cmd[] = {
@@ -740,6 +1047,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(agilent_n5700a_cg),
 		agilent_n5700a_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Agilent N5767A */
@@ -750,6 +1059,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(agilent_n5700a_cg),
 		agilent_n5700a_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* BK Precision 9310 */
@@ -760,6 +1071,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(bk_9130_cg),
 		bk_9130_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Chroma 61604 */
@@ -770,6 +1083,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(chroma_61604_cg),
 		chroma_61604_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Chroma 62000 series */
@@ -780,6 +1095,38 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		NULL, 0,
 		chroma_62000_cmd,
 		.probe_channels = chroma_62000p_probe_channels,
+		.init_acquisition = NULL,
+		.update_status = NULL,
+	},
+
+	/*
+	 * This entry is for testing the HP COMP language with a HP 6632B power
+	 * supply switched to the COMP language ("SYST:LANG COMP"). When used,
+	 * disable the entry for the HP 6632B below!
+	 */
+	/*
+	{ "HP", "6632B", SCPI_DIALECT_HP_COMP, 0,
+		ARRAY_AND_SIZE(hp_6630a_devopts),
+		ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+		ARRAY_AND_SIZE(hp_6632a_ch),
+		ARRAY_AND_SIZE(hp_6630a_cg),
+		hp_6630a_cmd,
+		.probe_channels = NULL,
+		hp_6630a_init_acquisition,
+		hp_6630a_update_status,
+	},
+	*/
+
+	/* HP 6632A */
+	{ "HP", "6632A", SCPI_DIALECT_HP_COMP, 0,
+		ARRAY_AND_SIZE(hp_6630a_devopts),
+		ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+		ARRAY_AND_SIZE(hp_6632a_ch),
+		ARRAY_AND_SIZE(hp_6630a_cg),
+		hp_6630a_cmd,
+		.probe_channels = NULL,
+		hp_6630a_init_acquisition,
+		hp_6630a_update_status,
 	},
 
 	/* HP 6633A */
@@ -787,59 +1134,131 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(hp_6630a_devopts),
 		ARRAY_AND_SIZE(hp_6630a_devopts_cg),
 		ARRAY_AND_SIZE(hp_6633a_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630a_cg),
+		hp_6630a_cmd,
+		.probe_channels = NULL,
+		hp_6630a_init_acquisition,
+		hp_6630a_update_status,
+	},
+
+	/* HP 6634A */
+	{ "HP", "6634A", SCPI_DIALECT_HP_COMP, 0,
+		ARRAY_AND_SIZE(hp_6630a_devopts),
+		ARRAY_AND_SIZE(hp_6630a_devopts_cg),
+		ARRAY_AND_SIZE(hp_6634a_ch),
+		ARRAY_AND_SIZE(hp_6630a_cg),
 		hp_6630a_cmd,
 		.probe_channels = NULL,
+		hp_6630a_init_acquisition,
+		hp_6630a_update_status,
+	},
+
+	/* HP 6611C */
+	{ "HP", "6611C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+		ARRAY_AND_SIZE(hp_6630b_devopts),
+		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+		ARRAY_AND_SIZE(hp_6611c_ch),
+		ARRAY_AND_SIZE(hp_6630b_cg),
+		hp_6630b_cmd,
+		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
+	},
+
+	/* HP 6612C */
+	{ "HP", "6612C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+		ARRAY_AND_SIZE(hp_6630b_devopts),
+		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+		ARRAY_AND_SIZE(hp_6612c_ch),
+		ARRAY_AND_SIZE(hp_6630b_cg),
+		hp_6630b_cmd,
+		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
+	},
+
+	/* HP 6613C */
+	{ "HP", "6613C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+		ARRAY_AND_SIZE(hp_6630b_devopts),
+		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+		ARRAY_AND_SIZE(hp_6613c_ch),
+		ARRAY_AND_SIZE(hp_6630b_cg),
+		hp_6630b_cmd,
+		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
+	},
+
+	/* HP 6614C */
+	{ "HP", "6614C", SCPI_DIALECT_HP_66XXB, PPS_OTP,
+		ARRAY_AND_SIZE(hp_6630b_devopts),
+		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
+		ARRAY_AND_SIZE(hp_6614c_ch),
+		ARRAY_AND_SIZE(hp_6630b_cg),
+		hp_6630b_cmd,
+		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 6631B */
-	{ "HP", "6631B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP,
+	{ "HP", "6631B", SCPI_DIALECT_HP_66XXB, PPS_OTP,
 		ARRAY_AND_SIZE(hp_6630b_devopts),
 		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
 		ARRAY_AND_SIZE(hp_6631b_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 6632B */
-	{ "HP", "6632B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP,
+	{ "HP", "6632B", SCPI_DIALECT_HP_66XXB, PPS_OTP,
 		ARRAY_AND_SIZE(hp_6630b_devopts),
 		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
 		ARRAY_AND_SIZE(hp_6632b_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 66332A */
-	{ "HP", "66332A", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP,
+	{ "HP", "66332A", SCPI_DIALECT_HP_66XXB, PPS_OTP,
 		ARRAY_AND_SIZE(hp_6630b_devopts),
 		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
 		ARRAY_AND_SIZE(hp_66332a_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 6633B */
-	{ "HP", "6633B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP,
+	{ "HP", "6633B", SCPI_DIALECT_HP_66XXB, PPS_OTP,
 		ARRAY_AND_SIZE(hp_6630b_devopts),
 		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
 		ARRAY_AND_SIZE(hp_6633b_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 6634B */
-	{ "HP", "6634B", SCPI_DIALECT_HP_66XXB, PPS_OVP | PPS_OCP | PPS_OTP,
+	{ "HP", "6634B", SCPI_DIALECT_HP_66XXB, PPS_OTP,
 		ARRAY_AND_SIZE(hp_6630b_devopts),
 		ARRAY_AND_SIZE(hp_6630b_devopts_cg),
 		ARRAY_AND_SIZE(hp_6634b_ch),
-		ARRAY_AND_SIZE(hp_663xx_cg),
+		ARRAY_AND_SIZE(hp_6630b_cg),
 		hp_6630b_cmd,
 		.probe_channels = NULL,
+		hp_6630b_init_acquisition,
+		hp_6630b_update_status,
 	},
 
 	/* Rigol DP700 series */
@@ -850,6 +1269,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp700_cg),
 		rigol_dp700_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 	{ "Rigol", "^DP712$", SCPI_DIALECT_UNKNOWN, 0,
 		ARRAY_AND_SIZE(rigol_dp700_devopts),
@@ -858,6 +1279,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp700_cg),
 		rigol_dp700_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Rigol DP800 series */
@@ -868,6 +1291,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp820_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 	{ "Rigol", "^DP831A$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
 		ARRAY_AND_SIZE(rigol_dp800_devopts),
@@ -876,6 +1301,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp830_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 	{ "Rigol", "^(DP832|DP832A)$", SCPI_DIALECT_UNKNOWN, PPS_OTP,
 		ARRAY_AND_SIZE(rigol_dp800_devopts),
@@ -884,6 +1311,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rigol_dp830_cg),
 		rigol_dp800_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Philips/Fluke PM2800 series */
@@ -894,6 +1323,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		NULL, 0,
 		philips_pm2800_cmd,
 		philips_pm2800_probe_channels,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 
 	/* Rohde & Schwarz HMC8043 */
@@ -904,6 +1335,8 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		ARRAY_AND_SIZE(rs_hmc8043_cg),
 		rs_hmc8043_cmd,
 		.probe_channels = NULL,
+		.init_acquisition = NULL,
+		.update_status = NULL,
 	},
 };