BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hantek-dso: fix triggerpoint conversion

This commit is contained in:
Bert Vermeulen 2012-06-24 18:57:37 +02:00
parent f3ab43a8fb
commit e05a174be2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hardware/hantek-dso/dso.c
View File

@ -643,7 +643,8 @@ SR_PRIV int dso_init(struct context *ctx)
SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate, SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
uint32_t *trigger_offset) uint32_t *trigger_offset)
{ {
int ret, tmp; int ret, tmp, i;
unsigned int bitvalue, toff;
uint8_t cmdstring[2], inbuf[512]; uint8_t cmdstring[2], inbuf[512];
sr_dbg("hantek-dso: sending CMD_GET_CAPTURESTATE"); sr_dbg("hantek-dso: sending CMD_GET_CAPTURESTATE");
@ -663,7 +664,20 @@ SR_PRIV int dso_get_capturestate(struct context *ctx, uint8_t *capturestate,
return SR_ERR; return SR_ERR;
} }
*capturestate = inbuf[0]; *capturestate = inbuf[0];
*trigger_offset = (inbuf[1] << 16) | (inbuf[3] << 8) | inbuf[2]; 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 SR_OK; return SR_OK;
} }