X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fsched.c;h=1fe962f575aa29682c8f810dc3f0cc602b9b907c;hb=3cd4b381744eb88fd4ba32565bd408c33b431629;hp=51bf59f30ef40da6272632836957180abc4bf6f4;hpb=ee2bcdfc44f285c5a7b93fcba625409fdd25dcc3;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c index 51bf59f3..1fe962f5 100644 --- a/src/hardware/agilent-dmm/sched.c +++ b/src/hardware/agilent-dmm/sched.c @@ -18,13 +18,12 @@ */ #include -#include "libsigrok.h" -#include "libsigrok-internal.h" -#include "agilent-dmm.h" #include #include -#include #include +#include "libsigrok.h" +#include "libsigrok-internal.h" +#include "agilent-dmm.h" static void dispatch(const struct sr_dev_inst *sdi) { @@ -105,8 +104,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; @@ -137,11 +136,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; } @@ -330,11 +329,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; @@ -344,22 +343,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; @@ -369,7 +368,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; @@ -388,7 +387,7 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) } else if (!strcmp(mstr, "DC")) { devc->cur_mqflags |= SR_MQFLAG_DC; } else { - sr_dbg("Unknown third argument."); + sr_dbg("Unknown first argument '%s'.", mstr); } g_free(mstr); } else @@ -400,7 +399,7 @@ static int recv_conf_u123x(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; @@ -423,30 +422,60 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) } } 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 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."); + 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; @@ -455,7 +484,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; @@ -502,8 +531,10 @@ 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) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x }, + { "^\"(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 } }; @@ -512,8 +543,10 @@ 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_u124x_5x }, + { "^\"(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 } };