/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <glib.h>
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "fluke-dmm.h"
#include <stdlib.h>
#include <math.h>
#include <string.h>
#include <errno.h>
+#include <glib.h>
+#include "libsigrok.h"
+#include "libsigrok-internal.h"
+#include "fluke-dmm.h"
-
-static struct sr_datafeed_analog *handle_qm_v1(const struct sr_dev_inst *sdi,
+static struct sr_datafeed_analog *handle_qm_18x(const struct sr_dev_inst *sdi,
char **tokens)
{
struct sr_datafeed_analog *analog;
char *e, *u;
gboolean is_oor;
- (void)sdi;
-
- if (strcmp(tokens[0], "QM"))
+ if (strcmp(tokens[0], "QM") || !tokens[1])
return NULL;
if ((e = strstr(tokens[1], "Out of range"))) {
is_oor = TRUE;
fvalue = -1;
+ while(*e && *e != '.')
+ e++;
} else {
is_oor = FALSE;
- fvalue = strtof(tokens[1], &e);
- if (fvalue == 0.0 && e == tokens[1]) {
+ /* Delimit the float, since sr_atof_ascii() wants only
+ * a valid float here. */
+ e = tokens[1];
+ while(*e && *e != ' ')
+ e++;
+ *e++ = '\0';
+ if (sr_atof_ascii(tokens[1], &fvalue) != SR_OK || fvalue == 0.0) {
/* Happens all the time, when switching modes. */
sr_dbg("Invalid float.");
return NULL;
while(*e && *e == ' ')
e++;
- /* TODO: Check malloc return value. */
- analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
+ if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
+ return NULL;
+ if (!(analog->data = g_try_malloc(sizeof(float))))
+ return NULL;
+ analog->channels = sdi->channels;
analog->num_samples = 1;
- /* TODO: Check malloc return value. */
- analog->data = g_try_malloc(sizeof(float));
if (is_oor)
*analog->data = NAN;
else
return analog;
}
-static struct sr_datafeed_analog *handle_qm_v2(const struct sr_dev_inst *sdi,
+static struct sr_datafeed_analog *handle_qm_28x(const struct sr_dev_inst *sdi,
char **tokens)
{
struct sr_datafeed_analog *analog;
float fvalue;
- char *eptr;
- (void)sdi;
+ if (!tokens[1])
+ return NULL;
- fvalue = strtof(tokens[0], &eptr);
- if (fvalue == 0.0 && eptr == tokens[0]) {
- sr_err("Invalid float.");
+ if (sr_atof_ascii(tokens[0], &fvalue) != SR_OK || fvalue == 0.0) {
+ sr_err("Invalid float '%s'.", tokens[0]);
return NULL;
}
- /* TODO: Check malloc return value. */
- analog = g_try_malloc0(sizeof(struct sr_datafeed_analog));
+ if (!(analog = g_try_malloc0(sizeof(struct sr_datafeed_analog))))
+ return NULL;
+ if (!(analog->data = g_try_malloc(sizeof(float))))
+ return NULL;
+ analog->channels = sdi->channels;
analog->num_samples = 1;
- /* TODO: Check malloc return value. */
- analog->data = g_try_malloc(sizeof(float));
*analog->data = fvalue;
analog->mq = -1;
return analog;
}
+static void handle_qm_19x_meta(const struct sr_dev_inst *sdi, char **tokens)
+{
+ struct dev_context *devc;
+ int meas_type, meas_unit, meas_char, i;
+
+ /* Make sure we have 7 valid tokens. */
+ for (i = 0; tokens[i] && i < 7; i++);
+ if (i != 7)
+ return;
+
+ if (strcmp(tokens[1], "1"))
+ /* Invalid measurement. */
+ return;
+
+ if (strcmp(tokens[2], "3"))
+ /* Only interested in input from the meter mode source. */
+ return;
+
+ devc = sdi->priv;
+
+ /* Measurement type 11 == absolute, 19 = relative */
+ meas_type = strtol(tokens[0], NULL, 10);
+ if (meas_type != 11 && meas_type != 19)
+ /* Device is in some mode we don't support. */
+ return;
+
+ /* We might get metadata for absolute and relative mode (if the device
+ * is in relative mode). In that case, relative takes precedence. */
+ if (meas_type == 11 && devc->meas_type == 19)
+ return;
+
+ meas_unit = strtol(tokens[3], NULL, 10);
+ if (meas_unit == 0)
+ /* Device is turned off. Really. */
+ return;
+ meas_char = strtol(tokens[4], NULL, 10);
+
+ devc->mq = devc->unit = -1;
+ devc->mqflags = 0;
+ switch (meas_unit) {
+ case 1:
+ devc->mq = SR_MQ_VOLTAGE;
+ devc->unit = SR_UNIT_VOLT;
+ if (meas_char == 1)
+ devc->mqflags |= SR_MQFLAG_DC;
+ else if (meas_char == 2)
+ devc->mqflags |= SR_MQFLAG_AC;
+ else if (meas_char == 3)
+ devc->mqflags |= SR_MQFLAG_DC | SR_MQFLAG_AC;
+ else if (meas_char == 15)
+ devc->mqflags |= SR_MQFLAG_DIODE;
+ break;
+ case 2:
+ devc->mq = SR_MQ_CURRENT;
+ devc->unit = SR_UNIT_AMPERE;
+ if (meas_char == 1)
+ devc->mqflags |= SR_MQFLAG_DC;
+ else if (meas_char == 2)
+ devc->mqflags |= SR_MQFLAG_AC;
+ else if (meas_char == 3)
+ devc->mqflags |= SR_MQFLAG_DC | SR_MQFLAG_AC;
+ break;
+ case 3:
+ if (meas_char == 1) {
+ devc->mq = SR_MQ_RESISTANCE;
+ devc->unit = SR_UNIT_OHM;
+ } else if (meas_char == 16) {
+ devc->mq = SR_MQ_CONTINUITY;
+ devc->unit = SR_UNIT_BOOLEAN;
+ }
+ break;
+ case 12:
+ devc->mq = SR_MQ_TEMPERATURE;
+ devc->unit = SR_UNIT_CELSIUS;
+ break;
+ case 13:
+ devc->mq = SR_MQ_TEMPERATURE;
+ devc->unit = SR_UNIT_FAHRENHEIT;
+ break;
+ default:
+ sr_dbg("unknown unit: %d", meas_unit);
+ }
+ if (devc->mq == -1 && devc->unit == -1)
+ return;
+
+ /* If we got here, we know how to interpret the measurement. */
+ devc->meas_type = meas_type;
+ if (meas_type == 11)
+ /* Absolute meter reading. */
+ devc->is_relative = FALSE;
+ else if (!strcmp(tokens[0], "19"))
+ /* Relative meter reading. */
+ devc->is_relative = TRUE;
+
+}
+
+static void handle_qm_19x_data(const struct sr_dev_inst *sdi, char **tokens)
+{
+ struct dev_context *devc;
+ struct sr_datafeed_packet packet;
+ struct sr_datafeed_analog analog;
+ float fvalue;
+
+ if (!strcmp(tokens[0], "9.9E+37")) {
+ /* An invalid measurement shows up on the display as "OL", but
+ * comes through like this. Since comparing 38-digit floats
+ * is rather problematic, we'll cut through this here. */
+ fvalue = NAN;
+ } else {
+ if (sr_atof_ascii(tokens[0], &fvalue) != SR_OK || fvalue == 0.0) {
+ sr_err("Invalid float '%s'.", tokens[0]);
+ return;
+ }
+ }
+
+ devc = sdi->priv;
+ if (devc->mq == -1 || devc->unit == -1)
+ /* Don't have valid metadata yet. */
+ return;
+
+
+ if (devc->mq == SR_MQ_RESISTANCE && isnan(fvalue))
+ fvalue = INFINITY;
+ else if (devc->mq == SR_MQ_CONTINUITY) {
+ if (isnan(fvalue))
+ fvalue = 0.0;
+ else
+ fvalue = 1.0;
+ }
+
+ analog.channels = sdi->channels;
+ analog.num_samples = 1;
+ analog.data = &fvalue;
+ analog.mq = devc->mq;
+ analog.unit = devc->unit;
+ analog.mqflags = 0;
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ sr_session_send(devc->cb_data, &packet);
+ devc->num_samples++;
+
+}
+
static void handle_line(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog *analog;
- char **tokens;
+ int num_tokens, n, i;
+ char cmd[16], **tokens;
devc = sdi->priv;
+ serial = sdi->conn;
sr_spew("Received line '%s' (%d).", devc->buf, devc->buflen);
if (devc->buflen == 1) {
analog = NULL;
tokens = g_strsplit(devc->buf, ",", 0);
- if (tokens[0] && tokens[1]) {
- if (devc->profile->model == FLUKE_187) {
+ if (tokens[0]) {
+ if (devc->profile->model == FLUKE_187 || devc->profile->model == FLUKE_189) {
devc->expect_response = FALSE;
- analog = handle_qm_v1(sdi, tokens);
+ analog = handle_qm_18x(sdi, tokens);
} else if (devc->profile->model == FLUKE_287) {
devc->expect_response = FALSE;
- analog = handle_qm_v2(sdi, tokens);
+ analog = handle_qm_28x(sdi, tokens);
+ } else if (devc->profile->model == FLUKE_190) {
+ devc->expect_response = FALSE;
+ for (num_tokens = 0; tokens[num_tokens]; num_tokens++);
+ if (num_tokens >= 7) {
+ /* Response to QM: this is a comma-separated list of
+ * fields with metadata about the measurement. This
+ * format can return multiple sets of metadata,
+ * split into sets of 7 tokens each. */
+ devc->meas_type = 0;
+ for (i = 0; i < num_tokens; i += 7)
+ handle_qm_19x_meta(sdi, tokens + i);
+ if (devc->meas_type) {
+ /* Slip the request in now, before the main
+ * timer loop asks for metadata again. */
+ n = sprintf(cmd, "QM %d\r", devc->meas_type);
+ if (serial_write(serial, cmd, n) == -1)
+ sr_err("Unable to send QM (measurement): %s.",
+ strerror(errno));
+ }
+ } else {
+ /* Response to QM <n> measurement request. */
+ handle_qm_19x_data(sdi, tokens);
+ }
}
}
g_strfreev(tokens);
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
int len;
int64_t now, elapsed;
if (!(devc = sdi->priv))
return TRUE;
+ serial = sdi->conn;
if (revents == G_IO_IN) {
/* Serial data arrived. */
while(FLUKEDMM_BUFSIZE - devc->buflen - 1 > 0) {
- len = serial_read(devc->serial, devc->buf + devc->buflen, 1);
+ len = serial_read(serial, devc->buf + devc->buflen, 1);
if (len < 1)
break;
devc->buflen++;
}
}
- if (devc->num_samples >= devc->limit_samples) {
+ if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
sdi->driver->dev_acquisition_stop(sdi, cb_data);
return TRUE;
}
now = g_get_monotonic_time() / 1000;
elapsed = now - devc->cmd_sent_at;
/* Send query command at poll_period interval, or after 1 second
- * has elapsed. This will make it recover from any out-of-sync
- * or temporary disconnect issues. */
+ * has elapsed. This will make it easier to recover from any
+ * out-of-sync or temporary disconnect issues. */
if ((devc->expect_response == FALSE && elapsed > devc->profile->poll_period)
- || elapsed > 1000) {
- sr_spew("Sending QM.");
- if (serial_write(devc->serial, "QM\r", 3) == -1)
+ || elapsed > devc->profile->timeout) {
+ if (serial_write(serial, "QM\r", 3) == -1)
sr_err("Unable to send QM: %s.", strerror(errno));
devc->cmd_sent_at = now;
devc->expect_response = TRUE;
return TRUE;
}
-
-
projects / libsigrok.git / blobdiff