X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=c14c20d400d05db58c3c55b32680f91893666b8e;hp=88e8f52e01e30c4489047e89268ee26cac5ee4aa;hb=HEAD;hpb=f670835f1fbc03525e995d6970a5495976ab7c1a diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c index 88e8f52e..c14c20d4 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, @@ -43,7 +44,7 @@ static const uint32_t devopts[] = { static const uint32_t devopts_cg[] = { SR_CONF_ENABLED | SR_CONF_SET, - SR_CONF_REGULATION | SR_CONF_GET, + SR_CONF_REGULATION | SR_CONF_GET | SR_CONF_LIST, SR_CONF_VOLTAGE | SR_CONF_GET, SR_CONF_CURRENT | SR_CONF_GET, SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, @@ -53,6 +54,12 @@ static const uint32_t devopts_cg[] = { SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET, SR_CONF_UNDER_VOLTAGE_CONDITION | SR_CONF_GET, SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE | SR_CONF_GET, + SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, +}; + +static const char *regulation[] = { + /* CC mode only. */ + "CC", }; static GSList *scan(struct sr_dev_driver *di, GSList *options) @@ -92,7 +99,18 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - 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, @@ -128,14 +146,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - cg = g_malloc0(sizeof(struct sr_channel_group)); - cg->name = g_strdup("1"); - sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); + cg = sr_channel_group_new(sdi, "1", NULL); ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V"); cg->channels = g_slist_append(cg->channels, ch); - ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "I"); + ch = sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I"); cg->channels = g_slist_append(cg->channels, ch); devc = g_malloc0(sizeof(struct dev_context)); @@ -150,64 +166,34 @@ 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_REGULATION: + *data = std_gvar_array_str(ARRAY_AND_SIZE(regulation)); 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; + case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD: + *data = std_gvar_min_max_step(0.0, 60.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 +209,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: @@ -258,48 +243,59 @@ static int config_get(uint32_t key, GVariant **data, *data = g_variant_new_boolean(devc->otp_active); break; case SR_CONF_UNDER_VOLTAGE_CONDITION: - *data = g_variant_new_boolean(TRUE); /* Always on. */ + if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK) + *data = g_variant_new_boolean(fvalue != 0.0); break; case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE: *data = g_variant_new_boolean(devc->uvc_active); break; + case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD: + if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK) + *data = g_variant_new_double(fvalue); + break; default: 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, + return reloadpro_set_current_limit(sdi, g_variant_get_double(data)); + case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD: + return reloadpro_set_under_voltage_threshold(sdi, g_variant_get_double(data)); - break; 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) @@ -309,6 +305,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 ' command (doesn't have a reply). */ @@ -319,19 +317,34 @@ 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); - sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); memset(devc->buf, 0, RELOADPRO_BUFSIZE); devc->buflen = 0; + g_mutex_init(&devc->acquisition_mutex); + + serial_source_add(sdi->session, serial, G_IO_IN, 100, + reloadpro_receive_data, (void *)sdi); + return SR_OK; } +static int dev_acquisition_stop(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + int ret; + + devc = sdi->priv; + devc->acquisition_running = FALSE; + + ret = std_serial_dev_acquisition_stop(sdi); + g_mutex_clear(&devc->acquisition_mutex); + + return ret; +} + static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = { .name = "arachnid-labs-re-load-pro", .longname = "Arachnid Labs Re:load Pro", @@ -340,13 +353,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);