X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fdemo%2Fapi.c;h=bea35d068f63042a04fd7b27b6d691f3778ad0fb;hb=70c9a25491d617235db7eaa86b39d29290b17885;hp=7d3e08872d07c21b38832845a138d5cf2bd3fe80;hpb=d10781808d391bb861f3ad918109148e58026e6d;p=libsigrok.git diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c index 7d3e0887..bea35d06 100644 --- a/src/hardware/demo/api.c +++ b/src/hardware/demo/api.c @@ -5,6 +5,7 @@ * Copyright (C) 2011 Olivier Fauchon * Copyright (C) 2012 Alexandru Gagniuc * Copyright (C) 2015 Bartosz Golaszewski + * Copyright (C) 2019 Frank Stettner * * 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 @@ -28,11 +29,10 @@ #include "libsigrok-internal.h" #include "protocol.h" -#define DEFAULT_NUM_LOGIC_CHANNELS 8 -#define DEFAULT_LOGIC_PATTERN PATTERN_SIGROK +#define DEFAULT_NUM_LOGIC_CHANNELS 8 +#define DEFAULT_LOGIC_PATTERN PATTERN_SIGROK -#define DEFAULT_NUM_ANALOG_CHANNELS 4 -#define DEFAULT_ANALOG_AMPLITUDE 10 +#define DEFAULT_NUM_ANALOG_CHANNELS 5 /* Note: No spaces allowed because of sigrok-cli. */ static const char *logic_pattern_str[] = { @@ -77,11 +77,14 @@ static const uint32_t devopts_cg_logic[] = { static const uint32_t devopts_cg_analog_group[] = { SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OFFSET | SR_CONF_GET | SR_CONF_SET, }; static const uint32_t devopts_cg_analog_channel[] = { + SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_SET, SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET, + SR_CONF_OFFSET | SR_CONF_GET | SR_CONF_SET, }; static const int32_t trigger_matches[] = { @@ -148,24 +151,27 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (num_logic_channels > 0) { /* Logic channels, all in one channel group. */ - cg = g_malloc0(sizeof(struct sr_channel_group)); - cg->name = g_strdup("Logic"); + cg = sr_channel_group_new(sdi, "Logic", NULL); for (i = 0; i < num_logic_channels; i++) { sprintf(channel_name, "D%d", i); ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name); cg->channels = g_slist_append(cg->channels, ch); } - sdi->channel_groups = g_slist_append(NULL, cg); } /* Analog channels, channel groups and pattern generators. */ devc->ch_ag = g_hash_table_new(g_direct_hash, g_direct_equal); if (num_analog_channels > 0) { + /* + * Have the waveform for analog patterns pre-generated. It's + * supposed to be periodic, so the generator just needs to + * access the prepared sample data (DDS style). + */ + demo_generate_analog_pattern(devc); + pattern = 0; /* An "Analog" channel group with all analog channels in it. */ - acg = g_malloc0(sizeof(struct sr_channel_group)); - acg->name = g_strdup("Analog"); - sdi->channel_groups = g_slist_append(sdi->channel_groups, acg); + acg = sr_channel_group_new(sdi, "Analog", NULL); for (i = 0; i < num_analog_channels; i++) { snprintf(channel_name, 16, "A%d", i); @@ -174,21 +180,25 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) acg->channels = g_slist_append(acg->channels, ch); /* Every analog channel gets its own channel group as well. */ - cg = g_malloc0(sizeof(struct sr_channel_group)); - cg->name = g_strdup(channel_name); + cg = sr_channel_group_new(sdi, channel_name, NULL); cg->channels = g_slist_append(NULL, ch); - sdi->channel_groups = g_slist_append(sdi->channel_groups, cg); /* Every channel gets a generator struct. */ ag = g_malloc(sizeof(struct analog_gen)); ag->ch = ch; + ag->mq = SR_MQ_VOLTAGE; + ag->mq_flags = SR_MQFLAG_DC; + ag->unit = SR_UNIT_VOLT; ag->amplitude = DEFAULT_ANALOG_AMPLITUDE; + ag->offset = DEFAULT_ANALOG_OFFSET; sr_analog_init(&ag->packet, &ag->encoding, &ag->meaning, &ag->spec, 2); ag->packet.meaning->channels = cg->channels; - ag->packet.meaning->mq = 0; - ag->packet.meaning->mqflags = 0; - ag->packet.meaning->unit = SR_UNIT_VOLT; - ag->packet.data = ag->pattern_data; + ag->packet.meaning->mq = ag->mq; + ag->packet.meaning->mqflags = ag->mq_flags; + ag->packet.meaning->unit = ag->unit; + ag->packet.encoding->digits = DEFAULT_ANALOG_ENCODING_DIGITS; + ag->packet.spec->spec_digits = DEFAULT_ANALOG_SPEC_DIGITS; + ag->packet.data = devc->analog_patterns[pattern]; ag->pattern = pattern; ag->avg_val = 0.0f; ag->num_avgs = 0; @@ -209,6 +219,8 @@ static void clear_helper(struct dev_context *devc) GHashTableIter iter; void *value; + demo_free_analog_pattern(devc); + /* Analog generators. */ g_hash_table_iter_init(&iter, devc->ch_ag); while (g_hash_table_iter_next(&iter, NULL, &value)) @@ -227,6 +239,7 @@ static int config_get(uint32_t key, GVariant **data, struct dev_context *devc; struct sr_channel *ch; struct analog_gen *ag; + GVariant *mq_arr[2]; int pattern; if (!sdi) @@ -252,6 +265,18 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_AVG_SAMPLES: *data = g_variant_new_uint64(devc->avg_samples); break; + case SR_CONF_MEASURED_QUANTITY: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + /* Any channel in the group will do. */ + ch = cg->channels->data; + if (ch->type != SR_CHANNEL_ANALOG) + return SR_ERR_ARG; + ag = g_hash_table_lookup(devc->ch_ag, ch); + mq_arr[0] = g_variant_new_uint32(ag->mq); + mq_arr[1] = g_variant_new_uint64(ag->mq_flags); + *data = g_variant_new_tuple(mq_arr, 2); + break; case SR_CONF_PATTERN_MODE: if (!cg) return SR_ERR_CHANNEL_GROUP; @@ -277,6 +302,16 @@ static int config_get(uint32_t key, GVariant **data, ag = g_hash_table_lookup(devc->ch_ag, ch); *data = g_variant_new_double(ag->amplitude); break; + case SR_CONF_OFFSET: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + /* Any channel in the group will do. */ + ch = cg->channels->data; + if (ch->type != SR_CHANNEL_ANALOG) + return SR_ERR_ARG; + ag = g_hash_table_lookup(devc->ch_ag, ch); + *data = g_variant_new_double(ag->offset); + break; case SR_CONF_CAPTURE_RATIO: *data = g_variant_new_uint64(devc->capture_ratio); break; @@ -293,6 +328,7 @@ static int config_set(uint32_t key, GVariant *data, struct dev_context *devc; struct analog_gen *ag; struct sr_channel *ch; + GVariant *mq_tuple_child; GSList *l; int logic_pattern, analog_pattern; @@ -321,6 +357,21 @@ static int config_set(uint32_t key, GVariant *data, devc->avg_samples = g_variant_get_uint64(data); sr_dbg("Setting averaging rate to %" PRIu64, devc->avg_samples); break; + case SR_CONF_MEASURED_QUANTITY: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + for (l = cg->channels; l; l = l->next) { + ch = l->data; + if (ch->type != SR_CHANNEL_ANALOG) + return SR_ERR_ARG; + ag = g_hash_table_lookup(devc->ch_ag, ch); + mq_tuple_child = g_variant_get_child_value(data, 0); + ag->mq = g_variant_get_uint32(mq_tuple_child); + mq_tuple_child = g_variant_get_child_value(data, 1); + ag->mq_flags = g_variant_get_uint64(mq_tuple_child); + g_variant_unref(mq_tuple_child); + } + break; case SR_CONF_PATTERN_MODE: if (!cg) return SR_ERR_CHANNEL_GROUP; @@ -363,6 +414,17 @@ static int config_set(uint32_t key, GVariant *data, ag->amplitude = g_variant_get_double(data); } break; + case SR_CONF_OFFSET: + if (!cg) + return SR_ERR_CHANNEL_GROUP; + for (l = cg->channels; l; l = l->next) { + ch = l->data; + if (ch->type != SR_CHANNEL_ANALOG) + return SR_ERR_ARG; + ag = g_hash_table_lookup(devc->ch_ag, ch); + ag->offset = g_variant_get_double(data); + } + break; case SR_CONF_CAPTURE_RATIO: devc->capture_ratio = g_variant_get_uint64(data); break; @@ -434,8 +496,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_channel *ch; int bitpos; uint8_t mask; - GHashTableIter iter; - void *value; struct sr_trigger *trigger; devc = sdi->priv; @@ -501,22 +561,13 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->first_partial_logic_index, devc->first_partial_logic_mask); - /* - * Have the waveform for analog patterns pre-generated. It's - * supposed to be periodic, so the generator just needs to - * access the prepared sample data (DDS style). - */ - g_hash_table_iter_init(&iter, devc->ch_ag); - while (g_hash_table_iter_next(&iter, NULL, &value)) - demo_generate_analog_pattern(value, devc->cur_samplerate); - sr_session_source_add(sdi->session, -1, 0, 100, demo_prepare_data, (struct sr_dev_inst *)sdi); std_session_send_df_header(sdi); if (devc->limit_frames > 0) - std_session_send_frame_begin(sdi); + std_session_send_df_frame_begin(sdi); /* We use this timestamp to decide how many more samples to send. */ devc->start_us = g_get_monotonic_time(); @@ -534,7 +585,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) devc = sdi->priv; if (devc->limit_frames > 0) - std_session_send_frame_end(sdi); + std_session_send_df_frame_end(sdi); std_session_send_df_end(sdi);