X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=329fd170e79cf62868c6fc97fc82f65cf1fa45f2;hb=1656e47def5422a5273f023d542d4d6a72668b42;hp=9d3ae4b500e87f354ee37a8f71e6d4e7263d4a32;hpb=7a1da33198c0c4d9f982a147e5a49a128446eca8;p=libsigrok.git diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 9d3ae4b5..329fd170 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -23,6 +23,7 @@ #include #include #include +#include #ifdef _WIN32 #include #include @@ -41,9 +42,11 @@ /* 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. @@ -66,12 +69,17 @@ enum { /** All probes have a high logic state. */ PATTERN_ALL_HIGH, +}; - /* Analog */ +/* Analog patterns we can generate. */ +enum { /** * Square wave. */ PATTERN_SQUARE, + PATTERN_SINE, + PATTERN_TRIANGLE, + PATTERN_SAWTOOTH, }; static const char *logic_pattern_str[] = { @@ -84,6 +92,9 @@ static const char *logic_pattern_str[] = { static const char *analog_pattern_str[] = { "square", + "sine", + "triangle", + "sawtooth", }; struct analog_gen { @@ -100,12 +111,14 @@ struct dev_context { uint64_t cur_samplerate; uint64_t limit_samples; uint64_t limit_msec; - uint64_t samples_counter; + uint64_t logic_counter; + uint64_t analog_counter; int64_t starttime; uint64_t step; /* 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 */ @@ -153,30 +166,29 @@ static struct sr_dev_driver *di = &demo_driver_info; static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static int dev_clear(void) -{ - return std_dev_clear(di, NULL); -} - static int init(struct sr_context *sr_ctx) { 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); + + sr_dbg("Generating %s pattern for probe group %s", + analog_pattern_str[ag->pattern], + probe_group->name); - switch (pattern) { + switch (ag->pattern) { case PATTERN_SQUARE: - num_samples = ANALOG_BUFSIZE / sizeof(float); - value = 5.0; + value = ANALOG_AMPLITUDE; last_end = 0; for (i = 0; i < num_samples; i++) { if (i % 5 == 0) @@ -187,6 +199,55 @@ static void set_analog_pattern(const struct sr_probe_group *probe_group, int pat } ag->num_samples = last_end; break; + + case PATTERN_SINE: + frequency = (double) 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; + + case PATTERN_TRIANGLE: + frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD; + + 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] = (2 * ANALOG_AMPLITUDE / M_PI) * + asin(sin(2 * M_PI * frequency * t)); + } + + ag->num_samples = num_samples; + break; + + case PATTERN_SAWTOOTH: + frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD; + + 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] = 2 * ANALOG_AMPLITUDE * + ((t * frequency) - floor(0.5f + t * frequency)); + } + + ag->num_samples = num_samples; + break; } } @@ -200,7 +261,7 @@ static GSList *scan(GSList *options) struct sr_config *src; struct analog_gen *ag; GSList *devices, *l; - int num_logic_probes, num_analog_probes, i; + int num_logic_probes, num_analog_probes, pattern, i; char probe_name[16]; drvc = di->priv; @@ -257,9 +318,12 @@ static GSList *scan(GSList *options) sdi->probe_groups = g_slist_append(NULL, pg); /* Analog probes, probe groups and pattern generators. */ + + pattern = 0; for (i = 0; i < num_analog_probes; i++) { sprintf(probe_name, "A%d", i); - if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE, probe_name))) + if (!(probe = sr_probe_new(i + num_logic_probes, + SR_PROBE_ANALOG, TRUE, probe_name))) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); @@ -277,11 +341,14 @@ static GSList *scan(GSList *options) ag->packet.mqflags = 0; ag->packet.unit = SR_UNIT_VOLT; ag->packet.data = ag->pattern_data; + ag->pattern = pattern; 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); + + if (++pattern == ARRAY_SIZE(analog_pattern_str)) + pattern = 0; } sdi->priv = devc; @@ -312,15 +379,19 @@ static int dev_close(struct sr_dev_inst *sdi) static int cleanup(void) { - return dev_clear(); + return std_dev_clear(di, NULL); } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, 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) { @@ -334,7 +405,18 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, *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); @@ -353,9 +435,9 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, 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; @@ -364,66 +446,64 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, 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; } @@ -475,9 +555,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (probe->type == SR_PROBE_LOGIC) *data = g_variant_new_strv(logic_pattern_str, ARRAY_SIZE(logic_pattern_str)); - else + 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; @@ -538,7 +620,7 @@ static int prepare_data(int fd, int revents, void *cb_data) struct sr_probe_group *pg; struct analog_gen *ag; GSList *l; - uint64_t samples_to_send, expected_samplenum, analog_samples, sending_now; + uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now; int64_t time, elapsed; (void)fd; @@ -551,20 +633,15 @@ static int prepare_data(int fd, int revents, void *cb_data) time = g_get_monotonic_time(); elapsed = time - devc->starttime; expected_samplenum = elapsed * devc->cur_samplerate / 1000000; - /* Of those, how many do we still have to send? */ - samples_to_send = expected_samplenum - devc->samples_counter; - if (devc->limit_samples) { - samples_to_send = MIN(samples_to_send, - devc->limit_samples - devc->samples_counter); - } - - while (samples_to_send > 0) { - sending_now = 0; + /* Of those, how many do we still have to send? */ + logic_todo = MIN(expected_samplenum, devc->limit_samples) - devc->logic_counter; + analog_todo = MIN(expected_samplenum, devc->limit_samples) - devc->analog_counter; + while (logic_todo || analog_todo) { /* Logic */ - if (devc->num_logic_probes > 0) { - sending_now = MIN(samples_to_send, + if (devc->num_logic_probes > 0 && logic_todo > 0) { + sending_now = MIN(logic_todo, LOGIC_BUFSIZE / devc->logic_unitsize); logic_generator(sdi, sending_now * devc->logic_unitsize); packet.type = SR_DF_LOGIC; @@ -573,31 +650,38 @@ static int prepare_data(int fd, int revents, void *cb_data) logic.unitsize = devc->logic_unitsize; logic.data = devc->logic_data; sr_session_send(sdi, &packet); + logic_todo -= sending_now; + devc->logic_counter += sending_now; } /* Analog, one probe at a time */ - if (devc->num_analog_probes > 0) { + if (devc->num_analog_probes > 0 && analog_todo > 0) { sending_now = 0; for (l = devc->analog_probe_groups; l; l = l->next) { pg = l->data; ag = pg->priv; packet.type = SR_DF_ANALOG; packet.payload = &ag->packet; - analog_samples = MIN(samples_to_send, ag->num_samples); + + /* 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(analog_todo, ag->num_samples); /* Whichever probe group gets there first. */ sending_now = MAX(sending_now, analog_samples); ag->packet.num_samples = analog_samples; sr_session_send(sdi, &packet); } + analog_todo -= sending_now; + devc->analog_counter += sending_now; } - - samples_to_send -= sending_now; - devc->samples_counter += sending_now; } - if (devc->limit_samples && - devc->samples_counter >= devc->limit_samples) { - sr_info("Requested number of samples reached."); + if (devc->logic_counter >= devc->limit_samples && + devc->analog_counter >= devc->limit_samples) { + sr_dbg("Requested number of samples reached."); dev_acquisition_stop(sdi, cb_data); return TRUE; } @@ -607,14 +691,16 @@ static int prepare_data(int fd, int revents, void *cb_data) 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_DEV_CLOSED; - /* TODO: don't start without a sample limit set */ devc = sdi->priv; - devc->samples_counter = 0; + if (devc->limit_samples == 0) + return SR_ERR; + devc->logic_counter = devc->analog_counter = 0; /* * Setting two channels connected by a pipe is a remnant from when the @@ -628,6 +714,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) 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); @@ -658,7 +748,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) (void)cb_data; devc = sdi->priv; - sr_dbg("Stopping aquisition."); + sr_dbg("Stopping acquisition."); sr_session_source_remove_channel(devc->channel); g_io_channel_shutdown(devc->channel, FALSE, NULL); @@ -680,7 +770,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = { .cleanup = cleanup, .scan = scan, .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_clear = NULL, .config_get = config_get, .config_set = config_set, .config_list = config_list,