Demo: Fix #314 by always honoring sample limit changes

[libsigrok.git] / src / hardware / demo / demo.c

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 284396a3aeee9db173be88829fd9d73b05088dac..5128b9dc652094b75790d626fae7b2936bdc7f10 100644 (file)
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -157,7 +157,11 @@ static const uint32_t devopts_cg_logic[] = {
        SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const uint32_t devopts_cg_analog[] = {
+static const uint32_t devopts_cg_analog_group[] = {
+       SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
+};
+
+static const uint32_t devopts_cg_analog_channel[] = {
        SR_CONF_PATTERN_MODE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_AMPLITUDE | SR_CONF_GET | SR_CONF_SET,
 };
@@ -212,26 +216,24 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
                }
                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.*/
+                * useful 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] = ag->amplitude *
-                                               sin(2 * M_PI * frequency * t);
+                                               sin(2 * G_PI * frequency * t);
                }
 
                ag->num_samples = num_samples;
                break;
-
        case PATTERN_TRIANGLE:
                frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
@@ -240,13 +242,12 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
 
                for (i = 0; i < num_samples; i++) {
                        t = (double) i / (double) sample_rate;
-                       ag->pattern_data[i] = (2 * ag->amplitude / M_PI) *
-                                               asin(sin(2 * M_PI * frequency * t));
+                       ag->pattern_data[i] = (2 * ag->amplitude / G_PI) *
+                                               asin(sin(2 * G_PI * frequency * t));
                }
 
                ag->num_samples = num_samples;
                break;
-
        case PATTERN_SAWTOOTH:
                frequency = (double) sample_rate / ANALOG_SAMPLES_PER_PERIOD;
 
@@ -487,17 +488,14 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        switch (key) {
        case SR_CONF_SAMPLERATE:
                devc->cur_samplerate = g_variant_get_uint64(data);
-               sr_dbg("Setting samplerate to %" PRIu64, devc->cur_samplerate);
                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);
                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);
                break;
        case SR_CONF_AVERAGING:
                devc->avg = g_variant_get_boolean(data);
@@ -575,8 +573,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        GVariant *gvar;
        GVariantBuilder gvb;
 
-       (void)sdi;
-
        if (key == SR_CONF_SCAN_OPTIONS) {
                *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
@@ -609,22 +605,31 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                        return SR_ERR_NA;
                }
        } else {
-               /* Any channel in the group will do. */
                ch = cg->channels->data;
                switch (key) {
                case SR_CONF_DEVICE_OPTIONS:
                        if (ch->type == SR_CHANNEL_LOGIC)
-                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
                                                devopts_cg_logic, ARRAY_SIZE(devopts_cg_logic),
                                                sizeof(uint32_t));
-                       else if (ch->type == SR_CHANNEL_ANALOG)
-                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
-                                               devopts_cg_analog, ARRAY_SIZE(devopts_cg_analog),
-                                               sizeof(uint32_t));
+                       else if (ch->type == SR_CHANNEL_ANALOG) {
+                               if (strcmp(cg->name, "Analog") == 0)
+                                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                                       devopts_cg_analog_group, ARRAY_SIZE(devopts_cg_analog_group),
+                                                       sizeof(uint32_t));
+                               else
+                                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                                       devopts_cg_analog_channel, ARRAY_SIZE(devopts_cg_analog_channel),
+                                                       sizeof(uint32_t));
+                       }
                        else
                                return SR_ERR_BUG;
                        break;
                case SR_CONF_PATTERN_MODE:
+                       /* The analog group (with all 4 channels) shall not have a pattern property. */
+                       if (strcmp(cg->name, "Analog") == 0)
+                               return SR_ERR_NA;
+
                        if (ch->type == SR_CHANNEL_LOGIC)
                                *data = g_variant_new_strv(logic_pattern_str,
                                                ARRAY_SIZE(logic_pattern_str));
@@ -765,16 +770,16 @@ static int prepare_data(int fd, int revents, void *cb_data)
        /* How many samples should we have sent by now? */
        time = g_get_monotonic_time();
        elapsed = time - devc->starttime;
-       expected_samplenum = elapsed * devc->cur_samplerate / 1000000;
+       expected_samplenum = elapsed * devc->cur_samplerate / (1000 * 1000);
 
        /* But never more than the limit, if there is one. */
        if (!devc->continuous)
                expected_samplenum = MIN(expected_samplenum, devc->limit_samples);
 
        /* Of those, how many do we still have to send? */
-       if (devc->num_logic_channels)
+       if (devc->num_logic_channels && (devc->logic_counter < devc->limit_samples))
                logic_todo = expected_samplenum - devc->logic_counter;
-       if (devc->num_analog_channels)
+       if (devc->num_analog_channels && (devc->analog_counter < devc->limit_samples))
                analog_todo = expected_samplenum - devc->analog_counter;
 
        while (logic_todo || analog_todo) {