X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fapi.c;h=47211fa41ff0aee622efbfd08f30b7173f286daa;hb=a0ba75bda2d1a8d3502f365a2a2a7461a68149fc;hp=1d12a580a76fbdd844520b1dcc3f111cf08c5504;hpb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;p=libsigrok.git diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c index 1d12a580..47211fa4 100644 --- a/src/hardware/uni-t-ut32x/api.c +++ b/src/hardware/uni-t-ut32x/api.c @@ -25,20 +25,32 @@ static const uint32_t scanopts[] = { SR_CONF_CONN, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_THERMOMETER, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; +/* + * BEWARE! "T1-T2" looks like a range, and is probably not a good + * channel name. Using it in sigrok-cli -C specs is troublesome. Use + * "delta" instead? -- But OTOH channels are not selected by the + * software. Instead received packets just reflect the one channel + * that manually was selected by the user via the device's buttons. + * So the name is not a blocker, and it matches the labels on the + * device and in the manual. So we can get away with it. + */ static const char *channel_names[] = { "T1", "T2", "T1-T2", }; static const char *data_sources[] = { - "Live", - "Memory", + "Live", "Memory", }; static GSList *scan(struct sr_dev_driver *di, GSList *options) @@ -53,7 +65,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) drvc = di->context; - conn = NULL; + conn = "1a86.e008"; for (l = options; l; l = l->next) { src = l->data; switch (src->key) { @@ -72,8 +84,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) for (l = usb_devices; l; l = l->next) { sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->vendor = g_strdup(VENDOR); - sdi->model = g_strdup(MODEL); + sdi->vendor = g_strdup("UNI-T"); + sdi->model = g_strdup("UT32x"); sdi->inst_type = SR_INST_USB; sdi->conn = l->data; for (i = 0; i < ARRAY_SIZE(channel_names); i++) @@ -81,7 +93,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) channel_names[i]); devc = g_malloc0(sizeof(struct dev_context)); sdi->priv = devc; - devc->limit_samples = 0; + sr_sw_limits_init(&devc->limits); devc->data_source = DEFAULT_DATA_SOURCE; devices = g_slist_append(devices, sdi); } @@ -147,8 +159,8 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; @@ -157,13 +169,10 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s devc = sdi->priv; switch (key) { case SR_CONF_LIMIT_SAMPLES: - *data = g_variant_new_uint64(devc->limit_samples); - break; + case SR_CONF_LIMIT_MSEC: + return sr_sw_limits_config_get(&devc->limits, key, data); case SR_CONF_DATA_SOURCE: - if (devc->data_source == DATA_SOURCE_LIVE) - *data = g_variant_new_string("Live"); - else - *data = g_variant_new_string("Memory"); + *data = g_variant_new_string(data_sources[devc->data_source]); break; default: return SR_ERR_NA; @@ -172,11 +181,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +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; - const char *tmp_str; + int idx; (void)cg; @@ -184,16 +193,12 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd switch (key) { case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; + case SR_CONF_LIMIT_MSEC: + return sr_sw_limits_config_set(&devc->limits, key, data); case SR_CONF_DATA_SOURCE: - tmp_str = g_variant_get_string(data, NULL); - if (!strcmp(tmp_str, "Live")) - devc->data_source = DATA_SOURCE_LIVE; - else if (!strcmp(tmp_str, "Memory")) - devc->data_source = DATA_SOURCE_MEMORY; - else - return SR_ERR; + if ((idx = std_str_idx(data, ARRAY_AND_SIZE(data_sources))) < 0) + return SR_ERR_ARG; + devc->data_source = idx; break; default: return SR_ERR_NA; @@ -202,23 +207,15 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; - (void)cg; - switch (key) { case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - break; case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_DATA_SOURCE: - *data = g_variant_new_strv(data_sources, ARRAY_SIZE(data_sources)); + *data = g_variant_new_strv(ARRAY_AND_SIZE(data_sources)); break; default: return SR_ERR_NA; @@ -240,7 +237,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc = sdi->priv; usb = sdi->conn; - devc->num_samples = 0; + sr_sw_limits_acquisition_start(&devc->limits); devc->packet_len = 0; /* Configure serial port parameters on USB-UART interface @@ -302,7 +299,7 @@ static struct sr_dev_driver uni_t_ut32x_driver_info = { .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, - .dev_clear = NULL, + .dev_clear = std_dev_clear, .config_get = config_get, .config_set = config_set, .config_list = config_list,