static const char *scope_trigger_slopes[] = {
"POS",
"NEG",
+ "EITH",
NULL,
};
"CH2",
"LINE",
"EXT",
+ "PATT",
+ "BUS1",
+ "BUS2",
"D0",
"D1",
"D2",
"CH4",
"LINE",
"EXT",
+ "PATT",
+ "BUS1",
+ "BUS2",
"D0",
"D1",
"D2",
static const struct scope_config scope_models[] = {
{
/* HMO2522/3032/3042/3052 support 16 digital channels but they're not supported yet. */
- .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
+ .name = {"HMO1002", "HMO722", "HMO1022", "HMO1522", "HMO2022", "HMO2522",
"HMO3032", "HMO3042", "HMO3052", NULL},
.analog_channels = 2,
.digital_channels = 8,
struct sr_datafeed_logic logic;
(void)fd;
+ (void)revents;
data = NULL;
if (!(devc = sdi->priv))
return TRUE;
+ /* Although this is correct in general, the USBTMC libusb implementation
+ * currently does not generate an event prior to the first read. Often
+ * it is ok to start reading just after the 50ms timeout. See bug #785.
if (revents != G_IO_IN)
return TRUE;
+ */
ch = devc->current_channel->data;
analog.mqflags = 0;
packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_slist_free(analog.channels);
g_array_free(data, TRUE);
data = NULL;
logic.data = data->data;
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- sr_session_send(cb_data, &packet);
+ sr_session_send(sdi, &packet);
g_array_free(data, TRUE);
data = NULL;
break;
devc->current_channel = devc->current_channel->next;
hmo_request_data(sdi);
} else if (++devc->num_frames == devc->frame_limit) {
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ sdi->driver->dev_acquisition_stop(sdi);
} else {
devc->current_channel = devc->enabled_channels;
hmo_request_data(sdi);