X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbrymen-bm86x%2Fprotocol.c;h=2840696f8127f8a84e9f1f664f468ba440d6eeba;hb=3182d4ebb3618e8745e83650f2568bf42d612f93;hp=b8e16a3f8d346c7f983f54a235ac764f57b7b69c;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git
diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
index b8e16a3f..2840696f 100644
--- a/src/hardware/brymen-bm86x/protocol.c
+++ b/src/hardware/brymen-bm86x/protocol.c
@@ -17,13 +17,14 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "protocol.h"
#define USB_TIMEOUT 500
-static char char_map[128] = {
+static const char char_map[128] = {
[0x20] = '-',
[0x5F] = '0',
[0x50] = '1',
@@ -161,6 +162,9 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
} else if (buf[9] & 0x04) {
analog[1].mq = SR_MQ_CURRENT;
analog[1].unit = SR_UNIT_AMPERE;
+ } else if (buf[9] & 0x08) {
+ analog[1].mq = SR_MQ_CURRENT;
+ analog[1].unit = SR_UNIT_PERCENTAGE;
} else if (buf[14] & 0x04) {
analog[1].mq = SR_MQ_FREQUENCY;
analog[1].unit = SR_UNIT_HERTZ;
@@ -254,7 +258,7 @@ static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi)
}
if (ret != sizeof(buf)) {
- sr_err("Short packet: sent %d/%ld bytes.", ret, sizeof(buf));
+ sr_err("Short packet: sent %d/%zu bytes.", ret, sizeof(buf));
return SR_ERR;
}
@@ -290,7 +294,7 @@ static int brymen_bm86x_read_interrupt(const struct sr_dev_inst *sdi)
}
if (transferred != sizeof(buf)) {
- sr_err("Short packet: received %d/%d bytes.", transferred, sizeof(buf));
+ sr_err("Short packet: received %d/%zu bytes.", transferred, sizeof(buf));
return SR_ERR;
}