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

hantek-dso: Capture ratio is a uint64_t. 

From src/hwdriver.c:

  {SR_CONF_CAPTURE_RATIO, SR_T_UINT64, "captureratio",
          "Pre-trigger capture ratio", NULL},
This commit is contained in:
Uwe Hermann 2018-01-10 22:20:45 +01:00
parent 04069272b4
commit d3f14af7ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hardware/hantek-dso/protocol.c
View File

@ -373,7 +373,7 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi)
memset(cmdstring, 0, sizeof(cmdstring)); memset(cmdstring, 0, sizeof(cmdstring));
cmdstring[0] = CMD_2250_SET_TRIGGERPOS_AND_BUFFER; cmdstring[0] = CMD_2250_SET_TRIGGERPOS_AND_BUFFER;
sr_dbg("Capture ratio: %d.", devc->capture_ratio); sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio);
trig = devc->capture_ratio; trig = devc->capture_ratio;
dso2250_set_triggerpos(trig, dso2250_set_triggerpos(trig,
devc->framesize != FRAMESIZE_SMALL, cmdstring, 2); devc->framesize != FRAMESIZE_SMALL, cmdstring, 2);
@ -494,7 +494,7 @@ SR_PRIV int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
cmdstring[5] = (tmp >> 8) & 0xff; cmdstring[5] = (tmp >> 8) & 0xff;
/* Horizontal trigger position */ /* Horizontal trigger position */
sr_dbg("Capture ratio: %d.", devc->capture_ratio); sr_dbg("Capture ratio: %" PRIu64 ".", devc->capture_ratio);
tmp = 0x77fff + 0x8000 * devc->capture_ratio / 100; tmp = 0x77fff + 0x8000 * devc->capture_ratio / 100;
cmdstring[6] = tmp & 0xff; cmdstring[6] = tmp & 0xff;
cmdstring[7] = (tmp >> 8) & 0xff; cmdstring[7] = (tmp >> 8) & 0xff;

2
src/hardware/hantek-dso/protocol.h
View File

@ -204,7 +204,7 @@ struct dev_context {
gboolean filter[2]; gboolean filter[2];
int triggerslope; int triggerslope;
char *triggersource; char *triggersource;
int capture_ratio; uint64_t capture_ratio;
int triggermode; int triggermode;
/* Frame transfer */ /* Frame transfer */