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

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 154479cc..a7272ad9 100644
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -41,17 +41,23 @@ static const int hwcaps[] = {
 	0,
 };
 
-static const char *probe_names[] = {
-	"Probe",
-	NULL,
-};
-
 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", 100 },
-	{ FLUKE_287, "287", 100 },
+	{ FLUKE_187, "187", 100, 1000 },
+	{ FLUKE_287, "287", 100, 1000 },
+	{ FLUKE_190, "199B", 1000, 3500 },
 };
 
 
@@ -139,10 +145,15 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 
 		/* If CMD_ACK was OK, ID string follows. */
 		len = 128;
-		serial_readline(serial, &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++) {
@@ -170,6 +181,9 @@ static GSList *fluke_scan(const char *conn, const char *serialcomm)
 			}
 		}
 		g_strfreev(tokens);
+		if (devices)
+			/* Found one. */
+			break;
 	}
 	serial_close(serial);
 	if (!devices)
@@ -182,6 +196,7 @@ static GSList *hw_scan(GSList *options)
 {
 	struct sr_hwopt *opt;
 	GSList *l, *devices;
+	int i;
 	const char *conn, *serialcomm;
 
 	conn = serialcomm = NULL;
@@ -203,11 +218,13 @@ static GSList *hw_scan(GSList *options)
 		/* Use the provided comm specs. */
 		devices = fluke_scan(conn, serialcomm);
 	} else {
-		/* Try 115200, as used on 287/289. */
-		devices = fluke_scan(conn, "115200/8n1");
-		if (!devices)
-			/* Fall back to 9600 for 187/189. */
-			devices = fluke_scan(conn, "9600/8n1");
+		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;
@@ -267,7 +284,6 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
        const struct sr_dev_inst *sdi)
 {
-
 	(void)sdi;
 
 	switch (info_id) {
@@ -277,12 +293,6 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}