korad-kaxxxxp: Add workaround for a Korad KA3005P issue.

[libsigrok.git] / src / hardware / norma-dmm / protocol.c

diff --git a/src/hardware/norma-dmm/protocol.c b/src/hardware/norma-dmm/protocol.c
index ea9cdb434acc82ea81f653aaa3f676e7624f1b46..a077cf983b05ef392a642f322ebe9991fab0852e 100644 (file)
--- a/src/hardware/norma-dmm/protocol.c
+++ b/src/hardware/norma-dmm/protocol.c
@@ -51,7 +51,8 @@ static int nma_send_req(const struct sr_dev_inst *sdi, int req, char *params)
        devc->last_req = req;
        devc->last_req_pending = TRUE;
 
-       if (serial_write_blocking(serial, buf, len, 0) < 0) {
+       if (serial_write_blocking(serial, buf, len,
+                       serial_timeout(serial, len)) < 0) {
                sr_err("Unable to send request.");
                devc->last_req_pending = FALSE;
                return SR_ERR;
@@ -90,7 +91,7 @@ static void nma_process_line(const struct sr_dev_inst *sdi)
        int mmode, devstat;     /* Measuring mode, device status */
        float value;    /* Measured value */
        float scale;    /* Scaling factor depending on range and function */
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct sr_datafeed_packet packet;
 
        devc = sdi->priv;
@@ -119,7 +120,7 @@ static void nma_process_line(const struct sr_dev_inst *sdi)
        /* Start decoding. */
        value = 0.0;
        scale = 1.0;
-       memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+       memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
 
        /*
         * The numbers are hex digits, starting from 0.
@@ -363,7 +364,7 @@ static void nma_process_line(const struct sr_dev_inst *sdi)
        analog.data = &value;
 
        memset(&packet, 0, sizeof(struct sr_datafeed_packet));
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        sr_session_send(devc->cb_data, &packet);