SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_NUM_HDIV | SR_CONF_GET,
- SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_NUM_VDIV | SR_CONF_GET,
};
{ 400, 1000 },
};
+static const uint64_t samplerates[] = {
+ SR_KHZ(20),
+ SR_KHZ(25),
+ SR_KHZ(50),
+ SR_KHZ(100),
+ SR_KHZ(200),
+ SR_KHZ(250),
+ SR_KHZ(500),
+ SR_MHZ(1),
+ SR_MHZ(2),
+ SR_MHZ(5),
+ SR_MHZ(10),
+ SR_MHZ(20),
+ SR_MHZ(25),
+ SR_MHZ(50),
+ SR_MHZ(100),
+ SR_MHZ(125),
+ /* fast mode not supported yet
+ SR_MHZ(200),
+ SR_MHZ(250), */
+};
+
static const uint64_t vdivs[][2] = {
/* millivolts */
{ 10, 1000 },
devc->profile = prof;
devc->dev_state = IDLE;
devc->timebase = DEFAULT_TIMEBASE;
+ devc->samplerate = DEFAULT_SAMPLERATE;
devc->ch_enabled[0] = TRUE;
devc->ch_enabled[1] = TRUE;
devc->voltage[0] = DEFAULT_VOLTAGE;
devc->framesize = DEFAULT_FRAMESIZE;
devc->triggerslope = SLOPE_POSITIVE;
devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
- devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
+ devc->capture_ratio = DEFAULT_CAPTURE_RATIO;
sdi->priv = devc;
return sdi;
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- char str[128];
const char *s;
const uint64_t *vdiv;
int ch_idx;
/* Device still needs to re-enumerate after firmware
* upload, so we don't know its (future) address. */
return SR_ERR;
- snprintf(str, 128, "%d.%d", usb->bus, usb->address);
- *data = g_variant_new_string(str);
+ *data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
break;
case SR_CONF_TIMEBASE:
*data = g_variant_new("(tt)", timebases[devc->timebase][0],
timebases[devc->timebase][1]);
break;
+ case SR_CONF_SAMPLERATE:
+ *data = g_variant_new_uint64(devc->samplerate);
+ break;
case SR_CONF_BUFFERSIZE:
*data = g_variant_new_uint64(devc->framesize);
break;
s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
*data = g_variant_new_string(s);
break;
- case SR_CONF_HORIZ_TRIGGERPOS:
- *data = g_variant_new_double(devc->triggerposition);
+ case SR_CONF_CAPTURE_RATIO:
+ *data = g_variant_new_uint64(devc->capture_ratio);
break;
default:
return SR_ERR_NA;
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
- double tmp_double;
- uint64_t tmp_u64, p, q;
- int tmp_int, ch_idx;
- unsigned int i;
- const char *tmp_str;
+ int rat;
+ int ch_idx, idx;
devc = sdi->priv;
if (!cg) {
devc->limit_frames = g_variant_get_uint64(data);
break;
case SR_CONF_TRIGGER_SLOPE:
- tmp_str = g_variant_get_string(data, NULL);
- if (!tmp_str || !(tmp_str[0] == 'f' || tmp_str[0] == 'r'))
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG;
- devc->triggerslope = (tmp_str[0] == 'r')
- ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+ devc->triggerslope = idx;
break;
- case SR_CONF_HORIZ_TRIGGERPOS:
- tmp_double = g_variant_get_double(data);
- if (tmp_double < 0.0 || tmp_double > 1.0) {
- sr_err("Trigger position should be between 0.0 and 1.0.");
+ case SR_CONF_CAPTURE_RATIO:
+ rat = g_variant_get_uint64(data);
+ if (rat < 0 || rat > 100) {
+ sr_err("Capture ratio must be in [0,100].");
return SR_ERR_ARG;
} else
- devc->triggerposition = tmp_double;
+ devc->capture_ratio = rat;
break;
case SR_CONF_BUFFERSIZE:
- tmp_u64 = g_variant_get_uint64(data);
- for (i = 0; i < NUM_BUFFER_SIZES; i++) {
- if (devc->profile->buffersizes[i] == tmp_u64) {
- devc->framesize = tmp_u64;
- break;
- }
- }
- if (i == NUM_BUFFER_SIZES)
+ if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0)
return SR_ERR_ARG;
+ devc->framesize = devc->profile->buffersizes[idx];
break;
case SR_CONF_TIMEBASE:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(timebases); i++) {
- if (timebases[i][0] == p && timebases[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0)
- devc->timebase = tmp_int;
- else
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(timebases))) < 0)
return SR_ERR_ARG;
+ devc->timebase = idx;
+ break;
+ case SR_CONF_SAMPLERATE:
+ if ((idx = std_u64_idx(data, ARRAY_AND_SIZE(samplerates))) < 0)
+ return SR_ERR_ARG;
+ devc->samplerate = samplerates[idx];
+ if (dso_set_trigger_samplerate(sdi) != SR_OK)
+ return SR_ERR;
+ sr_dbg("got new sample rate %d, idx %d", devc->samplerate, idx);
break;
case SR_CONF_TRIGGER_SOURCE:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; trigger_sources[i]; i++) {
- if (!strcmp(tmp_str, trigger_sources[i])) {
- devc->triggersource = g_strdup(tmp_str);
- break;
- }
- }
- if (trigger_sources[i] == 0)
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0)
return SR_ERR_ARG;
+ devc->triggersource = g_strdup(trigger_sources[idx]);
break;
default:
return SR_ERR_NA;
devc->filter[ch_idx] = g_variant_get_boolean(data);
break;
case SR_CONF_VDIV:
- g_variant_get(data, "(tt)", &p, &q);
- tmp_int = -1;
- for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
- if (vdivs[i][0] == p && vdivs[i][1] == q) {
- tmp_int = i;
- break;
- }
- }
- if (tmp_int >= 0) {
- devc->voltage[ch_idx] = tmp_int;
- } else
+ if ((idx = std_u64_tuple_idx(data, ARRAY_AND_SIZE(vdivs))) < 0)
return SR_ERR_ARG;
+ devc->voltage[ch_idx] = idx;
break;
case SR_CONF_COUPLING:
- tmp_str = g_variant_get_string(data, NULL);
- for (i = 0; coupling[i]; i++) {
- if (!strcmp(tmp_str, coupling[i])) {
- devc->coupling[ch_idx] = i;
- break;
- }
- }
- if (coupling[i] == 0)
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(coupling))) < 0)
return SR_ERR_ARG;
+ devc->coupling[ch_idx] = idx;
break;
default:
return SR_ERR_NA;
devc = sdi->priv;
*data = std_gvar_array_u64(devc->profile->buffersizes, NUM_BUFFER_SIZES);
break;
+ case SR_CONF_SAMPLERATE:
+ *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
+ break;
case SR_CONF_TIMEBASE:
*data = std_gvar_tuple_array(ARRAY_AND_SIZE(timebases));
break;
/* TODO: Check malloc return value. */
analog.data = g_try_malloc(num_samples * sizeof(float));
- for (int ch = 0; ch < 2; ch++) {
+ for (int ch = 0; ch < NUM_CHANNELS; ch++) {
if (!devc->ch_enabled[ch])
continue;
/* No data yet. */
break;
case CAPTURE_READY_8BIT:
+ case CAPTURE_READY2250:
/* Remember where in the captured frame the trigger is. */
devc->trigger_offset = trigger_offset;