hantek-dso: properly set encoding digits

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 4705fd571272532890fc990048497c0c28264d11..e9aa4e5884f287532780aca1accaea4362777ccd 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -191,8 +192,8 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
        devc->profile = prof;
        devc->dev_state = IDLE;
        devc->timebase = DEFAULT_TIMEBASE;
-       devc->ch1_enabled = TRUE;
-       devc->ch2_enabled = TRUE;
+       devc->ch_enabled[0] = TRUE;
+       devc->ch_enabled[1] = TRUE;
        devc->voltage[0] = DEFAULT_VOLTAGE;
        devc->voltage[1] = DEFAULT_VOLTAGE;
        devc->coupling[0] = DEFAULT_COUPLING;
@@ -219,13 +220,13 @@ static int configure_channels(const struct sr_dev_inst *sdi)
        devc = sdi->priv;
 
        g_slist_free(devc->enabled_channels);
-       devc->ch1_enabled = devc->ch2_enabled = FALSE;
+       devc->ch_enabled[0] = devc->ch_enabled[1] = FALSE;
        for (l = sdi->channels, p = 0; l; l = l->next, p++) {
                ch = l->data;
                if (p == 0)
-                       devc->ch1_enabled = ch->enabled;
+                       devc->ch_enabled[0] = ch->enabled;
                else
-                       devc->ch2_enabled = ch->enabled;
+                       devc->ch_enabled[1] = ch->enabled;
                if (ch->enabled)
                        devc->enabled_channels = g_slist_append(devc->enabled_channels, ch);
        }
@@ -692,54 +693,52 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
        struct sr_analog_encoding encoding;
        struct sr_analog_meaning meaning;
        struct sr_analog_spec spec;
-       struct dev_context *devc;
-       float ch1, ch2, range;
-       int num_channels, data_offset;
-       unsigned int i;
+       struct dev_context *devc = sdi->priv;
+       GSList *channels = devc->enabled_channels;
 
-       devc = sdi->priv;
-       num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
        packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
        sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
-       analog.meaning->channels = devc->enabled_channels;
        analog.num_samples = num_samples;
        analog.meaning->mq = SR_MQ_VOLTAGE;
        analog.meaning->unit = SR_UNIT_VOLT;
        analog.meaning->mqflags = 0;
        /* TODO: Check malloc return value. */
-       analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels);
-       data_offset = 0;
-       for (i = 0; i < analog.num_samples; i++) {
-               /*
-                * The device always sends data for both channels. If a channel
-                * is disabled, it contains a copy of the enabled channel's
-                * data. However, we only send the requested channels to
-                * the bus.
-                *
-                * Voltage values are encoded as a value 0-255 (0-512 on the
-                * DSO-5200*), where the value is a point in the range
-                * represented by the vdiv setting. There are 8 vertical divs,
-                * so e.g. 500mV/div represents 4V peak-to-peak where 0 = -2V
-                * and 255 = +2V.
-                */
-               /* TODO: Support for DSO-5xxx series 9-bit samples. */
-               if (devc->ch1_enabled) {
-                       range = ((float)vdivs[devc->voltage[0]][0] / vdivs[devc->voltage[0]][1]) * 8;
-                       ch1 = range / 255 * *(buf + i * 2 + 1);
-                       /* Value is centered around 0V. */
-                       ch1 -= range / 2;
-                       ((float *)analog.data)[data_offset++] = ch1;
-               }
-               if (devc->ch2_enabled) {
-                       range = ((float)vdivs[devc->voltage[1]][0] / vdivs[devc->voltage[1]][1]) * 8;
-                       ch2 = range / 255 * *(buf + i * 2);
-                       ch2 -= range / 2;
-                       ((float *)analog.data)[data_offset++] = ch2;
+       analog.data = g_try_malloc(num_samples * sizeof(float));
+
+       for (int ch = 0; ch < 2; ch++) {
+               if (!devc->ch_enabled[ch])
+                       continue;
+
+               float range = ((float)vdivs[devc->voltage[ch]][0] / vdivs[devc->voltage[ch]][1]) * 8;
+               float vdivlog = log10f(range / 255);
+               int digits = -(int)vdivlog + (vdivlog < 0.0);
+               analog.encoding->digits = digits;
+               analog.spec->spec_digits = digits;
+               analog.meaning->channels = g_slist_append(NULL, channels->data);
+
+               for (int i = 0; i < num_samples; i++) {
+                       /*
+                        * The device always sends data for both channels. If a channel
+                        * is disabled, it contains a copy of the enabled channel's
+                        * data. However, we only send the requested channels to
+                        * the bus.
+                        *
+                        * Voltage values are encoded as a value 0-255 (0-512 on the
+                        * DSO-5200*), where the value is a point in the range
+                        * represented by the vdiv setting. There are 8 vertical divs,
+                        * so e.g. 500mV/div represents 4V peak-to-peak where 0 = -2V
+                        * and 255 = +2V.
+                        */
+                       /* TODO: Support for DSO-5xxx series 9-bit samples. */
+                       ((float *)analog.data)[i] = range / 255 * *(buf + i * 2 + 1 - ch) - range / 2;
                }
+               sr_session_send(sdi, &packet);
+               g_slist_free(analog.meaning->channels);
+
+               channels = channels->next;
        }
-       sr_session_send(sdi, &packet);
        g_free(analog.data);
 }
 
@@ -918,7 +917,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                /* Remember where in the captured frame the trigger is. */
                devc->trigger_offset = trigger_offset;
 
-               num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
+               num_channels = (devc->ch_enabled[0] && devc->ch_enabled[1]) ? 2 : 1;
                devc->framebuf = g_malloc(devc->framesize * num_channels * 2);
                devc->samp_buffered = devc->samp_received = 0;
 

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 06037e29278e775ad5d13e4e8ec0811709d6d25d..3d799664a530cdb550ab952fcfbc8c16fa9beb05 100644 (file)
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -315,8 +315,8 @@ static int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
        cmdstring[2] |= (tmp & 0x07) << 5;
 
        /* Enabled channels: 00=CH1 01=CH2 10=both */
-       sr_dbg("Channels CH1=%d CH2=%d", devc->ch1_enabled, devc->ch2_enabled);
-       tmp = (((devc->ch2_enabled ? 1 : 0) << 1) + (devc->ch1_enabled ? 1 : 0)) - 1;
+       sr_dbg("Channels CH1=%d CH2=%d", devc->ch_enabled[0], devc->ch_enabled[1]);
+       tmp = (((devc->ch_enabled[1] ? 1 : 0) << 1) + (devc->ch_enabled[0] ? 1 : 0)) - 1;
        cmdstring[3] = tmp;
 
        /* Fast rates channel */

diff --git a/src/hardware/hantek-dso/dso.h b/src/hardware/hantek-dso/dso.h
index 78e438bd62537d0fcfb1ce99bbe2a57932c7f28e..0d7b7bf17d1b4a0a8d247e066a849174b1370ca9 100644 (file)
--- a/src/hardware/hantek-dso/dso.h
+++ b/src/hardware/hantek-dso/dso.h
@@ -177,8 +177,7 @@ struct dev_context {
 
        /* Oscilloscope settings. */
        int timebase;
-       gboolean ch1_enabled;
-       gboolean ch2_enabled;
+       gboolean ch_enabled[2];
        int voltage[2];
        int coupling[2];
        // voltage offset (vertical position)