X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=94afa8c55a114f879c17ee6676d45019d9b4ba70;hb=6c1a76d1263403f908ac31271a4fd01792488545;hp=0aa2b7bff9794c535da67279fd62f45634b40a2c;hpb=53012da658ae94b245240c8a3e115723eede4c7d;p=libsigrok.git

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 0aa2b7bf..94afa8c5 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -25,6 +25,7 @@
 
 #define CMD_VERSION "version\r\n"
 #define CMD_MONITOR "monitor 200\r\n"
+#define CMD_MONITOR_STOP "monitor 0\r\n"
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -94,6 +95,19 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 	serial_flush(serial);
 
+	/*
+	 * First stop potentially running monitoring and wait for 50ms before
+	 * next command can be sent.
+	 */
+	if (serial_write_blocking(serial, CMD_MONITOR_STOP,
+			strlen(CMD_MONITOR_STOP), serial_timeout(serial,
+			strlen(CMD_MONITOR_STOP))) < (int)strlen(CMD_MONITOR_STOP)) {
+		sr_dbg("Unable to write while probing for hardware.");
+		serial_close(serial);
+		return NULL;
+	}
+	g_usleep(50 * 1000);
+
 	if (serial_write_blocking(serial, CMD_VERSION,
 			strlen(CMD_VERSION), serial_timeout(serial,
 			strlen(CMD_VERSION))) < (int)strlen(CMD_VERSION)) {
@@ -237,29 +251,35 @@ static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 
 	(void)cg;
 
 	devc = sdi->priv;
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 	case SR_CONF_LIMIT_MSEC:
 		return sr_sw_limits_config_set(&devc->limits, key, data);
 	case SR_CONF_ENABLED:
-		ret = reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
-		break;
+		return reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
 	case SR_CONF_CURRENT_LIMIT:
-		ret = reloadpro_set_current_limit(sdi,
-			g_variant_get_double(data));
-		break;
+		return reloadpro_set_current_limit(sdi, g_variant_get_double(data));
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
+	}
+
+	return SR_OK;
+}
+
+static int dev_close(struct sr_dev_inst *sdi)
+{
+	if (serial_write_blocking(sdi->conn, CMD_MONITOR_STOP,
+			strlen(CMD_MONITOR_STOP), serial_timeout(sdi->conn,
+			strlen(CMD_MONITOR_STOP))) < (int)strlen(CMD_MONITOR_STOP)) {
+		sr_dbg("Unable to stop monitoring.");
 	}
 
-	return ret;
+	return std_serial_dev_close(sdi);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -304,7 +324,7 @@ static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = std_serial_dev_open,
-	.dev_close = std_serial_dev_close,
+	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,