X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=d24076e566196fe0796099ae7460f5591ffcfa3e;hb=a2172899517ab756ca765913d9957fc1f98e892b;hp=1a5281f80185e0cabf678f7a6978cafdc3761297;hpb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;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 1a5281f8..d24076e5 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)) { @@ -150,64 +164,28 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - GVariantBuilder gvb; - int ret; - - /* Always available. */ - if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - return SR_OK; - } - - if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); - return SR_OK; - } - - if (!sdi) - return SR_ERR_ARG; - - ret = SR_OK; - if (!cg) { - /* No channel group: global options. */ - switch (key) { - case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - default: - return SR_ERR_NA; - } + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); } else { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); break; case SR_CONF_CURRENT_LIMIT: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - g_variant_builder_add_value(&gvb, g_variant_new_double(0.0)); - g_variant_builder_add_value(&gvb, g_variant_new_double(6.0)); - g_variant_builder_add_value(&gvb, g_variant_new_double(0.001)); /* 1mA steps */ - *data = g_variant_builder_end(&gvb); + *data = std_gvar_min_max_step(0.0, 6.0, 0.001); break; default: return SR_ERR_NA; } } - return ret; + return SR_OK; } static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; - int ret; float fvalue; (void)cg; @@ -223,7 +201,6 @@ static int config_get(uint32_t key, GVariant **data, * - SR_CONF_ENABLED (state cannot be queried, only set) */ - ret = SR_OK; switch (key) { case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_MSEC: @@ -267,39 +244,42 @@ static int config_get(uint32_t key, GVariant **data, return SR_ERR_NA; } - return ret; + return SR_OK; } 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; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - 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) @@ -308,10 +288,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; + devc->acquisition_running = TRUE; + serial = sdi->conn; /* Send the 'monitor ' command (doesn't have a reply). */ @@ -322,7 +301,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_ERR; } - /* Poll every 100ms, or whenever some data comes in. */ serial_source_add(sdi->session, serial, G_IO_IN, 100, reloadpro_receive_data, (void *)sdi); @@ -335,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", @@ -343,13 +331,14 @@ static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = { .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = config_get, .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);