X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Fhantek-dso%2Fdso.c;h=6e704cfb389d07f10524a335c05103c75cce729c;hb=b58fbd99c8944a3ba584540aa7ceb34b5451fa3a;hp=552ee17b050d8ed42a582f0ea8b5296df9b0b639;hpb=bc79e906a0911b4218b42b63b2f27fb0016c59da;p=libsigrok.git

diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index 552ee17b..6e704cfb 100644
--- a/hardware/hantek-dso/dso.c
+++ b/hardware/hantek-dso/dso.c
@@ -226,19 +226,32 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
 	uint16_t timebase_large[] = { 0xffff, 0x0000, 0xfffc, 0xfff7, 0xffe8,
 			0xffce, 0xff9d, 0xff07, 0xfe0d, 0xfc19, 0xf63d, 0xec79 };
 
-	sr_dbg("hantek-dso: sending CMD_SET_TRIGGER_SAMPLERATE");
+	sr_dbg("hantek-dso: preparing CMD_SET_TRIGGER_SAMPLERATE");
 
 	memset(cmdstring, 0, sizeof(cmdstring));
 	/* Command */
 	cmdstring[0] = CMD_SET_TRIGGER_SAMPLERATE;
 
 	/* Trigger source */
-	cmdstring[2] = (ctx->triggersource & 0x03);
+	sr_dbg("hantek-dso: trigger source %s", ctx->triggersource);
+	if (!strcmp("CH2", ctx->triggersource))
+		tmp = 0;
+	else if (!strcmp("CH1", ctx->triggersource))
+		tmp = 1;
+	else if (!strcmp("EXT", ctx->triggersource))
+		tmp = 2;
+	else {
+		sr_err("hantek-dso: invalid trigger source %s", ctx->triggersource);
+		return SR_ERR_ARG;
+	}
+	cmdstring[2] = tmp;
 
 	/* Frame size */
+	sr_dbg("hantek-dso: frame size %d", ctx->framesize);
 	cmdstring[2] |= (ctx->framesize == FRAMESIZE_SMALL ? 0x01 : 0x02) << 2;
 
 	/* Timebase fast */
+	sr_dbg("hantek-dso: time base index %d", ctx->timebase);
 	switch (ctx->framesize) {
 	case FRAMESIZE_SMALL:
 		if (ctx->timebase < TIME_20us)
@@ -270,6 +283,7 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
 	cmdstring[2] |= (tmp & 0x07) << 5;
 
 	/* Enabled channels: 00=CH1 01=CH2 10=both */
+	sr_dbg("hantek-dso: channels CH1=%d CH2=%d", ctx->ch1_enabled, ctx->ch2_enabled);
 	tmp = (((ctx->ch2_enabled ? 1 : 0) << 1) + (ctx->ch1_enabled ? 1 : 0)) - 1;
 	cmdstring[3] = tmp;
 
@@ -279,9 +293,11 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
 	cmdstring[3] |= tmp << 2;
 
 	/* Trigger slope: 0=positive 1=negative */
+	/* TODO: does this work? */
+	sr_dbg("hantek-dso: trigger slope %d", ctx->triggerslope);
 	cmdstring[3] |= (ctx->triggerslope == SLOPE_NEGATIVE ? 1 : 0) << 3;
 
-	/* Timebase */
+	/* Timebase slow */
 	if (ctx->timebase < TIME_100us)
 		tmp = 0;
 	else if (ctx->timebase > TIME_400ms)
@@ -296,6 +312,7 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
 	cmdstring[5] = (tmp >> 8) & 0xff;
 
 	/* Horizontal trigger position */
+	sr_dbg("hantek-dso: trigger position %3.2f", ctx->triggerposition);
 	tmp = 0x77fff + 0x8000 * ctx->triggerposition;
 	cmdstring[6] = tmp & 0xff;
 	cmdstring[7] = (tmp >> 8) & 0xff;
@@ -311,6 +328,7 @@ SR_PRIV int dso_set_trigger_samplerate(struct context *ctx)
 		sr_err("Failed to set trigger/samplerate: %d", ret);
 		return SR_ERR;
 	}
+	sr_dbg("hantek-dso: sent CMD_SET_TRIGGER_SAMPLERATE");
 
 	return SR_OK;
 }
@@ -320,17 +338,24 @@ SR_PRIV int dso_set_filters(struct context *ctx)
 	int ret, tmp;
 	uint8_t cmdstring[8];
 
-	sr_dbg("hantek-dso: sending CMD_SET_FILTERS");
+	sr_dbg("hantek-dso: preparing CMD_SET_FILTERS");
 
 	memset(cmdstring, 0, sizeof(cmdstring));
 	cmdstring[0] = CMD_SET_FILTERS;
 	cmdstring[1] = 0x0f;
-	if (ctx->filter_ch1)
+	if (ctx->filter_ch1) {
+		sr_dbg("hantek-dso: turning on CH1 filter");
 		cmdstring[2] |= 0x80;
-	if (ctx->filter_ch2)
+	}
+	if (ctx->filter_ch2) {
+		sr_dbg("hantek-dso: turning on CH2 filter");
 		cmdstring[2] |= 0x40;
-	if (ctx->filter_trigger)
+	}
+	if (ctx->filter_trigger) {
+		/* TODO: supported on the DSO-2090? */
+		sr_dbg("hantek-dso: turning on trigger filter");
 		cmdstring[2] |= 0x20;
+	}
 
 	if (send_begin(ctx) != SR_OK)
 		return SR_ERR;
@@ -342,6 +367,7 @@ SR_PRIV int dso_set_filters(struct context *ctx)
 		sr_err("Failed to set filters: %d", ret);
 		return SR_ERR;
 	}
+	sr_dbg("hantek-dso: sent CMD_SET_FILTERS");
 
 	return SR_OK;
 }
@@ -351,15 +377,52 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
 	int ret, tmp;
 	uint8_t cmdstring[8];
 
-	sr_dbg("hantek-dso: sending CMD_SET_VOLTAGE");
+	sr_dbg("hantek-dso: preparing CMD_SET_VOLTAGE");
 
 	memset(cmdstring, 0, sizeof(cmdstring));
 	cmdstring[0] = CMD_SET_VOLTAGE;
 	cmdstring[1] = 0x0f;
-	cmdstring[2] = 0x03;
-	cmdstring[2] |= ((2 - ctx->voltage_ch1 % 3) << 6);
-	cmdstring[2] |= ((2 - ctx->voltage_ch2 % 3) << 4);
-cmdstring[2] = 0x30;
+	cmdstring[2] = 0x30;
+
+	/* CH1 volts/div is encoded in bits 0-1 */
+	sr_dbg("hantek-dso: CH1 vdiv index %d", ctx->voltage_ch1);
+	switch (ctx->voltage_ch1) {
+	case VDIV_1V:
+	case VDIV_100MV:
+	case VDIV_10MV:
+		cmdstring[2] |= 0x00;
+		break;
+	case VDIV_2V:
+	case VDIV_200MV:
+	case VDIV_20MV:
+		cmdstring[2] |= 0x01;
+		break;
+	case VDIV_5V:
+	case VDIV_500MV:
+	case VDIV_50MV:
+		cmdstring[2] |= 0x02;
+		break;
+	}
+
+	/* CH2 volts/div is encoded in bits 2-3 */
+	sr_dbg("hantek-dso: CH2 vdiv index %d", ctx->voltage_ch2);
+	switch (ctx->voltage_ch2) {
+	case VDIV_1V:
+	case VDIV_100MV:
+	case VDIV_10MV:
+		cmdstring[2] |= 0x00;
+		break;
+	case VDIV_2V:
+	case VDIV_200MV:
+	case VDIV_20MV:
+		cmdstring[2] |= 0x08;
+		break;
+	case VDIV_5V:
+	case VDIV_500MV:
+	case VDIV_50MV:
+		cmdstring[2] |= 0x04;
+		break;
+	}
 
 	if (send_begin(ctx) != SR_OK)
 		return SR_ERR;
@@ -371,6 +434,7 @@ cmdstring[2] = 0x30;
 		sr_err("Failed to set voltage: %d", ret);
 		return SR_ERR;
 	}
+	sr_dbg("hantek-dso: sent CMD_SET_VOLTAGE");
 
 	return SR_OK;
 }
@@ -381,17 +445,18 @@ SR_PRIV int dso_set_relays(struct context *ctx)
 	uint8_t relays[] = { 0x00, 0x04, 0x08, 0x02, 0x20, 0x40, 0x10, 0x01,
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
-	sr_dbg("hantek-dso: sending CTRL_SETRELAYS");
+	sr_dbg("hantek-dso: preparing CTRL_SETRELAYS");
 
 	cv1 = ctx->voltage_ch1 / 3;
 	cv2 = ctx->voltage_ch2 / 3;
-relays[0] = 0x01;
+
 	if (cv1 > 0)
 		relays[1] = ~relays[1];
 
 	if (cv1 > 1)
 		relays[2] = ~relays[2];
 
+	sr_dbg("hantek-dso: CH1 coupling %d", ctx->coupling_ch1);
 	if (ctx->coupling_ch1 != COUPLING_AC)
 		relays[3] = ~relays[3];
 
@@ -401,10 +466,11 @@ relays[0] = 0x01;
 	if (cv2 > 1)
 		relays[5] = ~relays[5];
 
+	sr_dbg("hantek-dso: CH2 coupling %d", ctx->coupling_ch1);
 	if (ctx->coupling_ch2 != COUPLING_AC)
 		relays[6] = ~relays[6];
 
-	if (ctx->triggersource == TRIGGER_EXT)
+	if (!strcmp(ctx->triggersource, "EXT"))
 		relays[7] = ~relays[7];
 
 	if ((ret = libusb_control_transfer(ctx->usb->devhdl,
@@ -413,6 +479,7 @@ relays[0] = 0x01;
 		sr_err("failed to set relays: %d", ret);
 		return SR_ERR;
 	}
+	sr_dbg("hantek-dso: sent CTRL_SETRELAYS");
 
 	return SR_OK;
 }
@@ -533,9 +600,6 @@ SR_PRIV int dso_init(struct context *ctx)
 	if (dso_enable_trigger(ctx) != SR_OK)
 		return SR_ERR;
 
-	if (dso_force_trigger(ctx) != SR_OK)
-		return SR_ERR;
-
 	return SR_OK;
 }