Always interleave analog data with all enabled probes.

[libsigrok.git] / hardware / serial-dmm / protocol.c

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index f22e7b7a63ba9e086df14d73566391702e842bd8..eda54d9b8671b4a48f02664ababd87be93597969 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <errno.h>
+#include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
@@ -85,26 +85,30 @@ SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info)
        }
 }
 
-static void handle_packet(const uint8_t *buf, struct dev_context *devc,
+static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
                          int dmm, void *info)
 {
        float floatval;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog *analog;
+       struct dev_context *devc;
 
        log_dmm_packet(buf);
+       devc = sdi->priv;
 
        if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog)))) {
                sr_err("Analog packet malloc failed.");
                return;
        }
 
+       analog->probes = sdi->probes;
        analog->num_samples = 1;
        analog->mq = -1;
 
        dmms[dmm].packet_parse(buf, &floatval, analog, info);
        analog->data = &floatval;
 
+       /* If this DMM needs additional handling, call the resp. function. */
        if (dmms[dmm].dmm_details)
                dmms[dmm].dmm_details(analog, info);
 
@@ -119,10 +123,13 @@ static void handle_packet(const uint8_t *buf, struct dev_context *devc,
        g_free(analog);
 }
 
-static void handle_new_data(struct dev_context *devc, int dmm, void *info)
+static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
 {
+       struct dev_context *devc;
        int len, i, offset = 0;
 
+       devc = sdi->priv;
+
        /* Try to get as much data as the buffer can hold. */
        len = DMM_BUFSIZE - devc->buflen;
        len = serial_read(devc->serial, devc->buf + devc->buflen, len);
@@ -135,7 +142,7 @@ static void handle_new_data(struct dev_context *devc, int dmm, void *info)
        /* Now look for packets in that data. */
        while ((devc->buflen - offset) >= dmms[dmm].packet_size) {
                if (dmms[dmm].packet_valid(devc->buf + offset)) {
-                       handle_packet(devc->buf + offset, devc, dmm, info);
+                       handle_packet(devc->buf + offset, sdi, dmm, info);
                        offset += dmms[dmm].packet_size;
                } else {
                        offset++;
@@ -152,6 +159,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       int64_t time;
        int ret;
 
        (void)fd;
@@ -164,7 +172,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
-               handle_new_data(devc, dmm, info);
+               handle_new_data(sdi, dmm, info);
        } else {
                /* Timeout, send another packet request (if DMM needs it). */
                if (dmms[dmm].packet_request) {
@@ -176,29 +184,41 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
                }
        }
 
-       if (devc->num_samples >= devc->limit_samples) {
-               sr_info("Requested number of samples reached, stopping.");
+       if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
+               sr_info("Requested number of samples reached.");
                sdi->driver->dev_acquisition_stop(sdi, cb_data);
                return TRUE;
        }
 
+       if (devc->limit_msec) {
+               time = (g_get_monotonic_time() - devc->starttime) / 1000;
+               if (time > (int64_t)devc->limit_msec) {
+                       sr_info("Requested time limit reached.");
+                       sdi->driver->dev_acquisition_stop(sdi, cb_data);
+                       return TRUE;
+               }
+       }
+
        return TRUE;
 }
 
-#define RECV_DATA(ID_UPPER, DMM_DRIVER) \
+#define RECEIVE_DATA(ID_UPPER, DMM_DRIVER) \
 SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
        struct DMM_DRIVER##_info info; \
        return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
 
 /* Driver-specific receive_data() wrappers */
-RECV_DATA(DIGITEK_DT4000ZC, fs9721)
-RECV_DATA(TEKPOWER_TP4000ZC, fs9721)
-RECV_DATA(METEX_ME31, metex14)
-RECV_DATA(PEAKTECH_3410, metex14)
-RECV_DATA(MASTECH_MAS345, metex14)
-RECV_DATA(VA_VA18B, fs9721)
-RECV_DATA(METEX_M3640D, metex14)
-RECV_DATA(PEAKTECH_4370, metex14)
-RECV_DATA(PCE_PCE_DM32, fs9721)
-RECV_DATA(RADIOSHACK_22_168, metex14)
-RECV_DATA(RADIOSHACK_22_812, rs9lcd)
+RECEIVE_DATA(DIGITEK_DT4000ZC, fs9721)
+RECEIVE_DATA(TEKPOWER_TP4000ZC, fs9721)
+RECEIVE_DATA(METEX_ME31, metex14)
+RECEIVE_DATA(PEAKTECH_3410, metex14)
+RECEIVE_DATA(MASTECH_MAS345, metex14)
+RECEIVE_DATA(VA_VA18B, fs9721)
+RECEIVE_DATA(METEX_M3640D, metex14)
+RECEIVE_DATA(PEAKTECH_4370, metex14)
+RECEIVE_DATA(PCE_PCE_DM32, fs9721)
+RECEIVE_DATA(RADIOSHACK_22_168, metex14)
+RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
+RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT61E_SER, es51922)