X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fzeroplus-logic-cube%2Fprotocol.c;h=ce20ccf4012f1a5fadd9098b82ef32e10b0a8c50;hp=470debe64e4a6e91d5a13ba08894fb703d17ca83;hb=43cd4637285833706f8a404ca027bcf0ee75b9ae;hpb=3e43da1f70d48aba917026074d46ca4c91e43bf1

diff --git a/hardware/zeroplus-logic-cube/protocol.c b/hardware/zeroplus-logic-cube/protocol.c
index 470debe6..ce20ccf4 100644
--- a/hardware/zeroplus-logic-cube/protocol.c
+++ b/hardware/zeroplus-logic-cube/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <math.h>
 #include "protocol.h"
 
 SR_PRIV unsigned int get_memory_size(int type)
@@ -29,7 +30,7 @@ SR_PRIV unsigned int get_memory_size(int type)
 		return 0;
 }
 
-SR_PRIV int clz(unsigned int x)
+static int clz(unsigned int x)
 {
 	int n = 0;
 	if (x == 0)
@@ -57,6 +58,9 @@ SR_PRIV int clz(unsigned int x)
 
 SR_PRIV int set_limit_samples(struct dev_context *devc, uint64_t samples)
 {
+	if (samples > devc->max_sample_depth)
+		samples = devc->max_sample_depth;
+
 	devc->limit_samples = samples;
 
 	if (samples <= 2 * 1024)
@@ -88,29 +92,48 @@ SR_PRIV int set_capture_ratio(struct dev_context *devc, uint64_t ratio)
 	return SR_OK;
 }
 
+SR_PRIV int set_voltage_threshold(struct dev_context *devc, double thresh)
+{
+	if (thresh > 6.0)
+		thresh = 6.0;
+	if (thresh < -6.0)
+		thresh = -6.0;
+
+	devc->cur_threshold = thresh;
+
+	analyzer_set_voltage_threshold((int) round(-9.1*thresh + 62.6));
+
+	sr_info("Setting voltage threshold to %fV.", devc->cur_threshold);
+
+	return SR_OK;
+}
+
 SR_PRIV void set_triggerbar(struct dev_context *devc)
 {
-	unsigned int ramsize, n, triggerbar;
-
-	ramsize = get_memory_size(devc->memory_size) / 4;
-	if (devc->trigger) {
-		n = ramsize;
-		if (devc->max_sample_depth < n)
-			n = devc->max_sample_depth;
-		if (devc->limit_samples < n)
-			n = devc->limit_samples;
-		n = n * devc->capture_ratio / 100;
-		if (n > ramsize - 8)
-			triggerbar = ramsize - 8;
-		else
-			triggerbar = n;
-	} else {
+	unsigned int trigger_depth, triggerbar, ramsize_trigger;
+
+	trigger_depth = get_memory_size(devc->memory_size) / 4;
+	if (devc->limit_samples < trigger_depth)
+		trigger_depth = devc->limit_samples;
+
+	if (devc->trigger)
+		triggerbar = trigger_depth * devc->capture_ratio / 100;
+	else
+		triggerbar = 0;
+
+	ramsize_trigger = trigger_depth - triggerbar;
+	/* Matches USB packet captures from official app/driver */
+	if (triggerbar > 2)
+		triggerbar -= 2;
+	else {
+		ramsize_trigger -= 1;
 		triggerbar = 0;
 	}
+
 	analyzer_set_triggerbar_address(triggerbar);
-	analyzer_set_ramsize_trigger_address(ramsize - triggerbar);
+	analyzer_set_ramsize_trigger_address(ramsize_trigger);
 
 	sr_dbg("triggerbar_address = %d(0x%x)", triggerbar, triggerbar);
 	sr_dbg("ramsize_triggerbar_address = %d(0x%x)",
-	       ramsize - triggerbar, ramsize - triggerbar);
+	       ramsize_trigger, ramsize_trigger);
 }