diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c index 230b6adf..dacbee88 100644 --- a/src/hardware/brymen-dmm/api.c +++ b/src/hardware/brymen-dmm/api.c @@ -111,7 +111,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) devices = NULL; - conn = serialcomm = NULL; + /* + * BEWARE! Default 'conn' is not desirable when the device cannot + * reliably get detected. Insist that users specify the port. + */ + conn = NULL; + serialcomm = "9600/8n1/dtr=1/rts=1"; for (l = options; l; l = l->next) { src = l->data; switch (src->key) { @@ -126,10 +131,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) if (!conn) return NULL; - if (serialcomm) - devices = brymen_scan(di, conn, serialcomm); - else - devices = brymen_scan(di, conn, "9600/8n1/dtr=1/rts=1"); + devices = brymen_scan(di, conn, serialcomm); return devices; } diff --git a/src/hardware/brymen-dmm/parser.c b/src/hardware/brymen-dmm/parser.c index d42ff45a..7fcb3456 100644 --- a/src/hardware/brymen-dmm/parser.c +++ b/src/hardware/brymen-dmm/parser.c @@ -284,7 +284,7 @@ SR_PRIV int brymen_parse(const uint8_t *buf, float *floatval, analog->meaning->mqflags |= SR_MQFLAG_DC; if (flags.is_low_batt) - sr_info("Low battery!"); + sr_warn("Low battery!"); return SR_OK; } diff --git a/src/hardware/brymen-dmm/protocol.h b/src/hardware/brymen-dmm/protocol.h index d5090ee6..ec839d48 100644 --- a/src/hardware/brymen-dmm/protocol.h +++ b/src/hardware/brymen-dmm/protocol.h @@ -40,7 +40,6 @@ enum packet_len_status { struct dev_context { struct sr_sw_limits sw_limits; - uint8_t buf[DMM_BUFSIZE]; int bufoffset; int buflen; @@ -66,9 +65,9 @@ SR_PRIV int brymen_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info); SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial, - uint8_t *buf, size_t *buflen, - packet_length_t get_packet_size, - packet_valid_callback is_valid, - uint64_t timeout_ms, int baudrate); + uint8_t *buf, size_t *buflen, + packet_length_t get_packet_size, + packet_valid_callback is_valid, + uint64_t timeout_ms, int baudrate); #endif