brymen-bm86x: support channel selection (enable/disable channels)

[libsigrok.git] / src / hardware / brymen-bm86x / protocol.c

diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
index 353ae02bfd3f84b88f74e80fa592fedf83dd8524..345fad57fcb49e0a2146006d0374a6b4d401c808 100644 (file)
--- a/src/hardware/brymen-bm86x/protocol.c
+++ b/src/hardware/brymen-bm86x/protocol.c
@@ -46,24 +46,33 @@ static const char char_map[128] = {
 
 static int brymen_bm86x_parse_digits(const unsigned char *buf, int length,
                                      char *str, float *floatval,
-                                     char *temp_unit, int flag)
+                                     char *temp_unit, int *digits, int flag)
 {
        char c, *p = str;
        int i, ret;
 
+       *digits = INT_MIN;
+
        if (buf[0] & flag)
                *p++ = '-';
        for (i = 0; i < length; i++) {
-               if (i && i < 5 && buf[i+1] & 0x01)
+               if (i && i < 5 && buf[i+1] & 0x01) {
                        *p++ = '.';
+                       *digits = 0;
+               }
                c = char_map[buf[i+1] >> 1];
                if (i == 5 && (c == 'C' || c == 'F'))
                        *temp_unit = c;
-               else if (c)
+               else if (c) {
                        *p++ = c;
+                       (*digits)++;
+               }
        }
        *p = 0;
 
+       if (*digits < 0)
+               *digits = 0;
+
        if ((ret = sr_atof_ascii(str, floatval))) {
                sr_dbg("invalid float string: '%s'", str);
                return ret;
@@ -76,13 +85,13 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
                                struct sr_datafeed_analog *analog)
 {
        char str[16], temp_unit;
-       int ret1, ret2, over_limit;
+       int ret1, ret2, digits[2], over_limit;
 
        ret1 = brymen_bm86x_parse_digits(buf+2, 6, str, &floatval[0],
-                                        &temp_unit, 0x80);
+                                        &temp_unit, &digits[0], 0x80);
        over_limit = strstr(str, "0L") || strstr(str, "0.L");
        ret2 = brymen_bm86x_parse_digits(buf+9, 4, str, &floatval[1],
-                                        &temp_unit, 0x10);
+                                        &temp_unit, &digits[1], 0x10);
 
        /* main display */
        if (ret1 == SR_OK || over_limit) {
@@ -144,13 +153,16 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
                        buf[15] &= ~0x04;
 
                /* SI prefix */
-               if (buf[14] & 0x40)  floatval[0] *= 1e-9;  /* n */
-               if (buf[15] & 0x08)  floatval[0] *= 1e-6;  /* µ */
-               if (buf[15] & 0x04)  floatval[0] *= 1e-3;  /* m */
-               if (buf[15] & 0x40)  floatval[0] *= 1e3;   /* k */
-               if (buf[15] & 0x20)  floatval[0] *= 1e6;   /* M */
+               if (buf[14] & 0x40)  { floatval[0] *= 1e-9; digits[0] += 9; } /* n */
+               if (buf[15] & 0x08)  { floatval[0] *= 1e-6; digits[0] += 6; } /* µ */
+               if (buf[15] & 0x04)  { floatval[0] *= 1e-3; digits[0] += 3; } /* m */
+               if (buf[15] & 0x40)  { floatval[0] *= 1e3;  digits[0] -= 3; } /* k */
+               if (buf[15] & 0x20)  { floatval[0] *= 1e6;  digits[0] -= 6; } /* M */
 
                if (over_limit)      floatval[0] = INFINITY;
+
+               analog[0].encoding->digits  = digits[0];
+               analog[0].spec->spec_digits = digits[0];
        }
 
        /* secondary display */
@@ -180,10 +192,13 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
                if (buf[9] & 0x20)  analog[1].meaning->mqflags |= SR_MQFLAG_AC;
 
                /* SI prefix */
-               if (buf[ 9] & 0x01)  floatval[1] *= 1e-6;  /* µ */
-               if (buf[ 9] & 0x02)  floatval[1] *= 1e-3;  /* m */
-               if (buf[14] & 0x02)  floatval[1] *= 1e3;   /* k */
-               if (buf[14] & 0x01)  floatval[1] *= 1e6;   /* M */
+               if (buf[ 9] & 0x01)  { floatval[1] *= 1e-6; digits[1] += 6; } /* µ */
+               if (buf[ 9] & 0x02)  { floatval[1] *= 1e-3; digits[1] += 3; } /* m */
+               if (buf[14] & 0x02)  { floatval[1] *= 1e3;  digits[1] -= 3; } /* k */
+               if (buf[14] & 0x01)  { floatval[1] *= 1e6;  digits[1] -= 6; } /* M */
+
+               analog[1].encoding->digits  = digits[1];
+               analog[1].spec->spec_digits = digits[1];
        }
 
        if (buf[9] & 0x80)
@@ -199,38 +214,46 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
        struct sr_analog_encoding encoding[2];
        struct sr_analog_meaning meaning[2];
        struct sr_analog_spec spec[2];
+       struct sr_channel *channel;
+       int sent_ch1, sent_ch2;
        float floatval[2];
 
        devc = sdi->priv;
 
+       /* Note: digits/spec_digits will be overridden later. */
        sr_analog_init(&analog[0], &encoding[0], &meaning[0], &spec[0], 0);
        sr_analog_init(&analog[1], &encoding[1], &meaning[1], &spec[1], 0);
 
        brymen_bm86x_parse(buf, floatval, analog);
+       sent_ch1 = sent_ch2 = 0;
 
-       if (analog[0].meaning->mq != 0) {
+       channel = sdi->channels->data;
+       if (analog[0].meaning->mq != 0 && channel->enabled) {
                /* Got a measurement. */
+               sent_ch1 = 1;
                analog[0].num_samples = 1;
                analog[0].data = &floatval[0];
-               analog[0].meaning->channels = g_slist_append(NULL, sdi->channels->data);
+               analog[0].meaning->channels = g_slist_append(NULL, channel);
                packet.type = SR_DF_ANALOG;
                packet.payload = &analog[0];
                sr_session_send(sdi, &packet);
                g_slist_free(analog[0].meaning->channels);
        }
 
-       if (analog[1].meaning->mq != 0) {
+       channel = sdi->channels->next->data;
+       if (analog[1].meaning->mq != 0 && channel->enabled) {
                /* Got a measurement. */
+               sent_ch2 = 1;
                analog[1].num_samples = 1;
                analog[1].data = &floatval[1];
-               analog[1].meaning->channels = g_slist_append(NULL, sdi->channels->next->data);
+               analog[1].meaning->channels = g_slist_append(NULL, channel);
                packet.type = SR_DF_ANALOG;
                packet.payload = &analog[1];
                sr_session_send(sdi, &packet);
                g_slist_free(analog[1].meaning->channels);
        }
 
-       if (analog[0].meaning->mq != 0 || analog[1].meaning->mq != 0)
+       if (sent_ch1 || sent_ch2)
                sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
 }
 
@@ -244,7 +267,7 @@ static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi)
 
        sr_dbg("Sending HID set report.");
        ret = libusb_control_transfer(usb->devhdl,
-                                     LIBUSB_REQUEST_TYPE_CLASS  |
+                                     LIBUSB_REQUEST_TYPE_CLASS |
                                      LIBUSB_RECIPIENT_INTERFACE |
                                      LIBUSB_ENDPOINT_OUT,
                                      9,     /* bRequest: HID set_report */
@@ -328,7 +351,7 @@ SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data)
                return FALSE;
 
        if (sr_sw_limits_check(&devc->sw_limits))
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
 
        return TRUE;
 }