X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fsched.c;h=c3dab0b7561c1d591a1d25e00382c6b767c535a5;hb=4b1a9d5d8641080bf10e269aa12a3fc17460365f;hp=113673052cbaa729f4fe22437087714c4b45f2cc;hpb=7c03b56443a514ce35b6be4fdfe2e9a3fac74e29;p=libsigrok.git
diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index 11367305..c3dab0b7 100644
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -17,14 +17,14 @@
* along with this program. If not, see .
*/
+#include
#include
-#include "libsigrok.h"
-#include "libsigrok-internal.h"
-#include "agilent-dmm.h"
#include
#include
-#include
#include
+#include
+#include "libsigrok-internal.h"
+#include "agilent-dmm.h"
static void dispatch(const struct sr_dev_inst *sdi)
{
@@ -105,8 +105,8 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
serial = sdi->conn;
if (revents == G_IO_IN) {
/* Serial data arrived. */
- while(AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
- len = serial_read(serial, devc->buf + devc->buflen, 1);
+ while (AGDMM_BUFSIZE - devc->buflen - 1 > 0) {
+ len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
if (len < 1)
break;
devc->buflen += len;
@@ -121,8 +121,8 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
dispatch(sdi);
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples)
- sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ if (sr_sw_limits_check(&devc->limits))
+ sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
@@ -137,11 +137,11 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd)
sr_spew("Sending '%s'.", cmd);
strncpy(buf, cmd, 28);
if (!strncmp(buf, "*IDN?", 5))
- strncat(buf, "\r\n", 32);
+ strcat(buf, "\r\n");
else
- strncat(buf, "\n\r\n", 32);
- if (serial_write(serial, buf, strlen(buf)) == -1) {
- sr_err("Failed to send: %s.", strerror(errno));
+ strcat(buf, "\n\r\n");
+ if (serial_write_blocking(serial, buf, strlen(buf), SERIAL_WRITE_TIMEOUT_MS) < (int)strlen(buf)) {
+ sr_err("Failed to send.");
return SR_ERR;
}
@@ -197,6 +197,38 @@ static int recv_stat_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
return SR_OK;
}
+static int recv_stat_u124x(const struct sr_dev_inst *sdi, GMatchInfo *match)
+{
+ struct dev_context *devc;
+ char *s;
+
+ devc = sdi->priv;
+ s = g_match_info_fetch(match, 1);
+ 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. */
+ if (s[0] == '1')
+ devc->cur_mqflags |= SR_MQFLAG_MAX | SR_MQFLAG_MIN;
+ else
+ devc->cur_mqflags &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN);
+
+ if (s[1] == '1')
+ devc->cur_mqflags |= SR_MQFLAG_RELATIVE;
+ else
+ devc->cur_mqflags &= ~SR_MQFLAG_RELATIVE;
+
+ /* Hold mode. */
+ if (s[7] == '1')
+ devc->cur_mqflags |= SR_MQFLAG_HOLD;
+ else
+ devc->cur_mqflags &= ~SR_MQFLAG_HOLD;
+
+ g_free(s);
+
+ return SR_OK;
+}
+
static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
@@ -232,8 +264,9 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog analog;
+ struct sr_datafeed_analog_old analog;
float fvalue;
+ const char *s;
char *mstr;
sr_spew("FETC reply '%s'.", g_match_info_get_string(match));
@@ -245,7 +278,8 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
* get metadata soon enough. */
return SR_OK;
- if (!strcmp(g_match_info_get_string(match), "+9.90000000E+37")) {
+ s = g_match_info_get_string(match);
+ if (!strcmp(s, "-9.90000000E+37") || !strcmp(s, "+9.90000000E+37")) {
/* 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. */
@@ -254,7 +288,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
mstr = g_match_info_fetch(match, 1);
if (sr_atof_ascii(mstr, &fvalue) != SR_OK) {
g_free(mstr);
- sr_err("Invalid float.");
+ sr_dbg("Invalid float.");
return SR_ERR;
}
g_free(mstr);
@@ -262,18 +296,18 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
fvalue /= devc->cur_divider;
}
- memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
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;
+ packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
return SR_OK;
}
@@ -296,11 +330,11 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc->cur_unit = SR_UNIT_VOLT;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else if(!strcmp(mstr, "MV")) {
+ } else if (!strcmp(mstr, "MV")) {
if (devc->mode_tempaux) {
devc->cur_mq = SR_MQ_TEMPERATURE;
- /* No way to detect whether Fahrenheit or Celcius
- * is used, so we'll just default to Celcius. */
+ /* No way to detect whether Fahrenheit or Celsius
+ * is used, so we'll just default to Celsius. */
devc->cur_unit = SR_UNIT_CELSIUS;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
@@ -310,22 +344,22 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc->cur_mqflags = 0;
devc->cur_divider = 1000;
}
- } else if(!strcmp(mstr, "A")) {
+ } else if (!strcmp(mstr, "A")) {
devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else if(!strcmp(mstr, "UA")) {
+ } else if (!strcmp(mstr, "UA")) {
devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE;
devc->cur_mqflags = 0;
devc->cur_divider = 1000000;
- } else if(!strcmp(mstr, "FREQ")) {
+ } else if (!strcmp(mstr, "FREQ")) {
devc->cur_mq = SR_MQ_FREQUENCY;
devc->cur_unit = SR_UNIT_HERTZ;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else if(!strcmp(mstr, "RES")) {
+ } else if (!strcmp(mstr, "RES")) {
if (devc->mode_continuity) {
devc->cur_mq = SR_MQ_CONTINUITY;
devc->cur_unit = SR_UNIT_BOOLEAN;
@@ -335,7 +369,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
}
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else if(!strcmp(mstr, "CAP")) {
+ } else if (!strcmp(mstr, "CAP")) {
devc->cur_mq = SR_MQ_CAPACITANCE;
devc->cur_unit = SR_UNIT_FARAD;
devc->cur_mqflags = 0;
@@ -347,12 +381,15 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
if (g_match_info_get_match_count(match) == 4) {
mstr = g_match_info_fetch(match, 3);
/* Third value, if present, is always AC or DC. */
- if (!strcmp(mstr, "AC"))
+ if (!strcmp(mstr, "AC")) {
devc->cur_mqflags |= SR_MQFLAG_AC;
- else if (!strcmp(mstr, "DC"))
+ if (devc->cur_mq == SR_MQ_VOLTAGE)
+ devc->cur_mqflags |= SR_MQFLAG_RMS;
+ } else if (!strcmp(mstr, "DC")) {
devc->cur_mqflags |= SR_MQFLAG_DC;
- else
- sr_dbg("Unknown third argument.");
+ } else {
+ sr_dbg("Unknown first argument '%s'.", mstr);
+ }
g_free(mstr);
} else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
@@ -360,10 +397,10 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
return SR_OK;
}
-static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
+static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
- char *mstr;
+ char *mstr, *m2;
sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
@@ -374,38 +411,72 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc->cur_mqflags = 0;
devc->cur_divider = 0;
if (mstr[4] == ':') {
- if (!strcmp(mstr + 4, "AC"))
- devc->cur_mqflags |= SR_MQFLAG_AC;
- else if (!strcmp(mstr + 4, "DC"))
+ if (!strncmp(mstr + 5, "AC", 2)) {
+ devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
+ } else if (!strncmp(mstr + 5, "DC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_DC;
- else
- /* "ACDC" appears as well, no idea what it means. */
+ } else if (!strncmp(mstr + 5, "ACDC", 4)) {
+ /* AC + DC offset */
+ devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
+ } else {
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
+ }
} else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
- } else if(!strcmp(mstr, "CURR")) {
+ } else if (!strcmp(mstr, "CURR")) {
devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else if(!strcmp(mstr, "RES")) {
- if (devc->mode_continuity) {
- devc->cur_mq = SR_MQ_CONTINUITY;
- devc->cur_unit = SR_UNIT_BOOLEAN;
- } else {
- devc->cur_mq = SR_MQ_RESISTANCE;
- devc->cur_unit = SR_UNIT_OHM;
- }
+ } else if (!strcmp(mstr, "RES")) {
+ devc->cur_mq = SR_MQ_RESISTANCE;
+ devc->cur_unit = SR_UNIT_OHM;
devc->cur_mqflags = 0;
devc->cur_divider = 0;
- } else
- sr_dbg("Unknown first argument.");
+ } else if (!strcmp(mstr, "CAP")) {
+ devc->cur_mq = SR_MQ_CAPACITANCE;
+ devc->cur_unit = SR_UNIT_FARAD;
+ devc->cur_mqflags = 0;
+ devc->cur_divider = 0;
+ } else if (!strcmp(mstr, "FREQ")) {
+ devc->cur_mq = SR_MQ_FREQUENCY;
+ devc->cur_unit = SR_UNIT_HERTZ;
+ devc->cur_mqflags = 0;
+ devc->cur_divider = 0;
+ } else if (!strcmp(mstr, "CONT")) {
+ devc->cur_mq = SR_MQ_CONTINUITY;
+ devc->cur_unit = SR_UNIT_BOOLEAN;
+ devc->cur_mqflags = 0;
+ devc->cur_divider = 0;
+ } else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2)) {
+ devc->cur_mq = SR_MQ_TEMPERATURE;
+ m2 = g_match_info_fetch(match, 2);
+ if (!strcmp(m2, "FAR"))
+ devc->cur_unit = SR_UNIT_FAHRENHEIT;
+ else
+ devc->cur_unit = SR_UNIT_CELSIUS;
+ g_free(m2);
+ devc->cur_mqflags = 0;
+ devc->cur_divider = 0;
+ } else if (!strcmp(mstr, "SCOU")) {
+ /*
+ * Switch counter, not supported. Not sure what values
+ * come from FETC in this mode, or how they would map
+ * into libsigrok.
+ */
+ } else if (!strncmp(mstr, "CPER:", 5)) {
+ devc->cur_mq = SR_MQ_CURRENT;
+ devc->cur_unit = SR_UNIT_PERCENTAGE;
+ devc->cur_mqflags = 0;
+ devc->cur_divider = 0;
+ } else {
+ sr_dbg("Unknown first argument '%s'.", mstr);
+ }
g_free(mstr);
return SR_OK;
}
-/* At least the 123x and 125x appear to have this. */
static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
@@ -414,7 +485,7 @@ static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *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")) {
+ if (!strcmp(mstr, "DIOD")) {
devc->cur_mq = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT;
devc->cur_mqflags = SR_MQFLAG_DIODE;
@@ -439,11 +510,12 @@ static int recv_switch(const struct sr_dev_inst *sdi, GMatchInfo *match)
return SR_OK;
}
-SR_PRIV const struct agdmm_job agdmm_jobs_u123x[] = {
+/* Poll keys/switches and values at 7Hz, mode at 1Hz. */
+SR_PRIV const struct agdmm_job agdmm_jobs_u12xx[] = {
{ 143, send_stat },
{ 1000, send_conf },
{ 143, send_fetc },
- { 0, NULL }
+ ALL_ZERO
};
SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = {
@@ -453,22 +525,29 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = {
{ "^\"(V|MV|A|UA|FREQ),(\\d),(AC|DC)\"$", recv_conf_u123x },
{ "^\"(RES|CAP),(\\d)\"$", recv_conf_u123x},
{ "^\"(DIOD)\"$", recv_conf },
- { NULL, NULL }
+ ALL_ZERO
};
-SR_PRIV const struct agdmm_job agdmm_jobs_u125x[] = {
- { 143, send_stat },
- { 1000, send_conf },
- { 143, send_fetc },
- { 0, NULL }
+SR_PRIV const struct agdmm_recv agdmm_recvs_u124x[] = {
+ { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u124x },
+ { "^\\*([0-9])$", recv_switch },
+ { "^([-+][0-9]\\.[0-9]{8}E[-+][0-9]{2})$", recv_fetc },
+ { "^\"(VOLT|CURR|RES|CAP|FREQ) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
+ { "^\"(DIOD)\"$", recv_conf },
+ ALL_ZERO
};
SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = {
{ "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u125x },
{ "^\\*([0-9])$", recv_switch },
{ "^([-+][0-9]\\.[0-9]{8}E[-+][0-9]{2})$", recv_fetc },
- { "^(VOLT|CURR|RES|CAP) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)$", recv_conf_u125x },
- { "^(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)$", recv_conf_u125x },
+ { "^\"(VOLT|CURR|RES|CAP|FREQ) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x },
+ { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
{ "^\"(DIOD)\"$", recv_conf },
- { NULL, NULL }
+ ALL_ZERO
};