X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fapi.c;h=47211fa41ff0aee622efbfd08f30b7173f286daa;hb=4b3197828d53587db7111e275390cc4857c2fdae;hp=d9eff157aa88c8c81f2f327ef3809ae28da54b74;hpb=dd7a72ea697a172032f5473b0ddff5e8d47222f4;p=libsigrok.git

diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index d9eff157..47211fa4 100644
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -32,9 +32,19 @@ static const uint32_t drvopts[] = {
 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",
 };
@@ -55,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) {
@@ -83,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);
 		}
@@ -159,13 +169,10 @@ static int config_get(uint32_t key, GVariant **data,
 	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;
@@ -178,7 +185,7 @@ 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;
 
@@ -186,16 +193,12 @@ static int config_set(uint32_t key, GVariant *data,
 
 	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;
@@ -234,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