arachnid-labs-re-load-pro: Change serial read in acquisition mode.

[libsigrok.git] / src / hardware / arachnid-labs-re-load-pro / api.c

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 91b086aafc6b7e7dcf9a704db54c09f4467abf22..d24076e566196fe0796099ae7460f5591ffcfa3e 100644 (file)
--- 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)) {
@@ -155,7 +169,7 @@ static int config_list(uint32_t key, GVariant **data,
        } else {
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
-                       *data = std_gvar_array_u32(devopts_cg, ARRAY_SIZE(devopts_cg));
+                       *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
                        break;
                case SR_CONF_CURRENT_LIMIT:
                        *data = std_gvar_min_max_step(0.0, 6.0, 0.001);
@@ -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 ret;
+       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 std_serial_dev_close(sdi);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -269,6 +289,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct sr_serial_dev_inst *serial;
 
        devc = sdi->priv;
+       devc->acquisition_running = TRUE;
+
        serial = sdi->conn;
 
        /* Send the 'monitor <ms>' command (doesn't have a reply). */
@@ -291,6 +313,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
+{
+       struct dev_context *devc;
+
+       devc = sdi->priv;
+       devc->acquisition_running = FALSE;
+
+       return std_serial_dev_acquisition_stop(sdi);
+}
+
 static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
        .name = "arachnid-labs-re-load-pro",
        .longname = "Arachnid Labs Re:load Pro",
@@ -304,9 +336,9 @@ 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,
+       .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(arachnid_labs_re_load_pro_driver_info);