X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=9d7fd202896e3a9bd35b87238c1a44af04257e7d;hb=26e96658ab62f38c5a3c50341f7b36f548e741b0;hp=71b64f5bfdea80dbc3ccb19d73287ff033deeb59;hpb=3d1aa50f38bbbb3946d1c92196fbe52e14fdaf60;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 71b64f5b..9d7fd202 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -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_aquisition(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[] = {
+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_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_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?" },
@@ -965,16 +1099,106 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		.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_aquisition,
+		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_aquisition,
+		hp_6630a_update_status,
+	},
+
 	/* HP 6633A */
 	{ "HP", "6633A", SCPI_DIALECT_HP_COMP, 0,
 		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,
-		.init_aquisition = NULL,
-		.update_status = NULL,
+		hp_6630a_init_aquisition,
+		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_aquisition,
+		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_aquisition,
+		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_aquisition,
+		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_aquisition,
+		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_aquisition,
+		hp_6630b_update_status,
 	},
 
 	/* HP 6631B */
@@ -982,7 +1206,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_aquisition,
@@ -994,7 +1218,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_aquisition,
@@ -1006,7 +1230,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_aquisition,
@@ -1018,7 +1242,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_aquisition,
@@ -1030,7 +1254,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_aquisition,