X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fdso.c;h=77cad923e1554ce514423d2eabfe2641ac556544;hb=10e5cbede89976eeed3237d985da065238962dfe;hp=00dde6da1f14693aa68c554ad8881a7772a5317a;hpb=313deed219c39a902e6b7c39cf519c3476b9798d;p=libsigrok.git
diff --git a/hardware/hantek-dso/dso.c b/hardware/hantek-dso/dso.c
index 00dde6da..77cad923 100644
--- a/hardware/hantek-dso/dso.c
+++ b/hardware/hantek-dso/dso.c
@@ -19,8 +19,8 @@
* along with this program. If not, see .
*/
-#include "sigrok.h"
-#include "sigrok-internal.h"
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
#include "config.h"
#include "dso.h"
#include
@@ -200,7 +200,8 @@ SR_PRIV void dso_close(struct sr_dev_inst *sdi)
static int get_channel_offsets(struct context *ctx)
{
- int ret;
+ GString *gs;
+ int chan, v, ret;
sr_dbg("hantek-dso: getting channel offsets");
@@ -214,6 +215,32 @@ static int get_channel_offsets(struct context *ctx)
return SR_ERR;
}
+ /* Comes in as 16-bit numbers with the second byte always 0 on
+ * the DSO-2090. Guessing this is supposed to be big-endian,
+ * since that's how voltage offsets are submitted back to the DSO.
+ * Convert to host order now, so we can use them natively.
+ */
+ for (chan = 0; chan < 2; chan++) {
+ for (v = 0; v < 9; v++) {
+ ctx->channel_levels[chan][v][0] = g_ntohs(ctx->channel_levels[chan][v][0]);
+ ctx->channel_levels[chan][v][1] = g_ntohs(ctx->channel_levels[chan][v][1]);
+ }
+ }
+
+ if (sr_log_loglevel_get() >= SR_LOG_DBG) {
+ gs = g_string_sized_new(128);
+ for (chan = 0; chan < 2; chan++) {
+ g_string_printf(gs, "hantek-dso: CH%d:", chan + 1);
+ for (v = 0; v < 9; v++) {
+ g_string_append_printf(gs, " %.4x-%.4x",
+ ctx->channel_levels[chan][v][0],
+ ctx->channel_levels[chan][v][1]);
+ }
+ sr_dbg(gs->str);
+ }
+ g_string_free(gs, TRUE);
+ }
+
return SR_OK;
}
@@ -415,12 +442,12 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
case VDIV_2V:
case VDIV_200MV:
case VDIV_20MV:
- cmdstring[2] |= 0x08;
+ cmdstring[2] |= 0x04;
break;
case VDIV_5V:
case VDIV_500MV:
case VDIV_50MV:
- cmdstring[2] |= 0x04;
+ cmdstring[2] |= 0x08;
break;
}
@@ -441,42 +468,52 @@ SR_PRIV int dso_set_voltage(struct context *ctx)
SR_PRIV int dso_set_relays(struct context *ctx)
{
- int ret, cv1, cv2;
- uint8_t relays[] = { 0x00, 0x04, 0x08, 0x02, 0x20, 0x40, 0x10, 0x01,
+ GString *gs;
+ int ret, i;
+ uint8_t relays[17] = { 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)
+ if (ctx->voltage_ch1 < VDIV_1V)
relays[1] = ~relays[1];
- if (cv1 > 1)
+ if (ctx->voltage_ch1 < VDIV_100MV)
relays[2] = ~relays[2];
+ sr_dbg("hantek-dso: CH1 coupling %d", ctx->coupling_ch1);
if (ctx->coupling_ch1 != COUPLING_AC)
relays[3] = ~relays[3];
- if (cv2 > 0)
+ if (ctx->voltage_ch2 < VDIV_1V)
relays[4] = ~relays[4];
- if (cv2 > 1)
+ if (ctx->voltage_ch2 < VDIV_100MV)
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 (!strcmp(ctx->triggersource, "EXT"))
relays[7] = ~relays[7];
+ if (sr_log_loglevel_get() >= SR_LOG_DBG) {
+ gs = g_string_sized_new(128);
+ g_string_printf(gs, "hantek-dso: relays:");
+ for (i = 0; i < 17; i++)
+ g_string_append_printf(gs, " %.2x", relays[i]);
+ sr_dbg(gs->str);
+ g_string_free(gs, TRUE);
+ }
+
if ((ret = libusb_control_transfer(ctx->usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETRELAYS,
- 0, 0, relays, sizeof(relays), 100)) != sizeof(relays)) {
+ 0, 0, relays, 17, 100)) != sizeof(relays)) {
sr_err("failed to set relays: %d", ret);
return SR_ERR;
}
+ sr_dbg("hantek-dso: sent CTRL_SETRELAYS");
return SR_OK;
}
@@ -485,31 +522,33 @@ SR_PRIV int dso_set_voffsets(struct context *ctx)
{
int offset, ret;
uint16_t *ch_levels;
-// uint8_t offsets[17];
-uint8_t offsets[] = {0x20,0x75,0x30,0x3f,0x20,0xbd,0x3f,0x02,0x20,0x00,0x71,0x01,0x2e,0x0b,0x3f,0x02,0x50};
-//uint8_t offsets[] = {0xff, 0x75, 0x30, 0x3f, 0x20, 0xbd,
-// 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-//};
-
- sr_dbg("hantek-dso: sending CTRL_SETOFFSET");
-
-// memset(offsets, 0, sizeof(offsets));
-// /* Channel 1 */
-// ch_levels = ctx->channel_levels[0][VOLTAGE_10mV - ctx->voltage_ch1];
-// offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch1 + ch_levels[0];
-// offsets[0] = (offset >> 8) | 0x20;
-// offsets[1] = offset & 0xff;
-//
-// /* Channel 2 */
-// ch_levels = ctx->channel_levels[1][VOLTAGE_10mV - ctx->voltage_ch2];
-// offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch2 + ch_levels[0];
-// offsets[2] = (offset >> 8) | 0x20;
-// offsets[3] = offset & 0xff;
-//
-// /* Trigger */
-// offset = MAX_VERT_TRIGGER * ctx->voffset_trigger;
-// offsets[4] = (offset >> 8) | 0x20;
-// offsets[5] = offset & 0xff;
+ uint8_t offsets[17];
+
+ sr_dbg("hantek-dso: preparing CTRL_SETOFFSET");
+
+ memset(offsets, 0, sizeof(offsets));
+ /* Channel 1 */
+ ch_levels = ctx->channel_levels[0][ctx->voltage_ch1];
+ offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch1 + ch_levels[0];
+ offsets[0] = (offset >> 8) | 0x20;
+ offsets[1] = offset & 0xff;
+ sr_dbg("hantek-dso: CH1 offset %3.2f (%.2x%.2x)", ctx->voffset_ch1,
+ offsets[0], offsets[1]);
+
+ /* Channel 2 */
+ ch_levels = ctx->channel_levels[1][ctx->voltage_ch2];
+ offset = (ch_levels[1] - ch_levels[0]) * ctx->voffset_ch2 + ch_levels[0];
+ offsets[2] = (offset >> 8) | 0x20;
+ offsets[3] = offset & 0xff;
+ sr_dbg("hantek-dso: CH2 offset %3.2f (%.2x%.2x)", ctx->voffset_ch2,
+ offsets[2], offsets[3]);
+
+ /* Trigger */
+ offset = MAX_VERT_TRIGGER * ctx->voffset_trigger;
+ offsets[4] = (offset >> 8) | 0x20;
+ offsets[5] = offset & 0xff;
+ sr_dbg("hantek-dso: trigger offset %3.2f (%.2x%.2x)", ctx->voffset_trigger,
+ offsets[4], offsets[5]);
if ((ret = libusb_control_transfer(ctx->usb->devhdl,
LIBUSB_REQUEST_TYPE_VENDOR, CTRL_SETOFFSET,
@@ -517,6 +556,7 @@ uint8_t offsets[] = {0x20,0x75,0x30,0x3f,0x20,0xbd,0x3f,0x02,0x20,0x00,0x71,0x01
sr_err("failed to set offsets: %d", ret);
return SR_ERR;
}
+ sr_dbg("hantek-dso: sent CTRL_SETOFFSET");
return SR_OK;
}
@@ -600,9 +640,11 @@ SR_PRIV int dso_init(struct context *ctx)
return SR_OK;
}
-SR_PRIV uint8_t dso_get_capturestate(struct context *ctx)
+SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
+ uint32_t *trigger_offset)
{
- int ret, tmp;
+ int ret, tmp, i;
+ unsigned int bitvalue, toff;
uint8_t cmdstring[2], inbuf[512];
sr_dbg("hantek-dso: sending CMD_GET_CAPTURESTATE");
@@ -612,20 +654,35 @@ SR_PRIV uint8_t dso_get_capturestate(struct context *ctx)
if ((ret = send_bulkcmd(ctx, cmdstring, sizeof(cmdstring))) != SR_OK) {
sr_dbg("Failed to send get_capturestate command: %d", ret);
- return CAPTURE_UNKNOWN;
+ return SR_ERR;
}
if ((ret = libusb_bulk_transfer(ctx->usb->devhdl,
DSO_EP_IN | LIBUSB_ENDPOINT_IN,
inbuf, 512, &tmp, 100)) != 0) {
sr_dbg("Failed to get capturestate: %d", ret);
- return CAPTURE_UNKNOWN;
+ return SR_ERR;
}
+ *capturestate = inbuf[0];
+ toff = (inbuf[1] << 16) | (inbuf[3] << 8) | inbuf[2];
+
+ /* This conversion comes from the openhantek project.
+ * Each set bit in the 24-bit value inverts all bits with a lower
+ * value. No idea why the device reports the trigger point this way.
+ */
+ bitvalue = 1;
+ for (i = 0; i < 24; i++) {
+ /* Each set bit inverts all bits with a lower value. */
+ if(toff & bitvalue)
+ toff ^= bitvalue - 1;
+ bitvalue <<= 1;
+ }
+ *trigger_offset = toff;
- return inbuf[0];
+ return SR_OK;
}
-SR_PRIV uint8_t dso_capture_start(struct context *ctx)
+SR_PRIV int dso_capture_start(struct context *ctx)
{
int ret;
uint8_t cmdstring[2];