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,
+ SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET,
};
static const uint32_t devopts_cg[] = {
{ 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;
devc = sdi->priv;
g_slist_free(devc->enabled_channels);
+ devc->enabled_channels = NULL;
devc->ch_enabled[0] = devc->ch_enabled[1] = FALSE;
for (l = sdi->channels, p = 0; l; l = l->next, p++) {
ch = l->data;
libusb_get_device_descriptor(devlist[i], &des);
- usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+ if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+ continue;
prof = NULL;
for (j = 0; dev_profiles[j].orig_vid; j++) {
devices = g_slist_append(devices, sdi);
devc = sdi->priv;
if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
- USB_CONFIGURATION, prof->firmware) == SR_OK)
+ USB_CONFIGURATION, prof->firmware) == SR_OK) {
/* Remember when the firmware on this device was updated */
devc->fw_updated = g_get_monotonic_time();
- else
- sr_err("Firmware upload failed");
+ } else {
+ sr_err("Firmware upload failed, name %s", prof->firmware);
+ }
/* Dummy USB address of 0xff will get overwritten later. */
sdi->conn = sr_usb_dev_inst_new(
libusb_get_bus_number(devlist[i]), 0xff, NULL);
return SR_OK;
}
-static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_get(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
- char str[128];
const char *s;
const uint64_t *vdiv;
int ch_idx;
devc = sdi->priv;
if (!cg) {
switch (key) {
+ case SR_CONF_TRIGGER_LEVEL:
+ *data = g_variant_new_double(devc->voffset_trigger);
+ break;
case SR_CONF_CONN:
if (!sdi->conn)
return SR_ERR_ARG;
/* 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;
return SR_OK;
}
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+ 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 ch_idx, idx;
+ float flt;
devc = sdi->priv;
if (!cg) {
case SR_CONF_LIMIT_FRAMES:
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'))
+ case SR_CONF_TRIGGER_LEVEL:
+ flt = g_variant_get_double(data);
+ if (flt < 0.0 || flt > 1.0) {
+ sr_err("Trigger level must be in [0.0,1.0].");
return SR_ERR_ARG;
- devc->triggerslope = (tmp_str[0] == 'r')
- ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+ }
+ devc->voffset_trigger = flt;
+ if (dso_set_voffsets(sdi) != SR_OK)
+ return SR_ERR;
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_TRIGGER_SLOPE:
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG;
- } else
- devc->triggerposition = tmp_double;
+ devc->triggerslope = idx;
+ break;
+ case SR_CONF_CAPTURE_RATIO:
+ devc->capture_ratio = g_variant_get_uint64(data);
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;
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;
return SR_OK;
}
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+ const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
struct dev_context *devc;
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;
sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
devc->samp_buffered);
send_chunk(sdi, devc->framebuf, devc->samp_buffered);
+ g_free(devc->framebuf);
+ devc->framebuf = NULL;
/* Mark the end of this frame. */
packet.type = SR_DF_FRAME_END;
sr_session_send(sdi, &packet);
- if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) {
+ if (devc->limit_frames && ++devc->num_frames >= devc->limit_frames) {
/* Terminate session */
devc->dev_state = STOPPING;
} else {
/* No data yet. */
break;
case CAPTURE_READY_8BIT:
+ case CAPTURE_READY_2250:
/* Remember where in the captured frame the trigger is. */
devc->trigger_offset = trigger_offset;
devc = sdi->priv;
devc->dev_state = STOPPING;
+ devc->num_frames = 0;
return SR_OK;
}
projects / libsigrok.git / blobdiff