X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=a01173fa4bda4d14f8cfebe4fb2ec1d99f6f01b6;hb=7d40b5ee62f625a87e7ab37508d37b97a65dc66b;hp=119d0403727c9974a9384233170c20fc267bbc47;hpb=bcbef5ed709a56e8cec3d7d0b5f73a00a4040984;p=libsigrok.git
diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 119d0403..a01173fa 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -18,12 +18,12 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -41,45 +41,65 @@ static void log_dmm_packet(const uint8_t *buf)
static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
void *info)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
float floatval;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
+ struct sr_analog_encoding encoding;
+ struct sr_analog_meaning meaning;
+ struct sr_analog_spec spec;
struct dev_context *devc;
+ gboolean sent_sample;
+ struct sr_channel *channel;
+ size_t ch_idx;
+
+ dmm = (struct dmm_info *)sdi->driver;
log_dmm_packet(buf);
devc = sdi->priv;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
-
- analog.channels = sdi->channels;
- analog.num_samples = 1;
- analog.mq = -1;
-
- dmm->packet_parse(buf, &floatval, &analog, info);
- analog.data = &floatval;
-
- /* If this DMM needs additional handling, call the resp. function. */
- if (dmm->dmm_details)
- dmm->dmm_details(&analog, info);
+ sent_sample = FALSE;
+ memset(info, 0, dmm->info_size);
+ for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
+ /* Note: digits/spec_digits will be overridden by the DMM parsers. */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
+ channel = g_slist_nth_data(sdi->channels, ch_idx);
+ analog.meaning->channels = g_slist_append(NULL, channel);
+ analog.num_samples = 1;
+ analog.meaning->mq = 0;
+
+ dmm->packet_parse(buf, &floatval, &analog, info);
+ analog.data = &floatval;
+
+ /* If this DMM needs additional handling, call the resp. function. */
+ if (dmm->dmm_details)
+ dmm->dmm_details(&analog, info);
+
+ if (analog.meaning->mq != 0 && channel->enabled) {
+ /* Got a measurement. */
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ sr_session_send(sdi, &packet);
+ sent_sample = TRUE;
+ }
+ }
- if (analog.mq != -1) {
- /* Got a measurement. */
- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
- devc->num_samples++;
+ if (sent_sample) {
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
}
/** Request packet, if required. */
SR_PRIV int req_packet(struct sr_dev_inst *sdi)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
struct dev_context *devc;
struct sr_serial_dev_inst *serial;
int ret;
+ dmm = (struct dmm_info *)sdi->driver;
+
if (!dmm->packet_request)
return SR_OK;
@@ -106,11 +126,13 @@ SR_PRIV int req_packet(struct sr_dev_inst *sdi)
static void handle_new_data(struct sr_dev_inst *sdi, void *info)
{
- struct dmm_info *dmm = (struct dmm_info *) sdi->driver;
+ struct dmm_info *dmm;
struct dev_context *devc;
- int len, i, offset = 0;
+ int len, offset;
struct sr_serial_dev_inst *serial;
+ dmm = (struct dmm_info *)sdi->driver;
+
devc = sdi->priv;
serial = sdi->conn;
@@ -126,6 +148,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, void *info)
devc->buflen += len;
/* Now look for packets in that data. */
+ offset = 0;
while ((devc->buflen - offset) >= dmm->packet_size) {
if (dmm->packet_valid(devc->buf + offset)) {
handle_packet(devc->buf + offset, sdi, info);
@@ -144,8 +167,8 @@ static void handle_new_data(struct sr_dev_inst *sdi, void *info)
}
/* If we have any data left, move it to the beginning of our buffer. */
- for (i = 0; i < devc->buflen - offset; i++)
- devc->buf[i] = devc->buf[offset + i];
+ if (devc->buflen > offset)
+ memmove(devc->buf, devc->buf + offset, devc->buflen - offset);
devc->buflen -= offset;
}
@@ -154,7 +177,6 @@ int receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi;
struct dev_context *devc;
struct dmm_info *dmm;
- int64_t time;
void *info;
(void)fd;
@@ -165,33 +187,21 @@ int receive_data(int fd, int revents, void *cb_data)
if (!(devc = sdi->priv))
return TRUE;
- dmm = (struct dmm_info *) sdi->driver;
+ dmm = (struct dmm_info *)sdi->driver;
if (revents == G_IO_IN) {
/* Serial data arrived. */
- info = malloc(dmm->info_size);
+ info = g_malloc(dmm->info_size);
handle_new_data(sdi, info);
- free(info);
+ g_free(info);
} else {
/* Timeout; send another packet request if DMM needs it. */
if (dmm->packet_request && (req_packet(sdi) < 0))
return FALSE;
}
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
- sr_info("Requested number of samples reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
-
- if (devc->limit_msec) {
- time = (g_get_monotonic_time() - devc->starttime) / 1000;
- if (time > (int64_t)devc->limit_msec) {
- sr_info("Requested time limit reached.");
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
- return TRUE;
- }
- }
+ if (sr_sw_limits_check(&devc->limits))
+ sr_dev_acquisition_stop(sdi);
return TRUE;
}