X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-bm86x%2Fprotocol.c;h=097b8874ef61c20b9a0c22b781eb3d515bd3c682;hb=8cd15dd4ce2fdbefbcc6e64632c8006e5404f253;hp=adf0e0f6ed010c74368901fee9d0f818521cb88b;hpb=1baf30f5f713041fb3ac3383c8aafd81090ec446;p=libsigrok.git

diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
index adf0e0f6..097b8874 100644
--- a/src/hardware/brymen-bm86x/protocol.c
+++ b/src/hardware/brymen-bm86x/protocol.c
@@ -99,8 +99,10 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
 		if (buf[8] & 0x01) {
 			analog[0].meaning->mq = SR_MQ_VOLTAGE;
 			analog[0].meaning->unit = SR_UNIT_VOLT;
-			if (!strcmp(str, "diod"))
+			if (!strcmp(str, "diod")) {
 				analog[0].meaning->mqflags |= SR_MQFLAG_DIODE;
+				analog[0].meaning->mqflags |= SR_MQFLAG_DC;
+			}
 		} else if (buf[14] & 0x80) {
 			analog[0].meaning->mq = SR_MQ_CURRENT;
 			analog[0].meaning->unit = SR_UNIT_AMPERE;
@@ -153,11 +155,11 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
 			buf[15] &= ~0x04;
 
 		/* SI prefix */
-		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 (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;
 
@@ -192,10 +194,10 @@ 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; 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 */
+		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];
@@ -214,38 +216,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);
 }
 
@@ -259,7 +269,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 */
@@ -343,7 +353,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;
 }