X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fapi.c;h=4ff07830932799cce8b02d4073c3837377078cbd;hb=c1bcb8cc633cc69ce4a872f59ec2b686bc00bd04;hp=84f830a6f96e4b5036729b524a1c692a213c5025;hpb=42ceb77726b6314fc999cf3664114820eaeddba9;p=libsigrok.git

diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c
index 84f830a6..4ff07830 100644
--- a/hardware/zeroplus-logic-cube/api.c
+++ b/hardware/zeroplus-logic-cube/api.c
@@ -57,7 +57,9 @@ static const int32_t hwcaps[] = {
 	SR_CONF_LOGIC_ANALYZER,
 	SR_CONF_SAMPLERATE,
 	SR_CONF_CAPTURE_RATIO,
+	SR_CONF_VOLTAGE_THRESHOLD,
 	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_MAX_UNCOMPRESSED_SAMPLES,
 };
 
 /*
@@ -439,6 +441,9 @@ static int dev_open(struct sr_dev_inst *sdi)
 		devc->cur_samplerate = SR_MHZ(1);
 	}
 
+	if (devc->cur_threshold == 0)
+		set_voltage_threshold(devc, 1.5);
+
 	return SR_OK;
 }
 
@@ -482,12 +487,32 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
 			sr_spew("Returning samplerate: %" PRIu64 "Hz.",
 				devc->cur_samplerate);
 		} else
-			return SR_ERR;
+			return SR_ERR_ARG;
 		break;
 	case SR_CONF_CAPTURE_RATIO:
 		if (sdi) {
 			devc = sdi->priv;
 			*data = g_variant_new_uint64(devc->capture_ratio);
+		} else
+			return SR_ERR_ARG;
+		break;
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		if (sdi) {
+			GVariant *range[2];
+			devc = sdi->priv;
+			range[0] = g_variant_new_double(devc->cur_threshold);
+			range[1] = g_variant_new_double(devc->cur_threshold);
+			*data = g_variant_new_tuple(range, 2);
+		} else
+			return SR_ERR_ARG;
+		break;
+	case SR_CONF_MAX_UNCOMPRESSED_SAMPLES:
+		if (sdi) {
+			/* As long as this driver doesn't support compression,
+			 * this is ok. When compression is enabled, this should
+			 * return SR_ERR_NA instead. */
+			devc = sdi->priv;
+			*data = g_variant_new_uint64(devc->max_sample_depth);
 		} else
 			return SR_ERR;
 		break;
@@ -502,6 +527,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 		const struct sr_probe_group *probe_group)
 {
 	struct dev_context *devc;
+	gdouble low, high;
 
 	(void)probe_group;
 
@@ -520,6 +546,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 		return set_limit_samples(devc, g_variant_get_uint64(data));
 	case SR_CONF_CAPTURE_RATIO:
 		return set_capture_ratio(devc, g_variant_get_uint64(data));
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		g_variant_get(data, "(dd)", &low, &high);
+		return set_voltage_threshold(devc, (low + high) / 2.0);
 	default:
 		return SR_ERR_NA;
 	}
@@ -533,6 +562,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	struct dev_context *devc;
 	GVariant *gvar;
 	GVariantBuilder gvb;
+	double v;
+	GVariant *range[2];
 
 	(void)probe_group;
 
@@ -563,6 +594,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	case SR_CONF_TRIGGER_TYPE:
 		*data = g_variant_new_string(TRIGGER_TYPE);
 		break;
+	case SR_CONF_VOLTAGE_THRESHOLD:
+		g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+		for (v = -6.0; v <= 6.0; v += 0.1) {
+			range[0] = g_variant_new_double(v);
+			range[1] = g_variant_new_double(v);
+			gvar = g_variant_new_tuple(range, 2);
+			g_variant_builder_add_value(&gvb, gvar);
+		}
+		*data = g_variant_builder_end(&gvb);
+		break;
 	default:
 		return SR_ERR_NA;
 	}