X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffluke-dmm%2Fapi.c;h=a7272ad960e8adf8c878483a9637e7ba18632662;hb=5edc02c77c3576a47ee85241f32785cdf0fdddf8;hp=be1a1e02c16d8a11f6b662bf24f491d57e0267df;hpb=bc41e012e6eda6277cbbeb5933c82c3d74a5ce69;p=libsigrok.git

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index be1a1e02..a7272ad9 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -18,22 +18,46 @@
  */
 
 #include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "config.h"
-#include "fluke-dmm.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "fluke-dmm.h"
 
+static const int hwopts[] = {
+	SR_HWOPT_CONN,
+	SR_HWOPT_SERIALCOMM,
+	0,
+};
+
+static const int hwcaps[] = {
+	SR_HWCAP_MULTIMETER,
+	SR_HWCAP_LIMIT_SAMPLES,
+	SR_HWCAP_LIMIT_MSEC,
+	SR_HWCAP_CONTINUOUS,
+	0,
+};
 
 SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 static struct sr_dev_driver *di = &flukedmm_driver_info;
 
+static char *scan_conn[] = {
+	/* 287/289 */
+	"115200/8n1",
+	/* 187/189 */
+	"9600/8n1",
+	/* Scopemeter 190 series */
+	"1200/8n1",
+	NULL
+};
+
 static const struct flukedmm_profile supported_flukedmm[] = {
-	{ FLUKE_187, "187" },
+	{ FLUKE_187, "187", 100, 1000 },
+	{ FLUKE_287, "287", 100, 1000 },
+	{ FLUKE_190, "199B", 1000, 3500 },
 };
 
 
@@ -63,126 +87,73 @@ static int clear_instances(void)
 	return SR_OK;
 }
 
-static int hw_init(void)
+static int hw_init(struct sr_context *sr_ctx)
 {
 	struct drv_context *drvc;
 
 	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("fluke-dmm: driver context malloc failed.");
-		return SR_ERR;
+		sr_err("Driver context malloc failed.");
+		return SR_ERR_MALLOC;
 	}
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
 }
 
-static int serial_readline(int fd, char **buf, int *buflen, uint64_t timeout_ms)
-{
-	uint64_t start;
-	int maxlen, len;
-
-	timeout_ms *= 1000;
-	start = g_get_monotonic_time();
-
-	maxlen = *buflen;
-	*buflen = len = 0;
-	while(1) {
-		len = maxlen - *buflen - 1;
-		if (len < 1)
-			break;
-		len = serial_read(fd, *buf + *buflen, 1);
-		if (len > 0) {
-			*buflen += len;
-			*(*buf + *buflen) = '\0';
-			if (*buflen > 0 && *(*buf + *buflen - 1) == '\n') {
-				/* Strip LF and terminate. */
-				*(*buf + --*buflen) = '\0';
-				break;
-			}
-		}
-		if (g_get_monotonic_time() - start > timeout_ms)
-			/* Timeout */
-			break;
-		g_usleep(2000);
-	}
-	sr_dbg("fluke-dmm: received %d: '%s'", *buflen, *buf);
-
-	return SR_OK;
-}
-
-static GSList *hw_scan(GSList *options)
+static GSList *fluke_scan(const char *conn, const char *serialcomm)
 {
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_hwopt *opt;
 	struct sr_probe *probe;
-	GSList *l, *devices;
-	int retry, len, fd, i, s;
-	const char *conn, *serialcomm;
+	struct sr_serial_dev_inst *serial;
+	GSList *devices;
+	int retry, len, i, s;
 	char buf[128], *b, **tokens;
 
-	drvc = di->priv;
-	drvc->instances = NULL;
-
-	devices = NULL;
-	conn = serialcomm = NULL;
-	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
-		case SR_HWOPT_CONN:
-			conn = opt->value;
-			break;
-		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
-			break;
-		}
-	}
-	if (!conn || !serialcomm)
+	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
 		return NULL;
 
-	if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
-		sr_err("fluke-dmm: unable to open %s: %s", conn, strerror(errno));
+	if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
 		return NULL;
-	}
-
-	if (serial_set_paramstr(fd, serialcomm) != SR_OK) {
-		sr_err("fluke-dmm: unable to set serial parameters: %s",
-				strerror(errno));
-		return NULL;
-	}
 
+	drvc = di->priv;
 	b = buf;
 	retry = 0;
+	devices = NULL;
 	/* We'll try the discovery sequence three times in case the device
 	 * is not in an idle state when we send ID. */
 	while (!devices && retry < 3) {
 		retry++;
-		serial_flush(fd);
-		if (serial_write(fd, "ID\r", 3) == -1) {
-			sr_err("fluke-dmm: unable to send ID string: %s",
-					strerror(errno));
+		serial_flush(serial);
+		if (serial_write(serial, "ID\r", 3) == -1) {
+			sr_err("Unable to send ID string: %s.",
+			       strerror(errno));
 			continue;
 		}
 
 		/* Response is first a CMD_ACK byte (ASCII '0' for OK,
 		 * or '1' to signify an error. */
 		len = 128;
-		serial_readline(fd, &b, &len, 150);
+		serial_readline(serial, &b, &len, 150);
 		if (len != 1)
 			continue;
-		if (buf[0] != '0') {
-			sr_dbg("fluke-dmm: got ID response %.2x", buf[0]);
+		if (buf[0] != '0')
 			continue;
-		}
 
 		/* If CMD_ACK was OK, ID string follows. */
 		len = 128;
-		serial_readline(fd, &b, &len, 150);
+		serial_readline(serial, &b, &len, 850);
 		if (len < 10)
 			continue;
-		tokens = g_strsplit(buf, ",", 3);
+		if (strcspn(buf, ",") < 15)
+			/* Looks like it's comma-separated. */
+			tokens = g_strsplit(buf, ",", 3);
+		else
+			/* Fluke 199B, at least, uses semicolon. */
+			tokens = g_strsplit(buf, ";", 3);
 		if (!strncmp("FLUKE", tokens[0], 5)
 				&& tokens[1] && tokens[2]) {
 			for (i = 0; supported_flukedmm[i].model; i++) {
@@ -194,11 +165,11 @@ static GSList *hw_scan(GSList *options)
 						tokens[0] + 6, tokens[1] + s)))
 					return NULL;
 				if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
-					sr_dbg("fluke-dmm: failed to malloc devc");
+					sr_err("Device context malloc failed.");
 					return NULL;
 				}
 				devc->profile = &supported_flukedmm[i];
-				devc->serial = sr_serial_dev_inst_new(conn, -1);
+				devc->serial = serial;
 				sdi->priv = devc;
 				sdi->driver = di;
 				if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
@@ -210,9 +181,51 @@ static GSList *hw_scan(GSList *options)
 			}
 		}
 		g_strfreev(tokens);
+		if (devices)
+			/* Found one. */
+			break;
 	}
+	serial_close(serial);
+	if (!devices)
+		sr_serial_dev_inst_free(serial);
 
-	serial_close(fd);
+	return devices;
+}
+
+static GSList *hw_scan(GSList *options)
+{
+	struct sr_hwopt *opt;
+	GSList *l, *devices;
+	int i;
+	const char *conn, *serialcomm;
+
+	conn = serialcomm = NULL;
+	for (l = options; l; l = l->next) {
+		opt = l->data;
+		switch (opt->hwopt) {
+		case SR_HWOPT_CONN:
+			conn = opt->value;
+			break;
+		case SR_HWOPT_SERIALCOMM:
+			serialcomm = opt->value;
+			break;
+		}
+	}
+	if (!conn)
+		return NULL;
+
+	if (serialcomm) {
+		/* Use the provided comm specs. */
+		devices = fluke_scan(conn, serialcomm);
+	} else {
+		for (i = 0; scan_conn[i]; i++) {
+			if ((devices = fluke_scan(conn, scan_conn[i])))
+				break;
+			/* The Scopemeter 199B, at least, requires this
+			 * after all the 115k/9.6k confusion. */
+			g_usleep(5000);
+		}
+	}
 
 	return devices;
 }
@@ -228,16 +241,34 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
+	struct dev_context *devc;
 
-	/* TODO */
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
+	if (serial_open(devc->serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK)
+		return SR_ERR;
+
+	sdi->status = SR_ST_ACTIVE;
 
 	return SR_OK;
 }
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
 {
+	struct dev_context *devc;
 
-	/* TODO */
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
+	if (devc->serial && devc->serial->fd != -1) {
+		serial_close(devc->serial);
+		sdi->status = SR_ST_INACTIVE;
+	}
 
 	return SR_OK;
 }
@@ -247,18 +278,21 @@ static int hw_cleanup(void)
 
 	clear_instances();
 
-	/* TODO */
-
 	return SR_OK;
 }
 
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
+	(void)sdi;
 
 	switch (info_id) {
-	/* TODO */
+	case SR_DI_HWOPTS:
+		*data = hwopts;
+		break;
+	case SR_DI_HWCAPS:
+		*data = hwcaps;
+		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -269,40 +303,108 @@ static int hw_info_get(int info_id, const void **data,
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		const void *value)
 {
-	int ret;
+	struct dev_context *devc;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	ret = SR_OK;
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
 	switch (hwcap) {
-	/* TODO */
+	case SR_HWCAP_LIMIT_MSEC:
+		/* TODO: not yet implemented */
+		if (*(const uint64_t *)value == 0) {
+			sr_err("LIMIT_MSEC can't be 0.");
+			return SR_ERR;
+		}
+		devc->limit_msec = *(const uint64_t *)value;
+		sr_dbg("Setting time limit to %" PRIu64 "ms.",
+		       devc->limit_msec);
+		break;
+	case SR_HWCAP_LIMIT_SAMPLES:
+		devc->limit_samples = *(const uint64_t *)value;
+		sr_dbg("Setting sample limit to %" PRIu64 ".",
+		       devc->limit_samples);
+		break;
 	default:
-		ret = SR_ERR_ARG;
+		sr_err("Unknown capability: %d.", hwcap);
+		return SR_ERR;
+		break;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 		void *cb_data)
 {
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_header header;
+	struct sr_datafeed_meta_analog meta;
+	struct dev_context *devc;
+
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
 
-	/* TODO */
+	sr_dbg("Starting acquisition.");
+
+	devc->cb_data = cb_data;
+
+	/* Send header packet to the session bus. */
+	sr_dbg("Sending SR_DF_HEADER.");
+	packet.type = SR_DF_HEADER;
+	packet.payload = (uint8_t *)&header;
+	header.feed_version = 1;
+	gettimeofday(&header.starttime, NULL);
+	sr_session_send(devc->cb_data, &packet);
+
+	/* Send metadata about the SR_DF_ANALOG packets to come. */
+	sr_dbg("Sending SR_DF_META_ANALOG.");
+	packet.type = SR_DF_META_ANALOG;
+	packet.payload = &meta;
+	meta.num_probes = 1;
+	sr_session_send(devc->cb_data, &packet);
+
+	/* Poll every 100ms, or whenever some data comes in. */
+	sr_source_add(devc->serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
+
+	if (serial_write(devc->serial, "QM\r", 3) == -1) {
+		sr_err("Unable to send QM: %s.", strerror(errno));
+		return SR_ERR;
+	}
+	devc->cmd_sent_at = g_get_monotonic_time() / 1000;
+	devc->expect_response = TRUE;
 
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-		void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
-
-	(void)cb_data;
+	struct sr_datafeed_packet packet;
+	struct dev_context *devc;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR;
 
-	/* TODO */
+	if (!(devc = sdi->priv)) {
+		sr_err("sdi->priv was NULL.");
+		return SR_ERR_BUG;
+	}
+
+	sr_dbg("Stopping acquisition.");
+
+	sr_source_remove(devc->serial->fd);
+	hw_dev_close((struct sr_dev_inst *)sdi);
+
+	/* Send end packet to the session bus. */
+	sr_dbg("Sending SR_DF_END.");
+	packet.type = SR_DF_END;
+	sr_session_send(cb_data, &packet);
 
 	return SR_OK;
 }