Fix #505 by providing a separate property list for the analog group

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

diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index 36ead58901d517e8ed3fa306008d5e82966a4af4..b6a561afbc71843cfe6398dc7c0f02db99e8143e 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,
 };
@@ -218,14 +222,14 @@ static void generate_analog_pattern(struct analog_gen *ag, uint64_t sample_rate)
                /* 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;
@@ -238,8 +242,8 @@ 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;
@@ -601,7 +605,6 @@ 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:
@@ -609,14 +612,24 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
                                *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_UINT32,
-                                               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));
@@ -757,7 +770,7 @@ 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)