X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcem-dt-885x%2Fapi.c;h=fb309fe2592c55029c10cdfddbc683591a9f8627;hb=f157b2eebb8523792bd085eeb8fb3632b5d4c172;hp=834e4290d24a153dc0442927e3dfa98326e93c3d;hpb=1487ce4fbc0368058d16d42666fd8703e976f072;p=libsigrok.git

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 834e4290..fb309fe2 100644
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -35,6 +35,9 @@ static const int32_t hwcaps[] = {
 	SR_CONF_DATALOG,
 	SR_CONF_SPL_WEIGHT_FREQ,
 	SR_CONF_SPL_WEIGHT_TIME,
+	SR_CONF_HOLD_MAX,
+	SR_CONF_HOLD_MIN,
+	SR_CONF_SPL_MEASUREMENT_RANGE,
 };
 
 static const char *weight_freq[] = {
@@ -47,6 +50,13 @@ static const char *weight_time[] = {
 	"S",
 };
 
+static const uint64_t meas_ranges[][2] = {
+	{ 30, 130 },
+	{ 30, 80 },
+	{ 50, 100 },
+	{ 80, 130 },
+};
+
 SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 static struct sr_dev_driver *di = &cem_dt_885x_driver_info;
 
@@ -100,6 +110,7 @@ static GSList *scan(GSList *options)
 			}
 			devc->cur_mqflags = 0;
 			devc->recording = -1;
+			devc->cur_meas_range = 0;
 
 			if (!(sdi->conn = sr_serial_dev_inst_new(conn, SERIALCOMM)))
 				return NULL;
@@ -171,18 +182,22 @@ static int cleanup(void)
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	int tmp;
+	GVariant *range[2];
+	uint64_t low, high;
+	int tmp, ret;
 
 	if (!sdi)
 		return SR_ERR_ARG;
 
 	devc = sdi->priv;
+	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
 		*data = g_variant_new_uint64(devc->limit_samples);
 		break;
 	case SR_CONF_DATALOG:
-		*data = g_variant_new_boolean(cem_dt_885x_recording_get(sdi));
+		if ((ret = cem_dt_885x_recording_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp);
 		break;
 	case SR_CONF_SPL_WEIGHT_FREQ:
 		tmp = cem_dt_885x_weight_freq_get(sdi);
@@ -202,18 +217,34 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
 		else
 			return SR_ERR;
 		break;
+	case SR_CONF_HOLD_MAX:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MAX);
+		break;
+	case SR_CONF_HOLD_MIN:
+		if ((ret = cem_dt_885x_holdmode_get(sdi, &tmp)) == SR_OK)
+			*data = g_variant_new_boolean(tmp == SR_MQFLAG_MIN);
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		if ((ret = cem_dt_885x_meas_range_get(sdi, &low, &high)) == SR_OK) {
+			range[0] = g_variant_new_uint64(low);
+			range[1] = g_variant_new_uint64(high);
+			*data = g_variant_new_tuple(range, 2);
+		}
+		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return SR_OK;
+	return ret;
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	uint64_t tmp_u64;
-	int ret;
+	uint64_t tmp_u64, low, high;
+	unsigned int i;
+	int tmp, ret;
 	const char *tmp_str;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -232,13 +263,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 		ret = SR_OK;
 		break;
 	case SR_CONF_DATALOG:
-		if (g_variant_get_boolean(data)) {
-			/* Start logging. */
-			ret = cem_dt_885x_recording_set(sdi, TRUE);
-		} else {
-			/* Stop logging. */
-			ret = cem_dt_885x_recording_set(sdi, FALSE);
-		}
+		ret = cem_dt_885x_recording_set(sdi, g_variant_get_boolean(data));
 		break;
 	case SR_CONF_SPL_WEIGHT_FREQ:
 		tmp_str = g_variant_get_string(data, NULL);
@@ -262,6 +287,24 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 		else
 			return SR_ERR_ARG;
 		break;
+	case SR_CONF_HOLD_MAX:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MAX : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
+	case SR_CONF_HOLD_MIN:
+		tmp = g_variant_get_boolean(data) ? SR_MQFLAG_MIN : 0;
+		ret = cem_dt_885x_holdmode_set(sdi, tmp);
+		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		g_variant_get(data, "(tt)", &low, &high);
+		ret = SR_ERR_ARG;
+		for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+			if (meas_ranges[i][0] == low && meas_ranges[i][1] == high) {
+				ret = cem_dt_885x_meas_range_set(sdi, low, high);
+				break;
+			}
+		}
+		break;
 	default:
 		ret = SR_ERR_NA;
 	}
@@ -271,6 +314,9 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 {
+	GVariant *tuple, *range[2];
+	GVariantBuilder gvb;
+	unsigned int i;
 	int ret;
 
 	(void)sdi;
@@ -291,6 +337,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
 	case SR_CONF_SPL_WEIGHT_TIME:
 		*data = g_variant_new_strv(weight_time, ARRAY_SIZE(weight_time));
 		break;
+	case SR_CONF_SPL_MEASUREMENT_RANGE:
+		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+		for (i = 0; i < ARRAY_SIZE(meas_ranges); i++) {
+			range[0] = g_variant_new_uint64(meas_ranges[i][0]);
+			range[1] = g_variant_new_uint64(meas_ranges[i][1]);
+			tuple = g_variant_new_tuple(range, 2);
+			g_variant_builder_add_value(&gvb, tuple);
+		}
+		*data = g_variant_builder_end(&gvb);
+		break;
 	default:
 		return SR_ERR_NA;
 	}