X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=bfad5f7135f07750901e04a9fda5eb4fe1a87fbd;hp=cdc4360e9a40b440099ae86e7ada37b46b63edcf;hb=HEAD;hpb=697fb6ddfc2522b2e6d35511c7837e2c61d8ae73 diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c index cdc4360e..bfad5f71 100644 --- a/src/hardware/hantek-dso/api.c +++ b/src/hardware/hantek-dso/api.c @@ -55,14 +55,16 @@ static const uint32_t drvopts[] = { static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_CONN | SR_CONF_GET, - SR_CONF_LIMIT_FRAMES | SR_CONF_SET, + SR_CONF_LIMIT_FRAMES | SR_CONF_GET | 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[] = { @@ -129,6 +131,28 @@ static const uint64_t timebases[][2] = { { 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 }, @@ -145,7 +169,6 @@ static const uint64_t vdivs[][2] = { static const char *trigger_sources[] = { "CH1", "CH2", "EXT", - /* TODO: forced */ }; static const char *trigger_slopes[] = { @@ -175,16 +198,15 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) */ for (i = 0; i < ARRAY_SIZE(channel_names); i++) { ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]); - cg = g_malloc0(sizeof(struct sr_channel_group)); - cg->name = g_strdup(channel_names[i]); + cg = sr_channel_group_new(sdi, channel_names[i], NULL); cg->channels = g_slist_append(cg->channels, ch); - sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); } devc = g_malloc0(sizeof(struct dev_context)); 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; @@ -196,8 +218,8 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof) devc->voffset_trigger = DEFAULT_VERT_TRIGGERPOS; devc->framesize = DEFAULT_FRAMESIZE; devc->triggerslope = SLOPE_POSITIVE; - devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE); - devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS; + devc->triggersource = NULL; + devc->capture_ratio = DEFAULT_CAPTURE_RATIO; sdi->priv = devc; return sdi; @@ -213,6 +235,7 @@ static int configure_channels(const struct sr_dev_inst *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; @@ -289,7 +312,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) 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++) { @@ -303,11 +327,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) 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); @@ -416,6 +441,9 @@ static int config_get(uint32_t key, GVariant **data, 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; @@ -430,18 +458,26 @@ static int config_get(uint32_t key, GVariant **data, *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; case SR_CONF_TRIGGER_SOURCE: + if (!devc->triggersource) + return SR_ERR_NA; *data = g_variant_new_string(devc->triggersource); break; case SR_CONF_TRIGGER_SLOPE: 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; + case SR_CONF_LIMIT_FRAMES: + *data = g_variant_new_uint64(devc->limit_frames); break; default: return SR_ERR_NA; @@ -474,8 +510,8 @@ 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; int ch_idx, idx; + float flt; devc = sdi->priv; if (!cg) { @@ -483,19 +519,23 @@ static int config_set(uint32_t key, GVariant *data, case SR_CONF_LIMIT_FRAMES: devc->limit_frames = g_variant_get_uint64(data); break; + 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->voffset_trigger = flt; + if (dso_set_voffsets(sdi) != SR_OK) + return SR_ERR; + break; case SR_CONF_TRIGGER_SLOPE: if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0) return SR_ERR_ARG; - devc->triggerslope = (trigger_slopes[idx][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."); - return SR_ERR_ARG; - } else - devc->triggerposition = tmp_double; + case SR_CONF_CAPTURE_RATIO: + devc->capture_ratio = g_variant_get_uint64(data); break; case SR_CONF_BUFFERSIZE: if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0) @@ -507,9 +547,17 @@ static int config_set(uint32_t key, GVariant *data, 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: if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_sources))) < 0) return SR_ERR_ARG; + g_free(devc->triggersource); devc->triggersource = g_strdup(trigger_sources[idx]); break; default: @@ -560,6 +608,9 @@ static int config_list(uint32_t key, GVariant **data, 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; @@ -613,7 +664,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, /* 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; @@ -656,7 +707,6 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, */ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) { - struct sr_datafeed_packet packet; struct sr_dev_inst *sdi; struct dev_context *devc; int num_samples, pre; @@ -730,12 +780,13 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) 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); + std_session_send_df_frame_end(sdi); - 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 { @@ -747,7 +798,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) static int handle_event(int fd, int revents, void *cb_data) { const struct sr_dev_inst *sdi; - struct sr_datafeed_packet packet; struct timeval tv; struct sr_dev_driver *di; struct dev_context *devc; @@ -789,8 +839,10 @@ static int handle_event(int fd, int revents, void *cb_data) return TRUE; if (dso_enable_trigger(sdi) != SR_OK) return TRUE; -// if (dso_force_trigger(sdi) != SR_OK) -// return TRUE; + if (!devc->triggersource) { + if (dso_force_trigger(sdi) != SR_OK) + return TRUE; + } sr_dbg("Successfully requested next chunk."); devc->dev_state = CAPTURE; return TRUE; @@ -811,8 +863,10 @@ static int handle_event(int fd, int revents, void *cb_data) break; if (dso_enable_trigger(sdi) != SR_OK) break; -// if (dso_force_trigger(sdi) != SR_OK) -// break; + if (!devc->triggersource) { + if (dso_force_trigger(sdi) != SR_OK) + break; + } sr_dbg("Successfully requested next chunk."); } break; @@ -820,6 +874,7 @@ static int handle_event(int fd, int revents, void *cb_data) /* 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; @@ -838,8 +893,7 @@ static int handle_event(int fd, int revents, void *cb_data) devc->dev_state = FETCH_DATA; /* Tell the frontend a new frame is on the way. */ - packet.type = SR_DF_FRAME_BEGIN; - sr_session_send(sdi, &packet); + std_session_send_df_frame_begin(sdi); break; case CAPTURE_READY_9BIT: /* TODO */ @@ -889,6 +943,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) devc = sdi->priv; devc->dev_state = STOPPING; + devc->num_frames = 0; return SR_OK; }