hantek-dso: dso2250: Report the sample rate back.

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index cdc4360e9a40b440099ae86e7ada37b46b63edcf..4903eab2061ab5eb8c04c1e7ade4e82852ec08bd 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -62,6 +62,7 @@ static const uint32_t devopts[] = {
        SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
@@ -430,6 +431,11 @@ static int config_get(uint32_t key, GVariant **data,
                        *data = g_variant_new("(tt)", timebases[devc->timebase][0],
                                        timebases[devc->timebase][1]);
                        break;
+               case SR_CONF_SAMPLERATE:
+                       *data = g_variant_new_uint64(
+                                       timebases[devc->timebase][1]/
+                                       timebases[devc->timebase][0]);
+                       break;
                case SR_CONF_BUFFERSIZE:
                        *data = g_variant_new_uint64(devc->framesize);
                        break;
@@ -486,8 +492,7 @@ static int config_set(uint32_t key, GVariant *data,
                case SR_CONF_TRIGGER_SLOPE:
                        if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
                                return SR_ERR_ARG;
-                       devc->triggerslope = (trigger_slopes[idx][0] == 'r')
-                               ? SLOPE_POSITIVE : SLOPE_NEGATIVE;
+                       devc->triggerslope = idx;
                        break;
                case SR_CONF_HORIZ_TRIGGERPOS:
                        tmp_double = g_variant_get_double(data);
@@ -613,7 +618,7 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        /* TODO: Check malloc return value. */
        analog.data = g_try_malloc(num_samples * sizeof(float));
 
-       for (int ch = 0; ch < 2; ch++) {
+       for (int ch = 0; ch < NUM_CHANNELS; ch++) {
                if (!devc->ch_enabled[ch])
                        continue;
 
@@ -820,6 +825,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                /* No data yet. */
                break;
        case CAPTURE_READY_8BIT:
+       case CAPTURE_READY2250:
                /* Remember where in the captured frame the trigger is. */
                devc->trigger_offset = trigger_offset;