X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=aa5b945a3349cee0573491709d304efa424ccdc7;hp=c6d5a73e5e6c8efe9c9505e1224bc0e725cb2746;hb=HEAD;hpb=88e4daa9ff82f45f5966ac662d794c04625df176

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index c6d5a73e..116a5d46 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -2,7 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
- * 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
@@ -145,13 +145,19 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
 
 	for (i = 0; i < num_channel_groups; i++) {
 		cgs = &channel_groups[i];
-		cg = g_malloc0(sizeof(struct sr_channel_group));
-		cg->name = g_strdup(cgs->name);
+		cg = sr_channel_group_new(sdi, cgs->name, NULL);
 		for (j = 0, mask = 1; j < 64; j++, mask <<= 1) {
 			if (cgs->channel_index_mask & mask) {
 				for (l = sdi->channels; l; l = l->next) {
 					ch = l->data;
 					pch = ch->priv;
+					/* Add mqflags from channel_group_spec only to voltage
+					 * and current channels.
+					 */
+					if (pch->mq == SR_MQ_VOLTAGE || pch->mq == SR_MQ_CURRENT)
+						pch->mqflags = cgs->mqflags;
+					else
+						pch->mqflags = 0;
 					if (pch->hw_output_idx == j)
 						cg->channels = g_slist_append(cg->channels, ch);
 				}
@@ -160,13 +166,15 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi,
 		pcg = g_malloc0(sizeof(struct pps_channel_group));
 		pcg->features = cgs->features;
 		cg->priv = pcg;
-		sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 	}
 
 	sr_scpi_hw_info_free(hw_info);
 	hw_info = NULL;
 
-	sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
+	/* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
+	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
+			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
+		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
 
 	return sdi;
 }
@@ -244,6 +252,17 @@ static GSList *scan_scpi_pps(struct sr_dev_driver *di, GSList *options)
 
 static GSList *scan_hpib_pps(struct sr_dev_driver *di, GSList *options)
 {
+	const char *conn;
+
+	/*
+	 * Only scan for HP-IB devices when conn= was specified, to not
+	 * break SCPI devices' operation.
+	 */
+	conn = NULL;
+	(void)sr_serial_extract_options(options, &conn, NULL);
+	if (!conn)
+		return NULL;
+
 	return sr_scpi_scan(di->context, options, probe_hpib_pps_device);
 }
 
@@ -258,7 +277,12 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 
 	devc = sdi->priv;
-	sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE);
+
+	/* Don't send SCPI_CMD_REMOTE for HP 66xxB using SCPI over GPIB. */
+	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
+			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
+		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_REMOTE);
+
 	devc->beeper_was_set = FALSE;
 	if (sr_scpi_cmd_resp(sdi, devc->device->commands, 0, NULL,
 			&beeper, G_VARIANT_TYPE_BOOLEAN, SCPI_CMD_BEEPER) == SR_OK) {
@@ -287,7 +311,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	if (devc->beeper_was_set)
 		sr_scpi_cmd(sdi, devc->device->commands,
 			0, NULL, SCPI_CMD_BEEPER_ENABLE);
-	sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
+
+	/* Don't send SCPI_CMD_LOCAL for HP 66xxB using SCPI over GPIB. */
+	if (!(devc->device->dialect == SCPI_DIALECT_HP_66XXB &&
+			scpi->transport == SCPI_TRANSPORT_LIBGPIB))
+		sr_scpi_cmd(sdi, devc->device->commands, 0, NULL, SCPI_CMD_LOCAL);
 
 	return sr_scpi_close(scpi);
 }
@@ -313,6 +341,8 @@ static int config_get(uint32_t key, GVariant **data,
 	char *channel_group_name;
 	int cmd, ret;
 	const char *s;
+	int reg;
+	gboolean is_hmp_sqii;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -371,11 +401,20 @@ static int config_get(uint32_t key, GVariant **data,
 		cmd = SCPI_CMD_GET_CURRENT_LIMIT;
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* OVP is always enabled. */
+			*data = g_variant_new_boolean(TRUE);
+			return 0;
+		}
 		gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED;
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE:
-		gvtype = G_VARIANT_TYPE_BOOLEAN;
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+			devc->device->dialect == SCPI_DIALECT_HP_COMP)
+			gvtype = G_VARIANT_TYPE_STRING;
+		else
+			gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE;
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
@@ -387,20 +426,43 @@ static int config_get(uint32_t key, GVariant **data,
 		cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED;
 		break;
 	case SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE:
-		gvtype = G_VARIANT_TYPE_BOOLEAN;
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+			devc->device->dialect == SCPI_DIALECT_HP_COMP)
+			gvtype = G_VARIANT_TYPE_STRING;
+		else
+			gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE;
 		break;
 	case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
 		gvtype = G_VARIANT_TYPE_DOUBLE;
 		cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD;
 		break;
+	case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+		gvtype = G_VARIANT_TYPE_DOUBLE;
+		cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_DELAY;
+		break;
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION:
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* OTP is always enabled. */
+			*data = g_variant_new_boolean(TRUE);
+			return 0;
+		}
 		gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION;
 		break;
+	case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+			devc->device->dialect == SCPI_DIALECT_HP_COMP ||
+			devc->device->dialect == SCPI_DIALECT_HMP)
+			gvtype = G_VARIANT_TYPE_STRING;
+		else
+			gvtype = G_VARIANT_TYPE_BOOLEAN;
+		cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE;
+		break;
 	case SR_CONF_REGULATION:
 		gvtype = G_VARIANT_TYPE_STRING;
 		cmd = SCPI_CMD_GET_OUTPUT_REGULATION;
+		break;
 	default:
 		return sr_sw_limits_config_get(&devc->limits, key, data);
 	}
@@ -414,32 +476,147 @@ static int config_get(uint32_t key, GVariant **data,
 		channel_group_name = g_strdup(cg->name);
 	}
 
-	ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
-		channel_group_cmd, channel_group_name, data, gvtype, cmd);
+	is_hmp_sqii = FALSE;
+	is_hmp_sqii |= cmd == SCPI_CMD_GET_OUTPUT_REGULATION;
+	is_hmp_sqii |= cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE;
+	is_hmp_sqii &= devc->device->dialect == SCPI_DIALECT_HMP;
+	if (is_hmp_sqii) {
+		if (!cg) {
+			/* STAT:QUES:INST:ISUMx query requires channel spec. */
+			sr_err("Need a channel group for regulation or OTP-active query.");
+			return SR_ERR_NA;
+		}
+		ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+			0, NULL, data, gvtype, cmd, channel_group_name);
+	} else {
+		ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+			channel_group_cmd, channel_group_name, data, gvtype, cmd);
+	}
 	g_free(channel_group_name);
 
+	/*
+	 * Handle special cases
+	 */
+
 	if (cmd == SCPI_CMD_GET_OUTPUT_REGULATION) {
-		/*
-		 * The Rigol DP800 series return CV/CC/UR, Philips PM2800
-		 * return VOLT/CURR. We always return a GVariant string in
-		 * the Rigol notation.
-		 */
-		s = g_variant_get_string(*data, NULL);
-		if (!strcmp(s, "VOLT")) {
+		if (devc->device->dialect == SCPI_DIALECT_PHILIPS) {
+			/*
+			* The Philips PM2800 series returns VOLT/CURR. We always return
+			* a GVariant string in the Rigol notation (CV/CC/UR).
+			*/
+			s = g_variant_get_string(*data, NULL);
+			if (!g_strcmp0(s, "VOLT")) {
+				g_variant_unref(*data);
+				*data = g_variant_new_string("CV");
+			} else if (!g_strcmp0(s, "CURR")) {
+				g_variant_unref(*data);
+				*data = g_variant_new_string("CC");
+			}
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+			/* Evaluate Status Register from a HP 66xx in COMP mode. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
 			g_variant_unref(*data);
-			*data = g_variant_new_string("CV");
-		} else if (!strcmp(s, "CURR")) {
+			if (reg & (1 << 0))
+				*data = g_variant_new_string("CV");
+			else if (reg & (1 << 1))
+				*data = g_variant_new_string("CC");
+			else if (reg & (1 << 2))
+				*data = g_variant_new_string("UR");
+			else if (reg & (1 << 9))
+				*data = g_variant_new_string("CC-");
+			else
+				*data = g_variant_new_string("");
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
+			/* Evaluate Operational Status Register from a HP 66xxB. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
 			g_variant_unref(*data);
-			*data = g_variant_new_string("CC");
+			if (reg & (1 << 8))
+				*data = g_variant_new_string("CV");
+			else if (reg & (1 << 10))
+				*data = g_variant_new_string("CC");
+			else if (reg & (1 << 11))
+				*data = g_variant_new_string("CC-");
+			else
+				*data = g_variant_new_string("UR");
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* Evaluate Condition Status Register from a HMP series device. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			if (reg & (1 << 0))
+				*data = g_variant_new_string("CC");
+			else if (reg & (1 << 1))
+				*data = g_variant_new_string("CV");
+			else
+				*data = g_variant_new_string("UR");
 		}
 
 		s = g_variant_get_string(*data, NULL);
-		if (strcmp(s, "CV") && strcmp(s, "CC") && strcmp(s, "UR")) {
-			sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
+		if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") && g_strcmp0(s, "CC-") &&
+			g_strcmp0(s, "UR") && g_strcmp0(s, "")) {
+
+			sr_err("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
 			ret = SR_ERR_DATA;
 		}
 	}
 
+	if (cmd == SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE) {
+		if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+			/* Evaluate Status Register from a HP 66xx in COMP mode. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 3));
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
+			/* Evaluate Questionable Status Register bit 0 from a HP 66xxB. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 0));
+		}
+	}
+
+	if (cmd == SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE) {
+		if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+			/* Evaluate Status Register from a HP 66xx in COMP mode. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 6));
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
+			/* Evaluate Questionable Status Register bit 1 from a HP 66xxB. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 1));
+		}
+	}
+
+	if (cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE) {
+		if (devc->device->dialect == SCPI_DIALECT_HP_COMP) {
+			/* Evaluate Status Register from a HP 66xx in COMP mode. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 4));
+		}
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+		    devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* Evaluate Questionable Status Register bit 4 from a HP 66xxB. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			*data = g_variant_new_boolean(reg & (1 << 4));
+		}
+	}
+
 	return ret;
 }
 
@@ -525,6 +702,12 @@ static int config_set(uint32_t key, GVariant *data,
 				channel_group_cmd, channel_group_name,
 				SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d);
 		break;
+	case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+		d = g_variant_get_double(data);
+		ret = sr_scpi_cmd(sdi, devc->device->commands,
+				channel_group_cmd, channel_group_name,
+				SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DELAY, d);
+		break;
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION:
 		if (g_variant_get_boolean(data))
 			ret = sr_scpi_cmd(sdi, devc->device->commands,
@@ -549,6 +732,7 @@ static int config_list(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
+	struct pps_channel *pch;
 	const struct channel_spec *ch_spec;
 	int i;
 	const char *s[16];
@@ -596,9 +780,10 @@ static int config_list(uint32_t key, GVariant **data,
 		 * specification for use in series or parallel mode.
 		 */
 		ch = cg->channels->data;
+		pch = ch->priv;
 		if (!devc || !devc->device)
 			return SR_ERR_ARG;
-		ch_spec = &(devc->device->channels[ch->index]);
+		ch_spec = &(devc->device->channels[pch->hw_output_idx]);
 
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
@@ -619,6 +804,9 @@ static int config_list(uint32_t key, GVariant **data,
 		case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
 			*data = std_gvar_min_max_step_array(ch_spec->ocp);
 			break;
+		case SR_CONF_OVER_CURRENT_PROTECTION_DELAY:
+			*data = std_gvar_min_max_step_array(ch_spec->ocp_delay);
+			break;
 		default:
 			return SR_ERR_NA;
 		}
@@ -639,6 +827,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	/* Prime the pipe with the first channel. */
 	devc->cur_acquisition_channel = sr_next_enabled_channel(sdi, NULL);
 
+	/* Device specific initialization before acquisition starts. */
+	if (devc->device->init_acquisition)
+		devc->device->init_acquisition(sdi);
+
 	if ((ret = sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 10,
 			scpi_pps_receive_data, (void *)sdi)) != SR_OK)
 		return ret;