X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=c14c20d400d05db58c3c55b32680f91893666b8e;hb=c622c88c446a2f5e1c045657ef233c147a1f43d4;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..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)); @@ -157,9 +173,15 @@ static int config_list(uint32_t key, GVariant **data, case SR_CONF_DEVICE_OPTIONS: *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: *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; } @@ -221,11 +243,16 @@ 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; } @@ -237,29 +264,38 @@ 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, + 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) @@ -269,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). */ @@ -279,18 +317,34 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_ERR; } - 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", @@ -304,9 +358,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);