* This file is part of the libsigrok project.
*
* Copyright (C) 2013 Marcus Comstedt <marcus@mc.pp.se>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <libusb.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include "libsigrok.h"
#include "libsigrok-internal.h"
#include "protocol.h"
SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
static struct sr_dev_driver *di = &saleae_logic16_driver_info;
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
+};
+
+static const int32_t hwcaps[] = {
+ SR_CONF_LOGIC_ANALYZER,
+ SR_CONF_SAMPLERATE,
+ SR_CONF_VOLTAGE_THRESHOLD,
+
+ /* These are really implemented in the driver, not the hardware. */
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_CONTINUOUS,
+};
+
static const char *probe_names[NUM_PROBES + 1] = {
"0", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15",
NULL,
};
+static const struct {
+ enum voltage_range range;
+ gdouble low;
+ gdouble high;
+} volt_thresholds[] = {
+ { VOLTAGE_RANGE_18_33_V, 0.7, 1.4 },
+ { VOLTAGE_RANGE_5_V, 1.4, 3.6 },
+};
+
static const uint64_t samplerates[] = {
SR_KHZ(500),
SR_MHZ(1),
if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
return NULL;
+ devc->selected_voltage_range = VOLTAGE_RANGE_18_33_V;
sdi->priv = devc;
drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi);
libusb_device **devlist;
struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
- struct dev_context *devc;
struct drv_context *drvc;
int ret, skip, i, device_count;
drvc = di->priv;
- devc = sdi->priv;
usb = sdi->conn;
if (sdi->status == SR_ST_ACTIVE)
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
+ GVariant *range[2];
+ char str[128];
int ret;
-
- (void)sdi;
- (void)data;
+ unsigned i;
ret = SR_OK;
switch (key) {
+ case SR_CONF_CONN:
+ if (!sdi || !sdi->conn)
+ return SR_ERR_ARG;
+ usb = sdi->conn;
+ if (usb->address == 255)
+ /* 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);
+ break;
case SR_CONF_SAMPLERATE:
if (!sdi)
return SR_ERR;
devc = sdi->priv;
*data = g_variant_new_uint64(devc->cur_samplerate);
break;
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ if (!sdi)
+ return SR_ERR;
+ devc = sdi->priv;
+ ret = SR_ERR;
+ for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++)
+ if (devc->selected_voltage_range ==
+ volt_thresholds[i].range) {
+ range[0] = g_variant_new_double(volt_thresholds[i].low);
+ range[1] = g_variant_new_double(volt_thresholds[i].high);
+ *data = g_variant_new_tuple(range, 2);
+ ret = SR_OK;
+ break;
+ }
+ break;
default:
return SR_ERR_NA;
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ gdouble low, high;
int ret;
+ unsigned i;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
case SR_CONF_LIMIT_SAMPLES:
devc->limit_samples = g_variant_get_uint64(data);
break;
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ g_variant_get(data, "(dd)", &low, &high);
+ ret = SR_ERR_ARG;
+ for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
+ if (fabs(volt_thresholds[i].low - low) < 0.1 &&
+ fabs(volt_thresholds[i].high - high) < 0.1) {
+ devc->selected_voltage_range =
+ volt_thresholds[i].range;
+ ret = SR_OK;
+ break;
+ }
+ }
+ break;
default:
ret = SR_ERR_NA;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
{
- GVariant *gvar;
+ GVariant *gvar, *range[2];
GVariantBuilder gvb;
int ret;
+ unsigned i;
(void)sdi;
ret = SR_OK;
switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+ break;
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
+ break;
case SR_CONF_SAMPLERATE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), samplerates,
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb);
break;
+ case SR_CONF_VOLTAGE_THRESHOLD:
+ g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
+ for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
+ range[0] = g_variant_new_double(volt_thresholds[i].low);
+ range[1] = g_variant_new_double(volt_thresholds[i].high);
+ gvar = g_variant_new_tuple(range, 2);
+ g_variant_builder_add_value(&gvb, gvar);
+ }
+ *data = g_variant_builder_end(&gvb);
+ break;
default:
return SR_ERR_NA;
}
projects / libsigrok.git / blobdiff