#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <math.h>
#ifdef _WIN32
#include <io.h>
#include <fcntl.h>
/* Size of the analog pattern space per channel. */
#define ANALOG_BUFSIZE 4096
-/* Patterns we can generate */
+#define ANALOG_AMPLITUDE 25
+#define ANALOG_SAMPLES_PER_PERIOD 20
+
+/* Logic patterns we can generate. */
enum {
- /* Logic */
/**
* Spells "sigrok" across 8 probes using '0's (with '1's as
* "background") when displayed using the 'bits' output format.
/** All probes have a high logic state. */
PATTERN_ALL_HIGH,
+};
- /* Analog */
+/* Analog patterns we can generate. */
+enum {
/**
* Square wave.
*/
PATTERN_SQUARE,
+ PATTERN_SINE,
};
static const char *logic_pattern_str[] = {
static const char *analog_pattern_str[] = {
"square",
+ "sine",
};
struct analog_gen {
/* Logic */
int32_t num_logic_probes;
unsigned int logic_unitsize;
+ /* There is only ever one logic probe group, so its pattern goes here. */
uint8_t logic_pattern;
unsigned char logic_data[LOGIC_BUFSIZE];
/* Analog */
GSList *analog_probe_groups;
};
-static const int32_t hwopts[] = {
+static const int32_t scanopts[] = {
SR_CONF_NUM_LOGIC_PROBES,
SR_CONF_NUM_ANALOG_PROBES,
};
-static const int hwcaps[] = {
+static const int devopts[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_DEMO_DEV,
SR_CONF_SAMPLERATE,
- SR_CONF_PATTERN_MODE,
SR_CONF_LIMIT_SAMPLES,
SR_CONF_LIMIT_MSEC,
};
+static const int devopts_pg[] = {
+ SR_CONF_PATTERN_MODE,
+};
+
static const uint64_t samplerates[] = {
SR_HZ(1),
SR_GHZ(1),
return std_init(sr_ctx, di, LOG_PREFIX);
}
-static void set_analog_pattern(const struct sr_probe_group *probe_group, int pattern)
+static void generate_analog_pattern(const struct sr_probe_group *probe_group, uint64_t sample_rate)
{
struct analog_gen *ag;
+ double t, frequency;
float value;
unsigned int num_samples, i;
int last_end;
ag = probe_group->priv;
- ag->pattern = pattern;
+ num_samples = ANALOG_BUFSIZE / sizeof(float);
- switch (pattern) {
+ sr_dbg("Generating %s pattern for probe group %s",
+ analog_pattern_str[ag->pattern],
+ probe_group->name);
+
+ switch (ag->pattern) {
case PATTERN_SQUARE:
- num_samples = ANALOG_BUFSIZE / sizeof(float);
value = 5.0;
last_end = 0;
for (i = 0; i < num_samples; i++) {
}
ag->num_samples = last_end;
break;
+
+ case PATTERN_SINE:
+ frequency = sample_rate / ANALOG_SAMPLES_PER_PERIOD;
+
+ /* Make sure the number of samples we put out is an integer
+ * multiple of our period size */
+ /* FIXME we actually need only one period. A ringbuffer would be
+ * usefull here.*/
+ while (num_samples % ANALOG_SAMPLES_PER_PERIOD != 0)
+ num_samples--;
+
+ for (i = 0; i < num_samples; i++) {
+ t = (double) i / (double) sample_rate;
+ ag->pattern_data[i] = ANALOG_AMPLITUDE *
+ sin(2 * M_PI * frequency * t);
+ }
+
+ ag->num_samples = num_samples;
+ break;
}
}
ag->packet.mqflags = 0;
ag->packet.unit = SR_UNIT_VOLT;
ag->packet.data = ag->pattern_data;
+ ag->pattern = PATTERN_SINE;
pg->priv = ag;
- set_analog_pattern(pg, PATTERN_SQUARE);
sdi->probe_groups = g_slist_append(sdi->probe_groups, pg);
devc->analog_probe_groups = g_slist_append(devc->analog_probe_groups, pg);
const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
+ struct sr_probe *probe;
+ struct analog_gen *ag;
+ int pattern;
- (void)probe_group;
+ if (!sdi)
+ return SR_ERR_ARG;
devc = sdi->priv;
switch (id) {
*data = g_variant_new_uint64(devc->limit_msec);
break;
case SR_CONF_PATTERN_MODE:
- *data = g_variant_new_string(logic_pattern_str[devc->logic_pattern]);
+ if (!probe_group)
+ return SR_ERR_PROBE_GROUP;
+ probe = probe_group->probes->data;
+ if (probe->type == SR_PROBE_LOGIC) {
+ pattern = devc->logic_pattern;
+ *data = g_variant_new_string(logic_pattern_str[pattern]);
+ } else if (probe->type == SR_PROBE_ANALOG) {
+ ag = probe_group->priv;
+ pattern = ag->pattern;
+ *data = g_variant_new_string(analog_pattern_str[pattern]);
+ } else
+ return SR_ERR_BUG;
break;
case SR_CONF_NUM_LOGIC_PROBES:
*data = g_variant_new_int32(devc->num_logic_probes);
const struct sr_probe_group *probe_group)
{
struct dev_context *devc;
- struct sr_probe_group *pg;
- GSList *l;
- int logic_pattern, analog_pattern, ret;
+ struct analog_gen *ag;
+ struct sr_probe *probe;
+ int pattern, ret;
unsigned int i;
const char *stropt;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- ret = SR_ERR;
- if (id == SR_CONF_SAMPLERATE) {
+ ret = SR_OK;
+ switch (id) {
+ case SR_CONF_SAMPLERATE:
devc->cur_samplerate = g_variant_get_uint64(data);
sr_dbg("Setting samplerate to %" PRIu64, devc->cur_samplerate);
- ret = SR_OK;
- } else if (id == SR_CONF_LIMIT_SAMPLES) {
+ break;
+ case SR_CONF_LIMIT_SAMPLES:
devc->limit_msec = 0;
devc->limit_samples = g_variant_get_uint64(data);
sr_dbg("Setting sample limit to %" PRIu64, devc->limit_samples);
- ret = SR_OK;
- } else if (id == SR_CONF_LIMIT_MSEC) {
- /* TODO: convert to limit_samples */
+ break;
+ case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data);
devc->limit_samples = 0;
sr_dbg("Setting time limit to %" PRIu64"ms", devc->limit_msec);
- ret = SR_OK;
- } else if (id == SR_CONF_PATTERN_MODE) {
+ break;
+ case SR_CONF_PATTERN_MODE:
+ if (!probe_group)
+ return SR_ERR_PROBE_GROUP;
stropt = g_variant_get_string(data, NULL);
- logic_pattern = analog_pattern = -1;
- /* Is it a logic pattern? */
- for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
- if (!strcmp(stropt, logic_pattern_str[i])) {
- logic_pattern = i;
- break;
- }
- }
- if (logic_pattern == -1) {
- /* Is it an analog pattern? */
- for (i = 0; i < ARRAY_SIZE(analog_pattern_str); i++) {
- if (!strcmp(stropt, analog_pattern_str[i])) {
- analog_pattern = i;
+ probe = probe_group->probes->data;
+ pattern = -1;
+ if (probe->type == SR_PROBE_LOGIC) {
+ for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
+ if (!strcmp(stropt, logic_pattern_str[i])) {
+ pattern = i;
break;
}
}
- }
- if (logic_pattern > -1) {
- devc->logic_pattern = logic_pattern;
- /* Might as well do this now. */
- if (logic_pattern == PATTERN_ALL_LOW)
+ if (pattern == -1)
+ return SR_ERR_ARG;
+ devc->logic_pattern = pattern;
+
+ /* Might as well do this now, these are static. */
+ if (pattern == PATTERN_ALL_LOW)
memset(devc->logic_data, 0x00, LOGIC_BUFSIZE);
- else if (logic_pattern == PATTERN_ALL_HIGH)
+ else if (pattern == PATTERN_ALL_HIGH)
memset(devc->logic_data, 0xff, LOGIC_BUFSIZE);
- ret = SR_OK;
- sr_dbg("Setting logic pattern to %s", logic_pattern_str[logic_pattern]);
- } else if (analog_pattern > -1) {
- sr_dbg("Setting analog pattern to %s", analog_pattern_str[analog_pattern]);
- if (probe_group)
- set_analog_pattern(probe_group, analog_pattern);
- else {
- /* No probe group specified, apply pattern to all of them. */
- for (l = sdi->probe_groups; l; l = l->next) {
- pg = l->data;
- set_analog_pattern(pg, analog_pattern);
+ sr_dbg("Setting logic pattern to %s",
+ logic_pattern_str[pattern]);
+ } else if (probe->type == SR_PROBE_ANALOG) {
+ for (i = 0; i < ARRAY_SIZE(analog_pattern_str); i++) {
+ if (!strcmp(stropt, analog_pattern_str[i])) {
+ pattern = i;
+ break;
}
- ret = SR_OK;
}
- } else {
- ret = SR_ERR;
- }
- } else {
+ if (pattern == -1)
+ return SR_ERR_ARG;
+ sr_dbg("Setting analog pattern for probe group %s to %s",
+ probe_group->name,
+ analog_pattern_str[pattern]);
+ ag = probe_group->priv;
+ ag->pattern = pattern;
+ } else
+ return SR_ERR_BUG;
+ break;
+ default:
ret = SR_ERR_NA;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_probe_group *probe_group)
{
+ struct sr_probe *probe;
GVariant *gvar;
GVariantBuilder gvb;
(void)sdi;
- (void)probe_group;
- switch (key) {
- case SR_CONF_SCAN_OPTIONS:
+ if (key == 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,
- ARRAY_SIZE(samplerates), sizeof(uint64_t));
- g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
- *data = g_variant_builder_end(&gvb);
- break;
- case SR_CONF_PATTERN_MODE:
- *data = g_variant_new_strv(logic_pattern_str, ARRAY_SIZE(logic_pattern_str));
- break;
- default:
- return SR_ERR_NA;
+ scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t));
+ return SR_OK;
+ }
+
+ if (!sdi)
+ return SR_ERR_ARG;
+
+ if (!probe_group) {
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ devopts, ARRAY_SIZE(devopts), 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,
+ ARRAY_SIZE(samplerates), sizeof(uint64_t));
+ g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar);
+ *data = g_variant_builder_end(&gvb);
+ break;
+ default:
+ return SR_ERR_NA;
+ }
+ } else {
+ probe = probe_group->probes->data;
+ switch (key) {
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ devopts_pg, ARRAY_SIZE(devopts_pg), sizeof(int32_t));
+ break;
+ case SR_CONF_PATTERN_MODE:
+ if (probe->type == SR_PROBE_LOGIC)
+ *data = g_variant_new_strv(logic_pattern_str,
+ ARRAY_SIZE(logic_pattern_str));
+ else if (probe->type == SR_PROBE_ANALOG)
+ *data = g_variant_new_strv(analog_pattern_str,
+ ARRAY_SIZE(analog_pattern_str));
+ else
+ return SR_ERR_BUG;
+ break;
+ default:
+ return SR_ERR_NA;
+ }
}
return SR_OK;
ag = pg->priv;
packet.type = SR_DF_ANALOG;
packet.payload = &ag->packet;
+
+ /* FIXME we should make sure we output a whole
+ * period of data before we send out again the
+ * beginning of our buffer. A ring buffer would
+ * help here as well */
+
analog_samples = MIN(samples_to_send, ag->num_samples);
/* Whichever probe group gets there first. */
sending_now = MAX(sending_now, analog_samples);
static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
{
+ GSList *l;
struct dev_context *devc;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
}
+ for (l = devc->analog_probe_groups; l; l = l->next) {
+ generate_analog_pattern(l->data, devc->cur_samplerate);
+ }
+
devc->channel = g_io_channel_unix_new(devc->pipe_fds[0]);
g_io_channel_set_flags(devc->channel, G_IO_FLAG_NONBLOCK, NULL);
projects / libsigrok.git / blobdiff