sr: hantek-dso: Use portable g_ntohs() function.

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

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 23d268424b4403e0fc588cef172bcf49826295fb..1091ea9008c6956ae816239f2f102d588b733be3 100644 (file)
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <sys/time.h>
 #include <inttypes.h>
-#include <arpa/inet.h>
 #include <glib.h>
 #include <libusb.h>
 #include "sigrok.h"
@@ -555,7 +554,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
        struct context *ctx;
-       float ch1, ch2;
+       float ch1, ch2, range;
        int num_probes, data_offset, i;
 
        ctx = transfer->user_data;
@@ -574,20 +573,31 @@ static void receive_transfer(struct libusb_transfer *transfer)
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
        analog.num_samples = transfer->actual_length / 2;
+       analog.unit = SR_UNIT_VOLTAGE;
        analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_probes);
        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 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 5xxx series 9-bit samples */
                if (ctx->ch1_enabled) {
-                       ch1 = (*(transfer->buffer + i * 2 + 1) / 255.0);
+                       range = ((float)vdivs[ctx->voltage_ch1].p / vdivs[ctx->voltage_ch1].q) * 8;
+                       ch1 = range / 255 * *(transfer->buffer + i * 2 + 1);
+                       /* Value is centered around 0V. */
+                       ch1 -= range / 2;
                        analog.data[data_offset++] = ch1;
                }
                if (ctx->ch2_enabled) {
-                       ch2 = (*(transfer->buffer + i * 2) / 255.0);
+                       range = ((float)vdivs[ctx->voltage_ch2].p / vdivs[ctx->voltage_ch2].q) * 8;
+                       ch2 = range / 255 * *(transfer->buffer + i * 2);
+                       ch2 -= range / 2;
                        analog.data[data_offset++] = ch2;
                }
        }