/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
*
#include <errno.h>
#include <math.h>
-
static void dispatch(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
now = g_get_monotonic_time() / 1000;
for (i = 0; (&jobs[i])->interval; i++) {
if (now - devc->jobqueue[i] > (&jobs[i])->interval) {
- sr_spew("agilent-dmm: running job %d", i);
+ sr_spew("Running job %d.", i);
(&jobs[i])->send(sdi);
devc->jobqueue[i] = now;
}
}
-
}
static void receive_line(const struct sr_dev_inst *sdi)
else
break;
}
- sr_spew("agilent-dmm: received '%s'", devc->buf);
+ sr_spew("Received '%s'.", devc->buf);
recv = NULL;
recvs = devc->profile->recvs;
g_match_info_unref(match);
g_regex_unref(reg);
} else
- sr_dbg("agilent-dmm: unknown line '%s'", devc->buf);
+ sr_dbg("Unknown line '%s'.", devc->buf);
/* Done with this. */
devc->buflen = 0;
-
}
SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
{
- const struct sr_dev_inst *sdi;
+ struct sr_dev_inst *sdi;
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
int len;
+ (void)fd;
+
if (!(sdi = cb_data))
return TRUE;
if (!(devc = sdi->priv))
return TRUE;
+ serial = sdi->conn;
if (revents == G_IO_IN) {
/* Serial data arrived. */
while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
- len = serial_read(fd, devc->buf + devc->buflen, 1);
+ len = serial_read(serial, devc->buf + devc->buflen, 1);
if (len < 1)
break;
devc->buflen += len;
dispatch(sdi);
- 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;
static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd)
{
- struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
char buf[32];
- devc = sdi->priv;
- sr_spew("agilent-dmm: sending '%s'", cmd);
+ serial = sdi->conn;
+
+ sr_spew("Sending '%s'.", cmd);
strncpy(buf, cmd, 28);
if (!strncmp(buf, "*IDN?", 5))
strncat(buf, "\r\n", 32);
else
strncat(buf, "\n\r\n", 32);
- if (serial_write(devc->serial->fd, buf, strlen(buf)) == -1) {
- sr_err("agilent-dmm: failed to send: %s", strerror(errno));
+ if (serial_write(serial, buf, strlen(buf)) == -1) {
+ sr_err("Failed to send: %s.", strerror(errno));
return SR_ERR;
}
-
+
return SR_OK;
}
static int send_stat(const struct sr_dev_inst *sdi)
{
-
return agdmm_send(sdi, "STAT?");
}
devc = sdi->priv;
s = g_match_info_fetch(match, 1);
- sr_spew("agilent-dmm: STAT response '%s'", s);
+ sr_spew("STAT response '%s'.", s);
/* Max, Min or Avg mode -- no way to tell which, so we'll
* set both flags to denote it's not a normal measurement. */
else
devc->mode_tempaux = FALSE;
- /* Continuity mode. */
+ /* Continuity mode. */
if (s[16] == '1')
devc->mode_continuity = TRUE;
else
devc = sdi->priv;
s = g_match_info_fetch(match, 1);
- sr_spew("agilent-dmm: STAT response '%s'", s);
+ sr_spew("STAT response '%s'.", s);
/* Peak hold mode. */
if (s[4] == '1')
static int send_fetc(const struct sr_dev_inst *sdi)
{
-
return agdmm_send(sdi, "FETC?");
}
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
float fvalue;
- char *mstr, *eptr;
+ char *mstr;
- sr_spew("agilent-dmm: FETC reply '%s'", g_match_info_get_string(match));
+ sr_spew("FETC reply '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
if (devc->cur_mq == -1)
return SR_OK;
if (!strcmp(g_match_info_get_string(match), "+9.90000000E+37")) {
- /* An invalid measurement shows up on the display as "O.L, but
+ /* An invalid measurement shows up on the display as "O.L", but
* comes through like this. Since comparing 38-digit floats
* is rather problematic, we'll cut through this here. */
fvalue = NAN;
} else {
mstr = g_match_info_fetch(match, 1);
- fvalue = strtof(mstr, &eptr);
- g_free(mstr);
- if (fvalue == 0.0 && eptr == mstr) {
- sr_err("agilent-dmm: invalid float");
+ if (sr_atof_ascii(mstr, &fvalue) != SR_OK || fvalue == 0.0) {
+ g_free(mstr);
+ sr_err("Invalid float.");
return SR_ERR;
}
+ g_free(mstr);
if (devc->cur_divider > 0)
fvalue /= devc->cur_divider;
}
analog.mq = devc->cur_mq;
analog.unit = devc->cur_unit;
analog.mqflags = devc->cur_mqflags;
+ analog.channels = sdi->channels;
analog.num_samples = 1;
analog.data = &fvalue;
packet.type = SR_DF_ANALOG;
static int send_conf(const struct sr_dev_inst *sdi)
{
-
return agdmm_send(sdi, "CONF?");
}
struct dev_context *devc;
char *mstr;
- sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match));
+ sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
mstr = g_match_info_fetch(match, 1);
if (!strcmp(mstr, "V")) {
devc->cur_mqflags = 0;
devc->cur_divider = 0;
} else
- sr_dbg("agilent-dmm: unknown first argument");
+ sr_dbg("Unknown first argument.");
g_free(mstr);
if (g_match_info_get_match_count(match) == 4) {
else if (!strcmp(mstr, "DC"))
devc->cur_mqflags |= SR_MQFLAG_DC;
else
- sr_dbg("agilent-dmm: unknown third argument");
+ sr_dbg("Unknown third argument.");
g_free(mstr);
} else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
struct dev_context *devc;
char *mstr;
- sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match));
+ sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
mstr = g_match_info_fetch(match, 1);
if (!strncmp(mstr, "VOLT", 4)) {
}
devc->cur_mqflags = 0;
devc->cur_divider = 0;
-} else
- sr_dbg("agilent-dmm: unknown first argument");
+ } else
+ sr_dbg("Unknown first argument.");
g_free(mstr);
-
return SR_OK;
}
struct dev_context *devc;
char *mstr;
- sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match));
+ sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
mstr = g_match_info_fetch(match, 1);
if(!strcmp(mstr, "DIOD")) {
devc->cur_mqflags = SR_MQFLAG_DIODE;
devc->cur_divider = 0;
} else
- sr_dbg("agilent-dmm: unknown single argument");
+ sr_dbg("Unknown single argument.");
g_free(mstr);
return SR_OK;
* we do need to catch this here, or it'll show up in some other output. */
static int recv_switch(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
-
(void)sdi;
- sr_spew("agilent-dmm: switch '%s'", g_match_info_get_string(match));
+ sr_spew("Switch '%s'.", g_match_info_get_string(match));
return SR_OK;
}
-
SR_PRIV const struct agdmm_job agdmm_jobs_u123x[] = {
{ 143, send_stat },
{ 1000, send_conf },
{ "^\"(DIOD)\"$", recv_conf },
{ NULL, NULL }
};
-
-
projects / libsigrok.git / blobdiff