X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fbrymen-bm86x%2Fprotocol.c;h=5ae8c0958f4ed01830dd105a786c4e278fbc975c;hb=24f4a9d50bb93c83cf610a789d0f618970f454ef;hp=4538e3c4d5c84bfc964075ce5b8c9944cc5b79f3;hpb=0c536bcd004aa4b4f0ba9673b4d460551e8b16c1;p=libsigrok.git
diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c
index 4538e3c4..5ae8c095 100644
--- a/src/hardware/brymen-bm86x/protocol.c
+++ b/src/hardware/brymen-bm86x/protocol.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include "protocol.h"
@@ -87,40 +88,40 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
if (ret1 == SR_OK || over_limit) {
/* SI unit */
if (buf[8] & 0x01) {
- analog[0].mq = SR_MQ_VOLTAGE;
- analog[0].unit = SR_UNIT_VOLT;
+ analog[0].meaning->mq = SR_MQ_VOLTAGE;
+ analog[0].meaning->unit = SR_UNIT_VOLT;
if (!strcmp(str, "diod"))
- analog[0].mqflags |= SR_MQFLAG_DIODE;
+ analog[0].meaning->mqflags |= SR_MQFLAG_DIODE;
} else if (buf[14] & 0x80) {
- analog[0].mq = SR_MQ_CURRENT;
- analog[0].unit = SR_UNIT_AMPERE;
+ analog[0].meaning->mq = SR_MQ_CURRENT;
+ analog[0].meaning->unit = SR_UNIT_AMPERE;
} else if (buf[14] & 0x20) {
- analog[0].mq = SR_MQ_CAPACITANCE;
- analog[0].unit = SR_UNIT_FARAD;
+ analog[0].meaning->mq = SR_MQ_CAPACITANCE;
+ analog[0].meaning->unit = SR_UNIT_FARAD;
} else if (buf[14] & 0x10) {
- analog[0].mq = SR_MQ_CONDUCTANCE;
- analog[0].unit = SR_UNIT_SIEMENS;
+ analog[0].meaning->mq = SR_MQ_CONDUCTANCE;
+ analog[0].meaning->unit = SR_UNIT_SIEMENS;
} else if (buf[15] & 0x01) {
- analog[0].mq = SR_MQ_FREQUENCY;
- analog[0].unit = SR_UNIT_HERTZ;
+ analog[0].meaning->mq = SR_MQ_FREQUENCY;
+ analog[0].meaning->unit = SR_UNIT_HERTZ;
} else if (buf[10] & 0x01) {
- analog[0].mq = SR_MQ_CONTINUITY;
- analog[0].unit = SR_UNIT_OHM;
+ analog[0].meaning->mq = SR_MQ_CONTINUITY;
+ analog[0].meaning->unit = SR_UNIT_OHM;
} else if (buf[15] & 0x10) {
- analog[0].mq = SR_MQ_RESISTANCE;
- analog[0].unit = SR_UNIT_OHM;
+ analog[0].meaning->mq = SR_MQ_RESISTANCE;
+ analog[0].meaning->unit = SR_UNIT_OHM;
} else if (buf[15] & 0x02) {
- analog[0].mq = SR_MQ_POWER;
- analog[0].unit = SR_UNIT_DECIBEL_MW;
+ analog[0].meaning->mq = SR_MQ_POWER;
+ analog[0].meaning->unit = SR_UNIT_DECIBEL_MW;
} else if (buf[15] & 0x80) {
- analog[0].mq = SR_MQ_DUTY_CYCLE;
- analog[0].unit = SR_UNIT_PERCENTAGE;
+ analog[0].meaning->mq = SR_MQ_DUTY_CYCLE;
+ analog[0].meaning->unit = SR_UNIT_PERCENTAGE;
} else if (buf[ 2] & 0x0A) {
- analog[0].mq = SR_MQ_TEMPERATURE;
+ analog[0].meaning->mq = SR_MQ_TEMPERATURE;
if (temp_unit == 'F')
- analog[0].unit = SR_UNIT_FAHRENHEIT;
+ analog[0].meaning->unit = SR_UNIT_FAHRENHEIT;
else
- analog[0].unit = SR_UNIT_CELSIUS;
+ analog[0].meaning->unit = SR_UNIT_CELSIUS;
}
/* when MIN MAX and AVG are displayed at the same time, remove them */
@@ -128,14 +129,14 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
buf[1] &= ~0xE0;
/* AC/DC/Auto flags */
- if (buf[1] & 0x10) analog[0].mqflags |= SR_MQFLAG_DC;
- if (buf[2] & 0x01) analog[0].mqflags |= SR_MQFLAG_AC;
- if (buf[1] & 0x01) analog[0].mqflags |= SR_MQFLAG_AUTORANGE;
- if (buf[1] & 0x08) analog[0].mqflags |= SR_MQFLAG_HOLD;
- if (buf[1] & 0x20) analog[0].mqflags |= SR_MQFLAG_MAX;
- if (buf[1] & 0x40) analog[0].mqflags |= SR_MQFLAG_MIN;
- if (buf[1] & 0x80) analog[0].mqflags |= SR_MQFLAG_AVG;
- if (buf[3] & 0x01) analog[0].mqflags |= SR_MQFLAG_RELATIVE;
+ if (buf[1] & 0x10) analog[0].meaning->mqflags |= SR_MQFLAG_DC;
+ if (buf[2] & 0x01) analog[0].meaning->mqflags |= SR_MQFLAG_AC;
+ if (buf[1] & 0x01) analog[0].meaning->mqflags |= SR_MQFLAG_AUTORANGE;
+ if (buf[1] & 0x08) analog[0].meaning->mqflags |= SR_MQFLAG_HOLD;
+ if (buf[1] & 0x20) analog[0].meaning->mqflags |= SR_MQFLAG_MAX;
+ if (buf[1] & 0x40) analog[0].meaning->mqflags |= SR_MQFLAG_MIN;
+ if (buf[1] & 0x80) analog[0].meaning->mqflags |= SR_MQFLAG_AVG;
+ if (buf[3] & 0x01) analog[0].meaning->mqflags |= SR_MQFLAG_RELATIVE;
/* when dBm is displayed, remove the m suffix so that it is
not considered as the 10e-3 SI prefix */
@@ -156,27 +157,27 @@ static void brymen_bm86x_parse(unsigned char *buf, float *floatval,
if (ret2 == SR_OK) {
/* SI unit */
if (buf[14] & 0x08) {
- analog[1].mq = SR_MQ_VOLTAGE;
- analog[1].unit = SR_UNIT_VOLT;
+ analog[1].meaning->mq = SR_MQ_VOLTAGE;
+ analog[1].meaning->unit = SR_UNIT_VOLT;
} else if (buf[9] & 0x04) {
- analog[1].mq = SR_MQ_CURRENT;
- analog[1].unit = SR_UNIT_AMPERE;
+ analog[1].meaning->mq = SR_MQ_CURRENT;
+ analog[1].meaning->unit = SR_UNIT_AMPERE;
} else if (buf[9] & 0x08) {
- analog[1].mq = SR_MQ_CURRENT;
- analog[1].unit = SR_UNIT_PERCENTAGE;
+ analog[1].meaning->mq = SR_MQ_CURRENT;
+ analog[1].meaning->unit = SR_UNIT_PERCENTAGE;
} else if (buf[14] & 0x04) {
- analog[1].mq = SR_MQ_FREQUENCY;
- analog[1].unit = SR_UNIT_HERTZ;
+ analog[1].meaning->mq = SR_MQ_FREQUENCY;
+ analog[1].meaning->unit = SR_UNIT_HERTZ;
} else if (buf[9] & 0x40) {
- analog[1].mq = SR_MQ_TEMPERATURE;
+ analog[1].meaning->mq = SR_MQ_TEMPERATURE;
if (temp_unit == 'F')
- analog[1].unit = SR_UNIT_FAHRENHEIT;
+ analog[1].meaning->unit = SR_UNIT_FAHRENHEIT;
else
- analog[1].unit = SR_UNIT_CELSIUS;
+ analog[1].meaning->unit = SR_UNIT_CELSIUS;
}
/* AC flag */
- if (buf[9] & 0x20) analog[1].mqflags |= SR_MQFLAG_AC;
+ if (buf[9] & 0x20) analog[1].meaning->mqflags |= SR_MQFLAG_AC;
/* SI prefix */
if (buf[ 9] & 0x01) floatval[1] *= 1e-6; /* µ */
@@ -195,42 +196,48 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi,
struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog[2];
+ struct sr_analog_encoding encoding[2];
+ struct sr_analog_meaning meaning[2];
+ struct sr_analog_spec spec[2];
float floatval[2];
devc = sdi->priv;
- analog[0].mq = -1;
- analog[0].mqflags = 0;
+ sr_analog_init(&analog[0], &encoding[0], &meaning[0], &spec[0], 0);
+ sr_analog_init(&analog[1], &encoding[1], &meaning[1], &spec[1], 0);
- analog[1].mq = -1;
- analog[1].mqflags = 0;
+ analog[0].meaning->mq = 0;
+ analog[0].meaning->mqflags = 0;
+
+ analog[1].meaning->mq = 0;
+ analog[1].meaning->mqflags = 0;
brymen_bm86x_parse(buf, floatval, analog);
- if (analog[0].mq != -1) {
+ if (analog[0].meaning->mq != 0) {
/* Got a measurement. */
analog[0].num_samples = 1;
analog[0].data = &floatval[0];
- analog[0].channels = g_slist_append(NULL, sdi->channels->data);
+ analog[0].meaning->channels = g_slist_append(NULL, sdi->channels->data);
packet.type = SR_DF_ANALOG;
packet.payload = &analog[0];
sr_session_send(sdi, &packet);
- g_slist_free(analog[0].channels);
+ g_slist_free(analog[0].meaning->channels);
}
- if (analog[1].mq != -1) {
+ if (analog[1].meaning->mq != 0) {
/* Got a measurement. */
analog[1].num_samples = 1;
analog[1].data = &floatval[1];
- analog[1].channels = g_slist_append(NULL, sdi->channels->next->data);
+ analog[1].meaning->channels = g_slist_append(NULL, sdi->channels->next->data);
packet.type = SR_DF_ANALOG;
packet.payload = &analog[1];
sr_session_send(sdi, &packet);
- g_slist_free(analog[1].channels);
+ g_slist_free(analog[1].meaning->channels);
}
- if (analog[0].mq != -1 || analog[1].mq != -1)
- devc->num_samples++;
+ if (analog[0].meaning->mq != 0 || analog[1].meaning->mq != 0)
+ sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
}
static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi)
@@ -307,7 +314,6 @@ SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data)
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- int64_t time;
(void)fd;
(void)revents;
@@ -327,20 +333,8 @@ SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data)
if (brymen_bm86x_read_interrupt(sdi))
return FALSE;
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached, stopping.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- time = (g_get_monotonic_time() - devc->start_time) / 1000;
- if (time > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached, stopping.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->sw_limits))
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}