X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fprotocol.c;h=029edbd76750bf378988e0388ba0a707cfa0c85f;hb=e5b7eef797ba16ca901fc0a91053329937bd5b26;hp=9d32dc67edfe3656cd4a921462e295f4ab396cbe;hpb=356f64f8c735b5432f930872c90923a8e7f82913;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 9d32dc67..029edbd7 100644
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -24,14 +24,14 @@
 #include "protocol.h"
 
 static const char *hameg_scpi_dialect[] = {
-	[SCPI_CMD_GET_DIG_DATA]		    = ":POD%d:DATA?",
+	[SCPI_CMD_GET_DIG_DATA]		    = ":FORM UINT,8;:POD%d:DATA?",
 	[SCPI_CMD_GET_TIMEBASE]		    = ":TIM:SCAL?",
 	[SCPI_CMD_SET_TIMEBASE]		    = ":TIM:SCAL %s",
 	[SCPI_CMD_GET_COUPLING]		    = ":CHAN%d:COUP?",
 	[SCPI_CMD_SET_COUPLING]		    = ":CHAN%d:COUP %s",
 	[SCPI_CMD_GET_SAMPLE_RATE]	    = ":ACQ:SRAT?",
 	[SCPI_CMD_GET_SAMPLE_RATE_LIVE]	    = ":%s:DATA:POINTS?",
-	[SCPI_CMD_GET_ANALOG_DATA]	    = ":CHAN%d:DATA?",
+	[SCPI_CMD_GET_ANALOG_DATA]	    = ":FORM REAL,32;:CHAN%d:DATA?",
 	[SCPI_CMD_GET_VERTICAL_DIV]	    = ":CHAN%d:SCAL?",
 	[SCPI_CMD_SET_VERTICAL_DIV]	    = ":CHAN%d:SCAL %s",
 	[SCPI_CMD_GET_DIG_POD_STATE]	    = ":POD%d:STAT?",
@@ -47,6 +47,7 @@ static const char *hameg_scpi_dialect[] = {
 	[SCPI_CMD_SET_HORIZ_TRIGGERPOS]	    = ":TIM:POS %s",
 	[SCPI_CMD_GET_ANALOG_CHAN_STATE]    = ":CHAN%d:STAT?",
 	[SCPI_CMD_SET_ANALOG_CHAN_STATE]    = ":CHAN%d:STAT %d",
+	[SCPI_CMD_GET_PROBE_UNIT]	    = ":PROB%d:SET:ATT:UNIT?",
 };
 
 static const uint32_t hmo_devopts[] = {
@@ -67,10 +68,10 @@ static const uint32_t hmo_analog_devopts[] = {
 };
 
 static const char *hmo_coupling_options[] = {
-	"AC",
-	"ACL",
-	"DC",
-	"DCL",
+	"AC",  // AC with 50 Ohm termination (152x, 202x, 30xx, 1202)
+	"ACL", // AC with 1 MOhm termination
+	"DC",  // DC with 50 Ohm termination
+	"DCL", // DC with 1 MOhm termination
 	"GND",
 	NULL,
 };
@@ -87,6 +88,9 @@ static const char *hmo_compact2_trigger_sources[] = {
 	"CH2",
 	"LINE",
 	"EXT",
+	"PATT",
+	"BUS1",
+	"BUS2",
 	"D0",
 	"D1",
 	"D2",
@@ -105,6 +109,9 @@ static const char *hmo_compact4_trigger_sources[] = {
 	"CH4",
 	"LINE",
 	"EXT",
+	"PATT",
+	"BUS1",
+	"BUS2",
 	"D0",
 	"D1",
 	"D2",
@@ -337,14 +344,8 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 }
 
 /**
- * This function takes a value of the form "2.000E-03", converts it to a
- * significand / factor pair and returns the index of an array where
- * a matching pair was found.
- *
- * It's a bit convoluted because of floating-point issues. The value "10.00E-09"
- * is parsed by g_ascii_strtod() as 0.000000009999999939, for example.
- * Therefore it's easier to break the number up into two strings and handle
- * them separately.
+ * This function takes a value of the form "2.000E-03" and returns the index
+ * of an array where a matching pair was found.
  *
  * @param value The string to be parsed.
  * @param array The array of s/f pairs.
@@ -356,48 +357,15 @@ static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
 static int array_float_get(gchar *value, const uint64_t array[][2],
 		int array_len, unsigned int *result)
 {
-	int i, e;
-	size_t pos;
-	uint64_t f;
-	float s;
-	unsigned int s_int;
-	gchar ss[10], es[10];
-
-	memset(ss, 0, sizeof(ss));
-	memset(es, 0, sizeof(es));
-
-	/* Get index of the separating 'E' character and break up the string. */
-	pos = strcspn(value, "E");
-
-	strncpy(ss, value, pos);
-	strncpy(es, &(value[pos+1]), 3);
+	struct sr_rational rval;
+	struct sr_rational aval;
 
-	if (sr_atof_ascii(ss, &s) != SR_OK)
+	if (sr_parse_rational(value, &rval) != SR_OK)
 		return SR_ERR;
-	if (sr_atoi(es, &e) != SR_OK)
-		return SR_ERR;
-
-	/* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
-	f = pow(10, abs(e));
-
-	/*
-	 * Adjust the significand/factor pair to make sure
-	 * that f is a multiple of 1000.
-	 */
-	while ((int)fmod(log10(f), 3) > 0) {
-		s *= 10;
 
-		if (e < 0)
-			f *= 10;
-		else
-			f /= 10;
-	}
-
-	/* Truncate s to circumvent rounding errors. */
-	s_int = (unsigned int)s;
-
-	for (i = 0; i < array_len; i++) {
-		if ((s_int == array[i][0]) && (f == array[i][1])) {
+	for (int i = 0; i < array_len; i++) {
+		sr_rational_set(&aval, array[i][0], array[i][1]);
+		if (sr_rational_eq(&rval, &aval)) {
 			*result = i;
 			return SR_OK;
 		}
@@ -455,6 +423,19 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
 		if (scope_state_get_array_option(scpi, command, config->coupling_options,
 					 &state->analog_channels[i].coupling) != SR_OK)
 			return SR_ERR;
+
+		g_snprintf(command, sizeof(command),
+			   (*config->scpi_dialect)[SCPI_CMD_GET_PROBE_UNIT],
+			   i + 1);
+
+		if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
+			return SR_ERR;
+
+		if (tmp_str[0] == 'A')
+			state->analog_channels[i].probe_unit = 'A';
+		else
+			state->analog_channels[i].probe_unit = 'V';
+		g_free(tmp_str);
 	}
 
 	return SR_OK;
@@ -589,6 +570,7 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 		sr_err("Could not determine array index for time base.");
 		return SR_ERR;
 	}
+	g_free(tmp_str);
 
 	state->timebase = i;
 
@@ -728,12 +710,17 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 	struct sr_channel *ch;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
+	struct scope_state *state;
 	struct sr_datafeed_packet packet;
-	GArray *data;
-	struct sr_datafeed_analog_old analog;
+	GByteArray *data;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
 	struct sr_datafeed_logic logic;
 
 	(void)fd;
+	(void)revents;
 
 	data = NULL;
 
@@ -743,16 +730,21 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
+	/* Although this is correct in general, the USBTMC libusb implementation
+	 * currently does not generate an event prior to the first read. Often
+	 * it is ok to start reading just after the 50ms timeout. See bug #785.
 	if (revents != G_IO_IN)
 		return TRUE;
+	*/
 
 	ch = devc->current_channel->data;
+	state = devc->model_state;
 
 	switch (ch->type) {
 	case SR_CHANNEL_ANALOG:
-		if (sr_scpi_get_floatv(sdi->conn, NULL, &data) != SR_OK) {
+		if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
 			if (data)
-				g_array_free(data, TRUE);
+				g_byte_array_free(data, TRUE);
 
 			return TRUE;
 		}
@@ -760,21 +752,42 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		packet.type = SR_DF_FRAME_BEGIN;
 		sr_session_send(sdi, &packet);
 
-		analog.channels = g_slist_append(NULL, ch);
-		analog.num_samples = data->len;
-		analog.data = (float *) data->data;
-		analog.mq = SR_MQ_VOLTAGE;
-		analog.unit = SR_UNIT_VOLT;
-		analog.mqflags = 0;
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
+
+		analog.data = data->data;
+		analog.num_samples = data->len / sizeof(float);
+		analog.encoding = &encoding;
+		analog.meaning = &meaning;
+		analog.spec = &spec;
+
+		encoding.unitsize = sizeof(float);
+		encoding.is_signed = TRUE;
+		encoding.is_float = TRUE;
+		encoding.is_bigendian = FALSE;
+		encoding.digits = 0;
+		encoding.is_digits_decimal = FALSE;
+		encoding.scale.p = 1;
+		encoding.scale.q = 1;
+		encoding.offset.p = 0;
+		encoding.offset.q = 1;
+		if (state->analog_channels[ch->index].probe_unit == 'V') {
+			meaning.mq = SR_MQ_VOLTAGE;
+			meaning.unit = SR_UNIT_VOLT;
+		} else {
+			meaning.mq = SR_MQ_CURRENT;
+			meaning.unit = SR_UNIT_AMPERE;
+		}
+		meaning.mqflags = 0;
+		meaning.channels = g_slist_append(NULL, ch);
+		spec.spec_digits = 0;
 		packet.payload = &analog;
-		sr_session_send(cb_data, &packet);
-		g_slist_free(analog.channels);
-		g_array_free(data, TRUE);
+		sr_session_send(sdi, &packet);
+		g_slist_free(meaning.channels);
+		g_byte_array_free(data, TRUE);
 		data = NULL;
 		break;
 	case SR_CHANNEL_LOGIC:
-		if (sr_scpi_get_uint8v(sdi->conn, NULL, &data) != SR_OK) {
+		if (sr_scpi_get_block(sdi->conn, NULL, &data) != SR_OK) {
 			g_free(data);
 			return TRUE;
 		}
@@ -787,8 +800,8 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		logic.data = data->data;
 		packet.type = SR_DF_LOGIC;
 		packet.payload = &logic;
-		sr_session_send(cb_data, &packet);
-		g_array_free(data, TRUE);
+		sr_session_send(sdi, &packet);
+		g_byte_array_free(data, TRUE);
 		data = NULL;
 		break;
 	default:
@@ -803,7 +816,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 		devc->current_channel = devc->current_channel->next;
 		hmo_request_data(sdi);
 	} else if (++devc->num_frames == devc->frame_limit) {
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
+		sdi->driver->dev_acquisition_stop(sdi);
 	} else {
 		devc->current_channel = devc->enabled_channels;
 		hmo_request_data(sdi);