static const uint32_t devopts[] = {
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
- SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
SR_CONF_CONN | SR_CONF_GET,
- SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_EXTERNAL_CLOCK_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const uint32_t devopts_fpga_zero[] = {
+ SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
+ SR_CONF_CONN | SR_CONF_GET,
+};
+
+static const uint32_t devopts_cg[] = {
+ SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+};
+
+static const char *signal_edges[] = {
+ [H4032L_CLOCK_EDGE_TYPE_RISE] = "rising",
+ [H4032L_CLOCK_EDGE_TYPE_FALL] = "falling",
+ [H4032L_CLOCK_EDGE_TYPE_BOTH] = "both",
+};
+
+static const char *ext_clock_sources[] = {
+ [H4032L_EXT_CLOCK_SOURCE_CHANNEL_A] = "ACLK",
+ [H4032L_EXT_CLOCK_SOURCE_CHANNEL_B] = "BCLK"
+};
+
+static const uint8_t ext_clock_edges[2][3] = {
+ {
+ H4032L_CLOCK_EDGE_TYPE_RISE_A,
+ H4032L_CLOCK_EDGE_TYPE_FALL_A,
+ H4032L_CLOCK_EDGE_TYPE_BOTH_A
+ },
+ {
+ H4032L_CLOCK_EDGE_TYPE_RISE_B,
+ H4032L_CLOCK_EDGE_TYPE_FALL_B,
+ H4032L_CLOCK_EDGE_TYPE_BOTH_B
+ }
};
static const int32_t trigger_matches[] = {
struct sr_usb_dev_inst *usb = NULL;
for (l = conn_devices; l; l = l->next) {
usb = l->data;
- if (usb->bus == libusb_get_bus_number(devlist[i])
- && usb->address == libusb_get_device_address(devlist[i]))
+ if (usb->bus == libusb_get_bus_number(devlist[i]) &&
+ usb->address == libusb_get_device_address(devlist[i]))
break;
}
if (!l)
/* Initialize command packet. */
devc->cmd_pkt.magic = H4032L_CMD_PKT_MAGIC;
- devc->cmd_pkt.pwm_a = h4032l_voltage2pwm(2.5);
- devc->cmd_pkt.pwm_b = h4032l_voltage2pwm(2.5);
devc->cmd_pkt.sample_size = 16384;
- devc->cmd_pkt.pre_trigger_size = 1024;
+ devc->sample_rate = 0;
devc->status = H4032L_STATUS_IDLE;
devc->capture_ratio = 5;
+ devc->external_clock = FALSE;
+ devc->clock_edge = H4032L_CLOCK_EDGE_TYPE_RISE;
- devc->usb_transfer = libusb_alloc_transfer(0);
+ devc->cur_threshold[0] = 2.5;
+ devc->cur_threshold[1] = 2.5;
sdi->priv = devc;
devices = g_slist_append(devices, sdi);
return SR_ERR;
}
+ /* Get FPGA version. */
+ if ((ret = h4032l_get_fpga_version(sdi)) != SR_OK)
+ return ret;
+
return SR_OK;
}
{
struct dev_context *devc = sdi->priv;
struct sr_usb_dev_inst *usb;
-
- (void)cg;
+ unsigned int idx;
switch (key) {
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ if (cg) {
+ if (!strcmp(cg->name, "A"))
+ *data = std_gvar_tuple_double(
+ devc->cur_threshold[0], devc->cur_threshold[0]);
+ else if (!strcmp(cg->name, "B"))
+ *data = std_gvar_tuple_double(
+ devc->cur_threshold[1], devc->cur_threshold[1]);
+ else
+ return SR_ERR_CHANNEL_GROUP;
+ }
+ break;
case SR_CONF_SAMPLERATE:
- *data = g_variant_new_uint64(samplerates_hw[devc->cmd_pkt.sample_rate]);
+ *data = g_variant_new_uint64(samplerates_hw[devc->sample_rate]);
break;
case SR_CONF_CAPTURE_RATIO:
*data = g_variant_new_uint64(devc->capture_ratio);
case SR_CONF_LIMIT_SAMPLES:
*data = g_variant_new_uint64(devc->cmd_pkt.sample_size);
break;
+ case SR_CONF_EXTERNAL_CLOCK:
+ *data = g_variant_new_boolean(devc->external_clock);
+ break;
+ case SR_CONF_EXTERNAL_CLOCK_SOURCE:
+ idx = devc->external_clock_source;
+ if (idx >= ARRAY_SIZE(ext_clock_sources))
+ return SR_ERR_BUG;
+ *data = g_variant_new_string(ext_clock_sources[idx]);
+ break;
case SR_CONF_CONN:
if (!sdi || !(usb = sdi->conn))
return SR_ERR_ARG;
*data = g_variant_new_printf("%d.%d", usb->bus, usb->address);
break;
+ case SR_CONF_CLOCK_EDGE:
+ idx = devc->clock_edge;
+ if (idx >= ARRAY_SIZE(signal_edges))
+ return SR_ERR_BUG;
+ *data = g_variant_new_string(signal_edges[idx]);
+ break;
default:
return SR_ERR_NA;
}
{
struct dev_context *devc = sdi->priv;
struct h4032l_cmd_pkt *cmd_pkt = &devc->cmd_pkt;
-
- (void)cg;
+ int idx;
switch (key) {
case SR_CONF_SAMPLERATE: {
sr_err("Invalid sample rate.");
return SR_ERR_SAMPLERATE;
}
- cmd_pkt->sample_rate = i;
-
- return SR_OK;
+ devc->sample_rate = i;
+ break;
+ }
+ case SR_CONF_CAPTURE_RATIO: {
+ uint64_t capture_ratio = g_variant_get_uint64(data);
+ if (capture_ratio > 99) {
+ sr_err("Invalid capture ratio.");
+ return SR_ERR;
+ }
+ devc->capture_ratio = capture_ratio;
+ break;
}
- case SR_CONF_CAPTURE_RATIO:
- devc->capture_ratio = g_variant_get_uint64(data);
- return SR_OK;
case SR_CONF_LIMIT_SAMPLES: {
uint64_t number_samples = g_variant_get_uint64(data);
number_samples += 511;
number_samples &= 0xfffffe00;
- if (number_samples < 2048
- || number_samples > 64 * 1024 * 1024) {
+ if (number_samples < H4043L_NUM_SAMPLES_MIN ||
+ number_samples > H4032L_NUM_SAMPLES_MAX) {
sr_err("Invalid sample range 2k...64M: %"
PRIu64 ".", number_samples);
return SR_ERR;
}
cmd_pkt->sample_size = number_samples;
- return SR_OK;
+ break;
}
case SR_CONF_VOLTAGE_THRESHOLD: {
- double d1, d2;
- g_variant_get(data, "(dd)", &d1, &d2);
- devc->cmd_pkt.pwm_a = h4032l_voltage2pwm(d1);
- devc->cmd_pkt.pwm_b = h4032l_voltage2pwm(d2);
- return SR_OK;
+ double low, high;
+ g_variant_get(data, "(dd)", &low, &high);
+ double threshold = (low + high) / 2.0;
+ if (cg) {
+ if (!strcmp(cg->name, "A"))
+ devc->cur_threshold[0] = threshold;
+ else if (!strcmp(cg->name, "B"))
+ devc->cur_threshold[1] = threshold;
+ else
+ return SR_ERR_CHANNEL_GROUP;
+ }
+ break;
}
+ case SR_CONF_EXTERNAL_CLOCK:
+ devc->external_clock = g_variant_get_boolean(data);
+ break;
+ case SR_CONF_EXTERNAL_CLOCK_SOURCE:
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(ext_clock_sources))) < 0)
+ return SR_ERR_ARG;
+ devc->external_clock_source = idx;
+ break;
+ case SR_CONF_CLOCK_EDGE:
+ if ((idx = std_str_idx(data, ARRAY_AND_SIZE(signal_edges))) < 0)
+ return SR_ERR_ARG;
+ devc->clock_edge = idx;
+ break;
+ default:
+ return SR_ERR_NA;
}
- 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)
{
+
+ struct dev_context *devc = (sdi) ? sdi->priv : NULL;
+
switch (key) {
case SR_CONF_SCAN_OPTIONS:
case SR_CONF_DEVICE_OPTIONS:
+ if (cg) {
+ *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
+ break;
+ }
+ /* Disable external clock and edges for FPGA version 0. */
+ if (devc && (!devc->fpga_version))
+ return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts_fpga_zero);
return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
case SR_CONF_SAMPLERATE:
*data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
*data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches));
break;
case SR_CONF_VOLTAGE_THRESHOLD:
- *data = std_gvar_tuple_double(2.5, 2.5);
+ *data = std_gvar_min_max_step_thresholds(-6.0, 6.0, 0.1);
+ break;
+ case SR_CONF_LIMIT_SAMPLES:
+ *data = std_gvar_tuple_u64(H4043L_NUM_SAMPLES_MIN, H4032L_NUM_SAMPLES_MAX);
+ break;
+ case SR_CONF_CLOCK_EDGE:
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(signal_edges));
+ break;
+ case SR_CONF_EXTERNAL_CLOCK_SOURCE:
+ *data = g_variant_new_strv(ARRAY_AND_SIZE(ext_clock_sources));
break;
default:
return SR_ERR_NA;
struct sr_trigger *trigger = sr_session_trigger_get(sdi->session);
struct h4032l_cmd_pkt *cmd_pkt = &devc->cmd_pkt;
+ /* Initialize variables. */
devc->acq_aborted = FALSE;
+ devc->submitted_transfers = 0;
+ devc->sent_samples = 0;
/* Calculate packet ratio. */
cmd_pkt->pre_trigger_size = (cmd_pkt->sample_size * devc->capture_ratio) / 100;
+ devc->trigger_pos = cmd_pkt->pre_trigger_size;
+
+ /* Set clock edge, when external clock is enabled. */
+ if (devc->external_clock)
+ cmd_pkt->sample_rate = ext_clock_edges[devc->external_clock_source][devc->clock_edge];
+ else
+ cmd_pkt->sample_rate = devc->sample_rate;
+
+ /* Set pwm channel values. */
+ devc->cmd_pkt.pwm_a = h4032l_voltage2pwm(devc->cur_threshold[0]);
+ devc->cmd_pkt.pwm_b = h4032l_voltage2pwm(devc->cur_threshold[1]);
cmd_pkt->trig_flags.enable_trigger1 = 0;
cmd_pkt->trig_flags.enable_trigger2 = 0;
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- struct dev_context *devc = sdi->priv;
-
- devc->acq_aborted = TRUE;
- if (devc->usb_transfer)
- libusb_cancel_transfer(devc->usb_transfer);
-
- devc->status = H4032L_STATUS_IDLE;
-
- return SR_OK;
+ /* Stop capturing. */
+ return h4032l_stop(sdi);
}
SR_PRIV struct sr_dev_driver hantek_4032l_driver_info = {
projects / libsigrok.git / blobdiff