X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fprotocol.c;h=f004ec4b751531d525f22196b664d20b4632ebe3;hb=HEAD;hp=01b5eaa6c63752e7f717610303a9a8eb3c734f34;hpb=7ab126cacbcb95af49231a07c7f027a7443d9399;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/protocol.c b/src/hardware/agilent-dmm/protocol.c index 01b5eaa6..f004ec4b 100644 --- a/src/hardware/agilent-dmm/protocol.c +++ b/src/hardware/agilent-dmm/protocol.c @@ -22,36 +22,107 @@ #include #include #include +#include #include #include #include "libsigrok-internal.h" #include "protocol.h" +#define JOB_TIMEOUT 300 + +#define INFINITE_INTERVAL INT_MAX +#define SAMPLERATE_INTERVAL -1 + +static const struct agdmm_job *job_current(const struct dev_context *devc) +{ + return &devc->jobs[devc->current_job]; +} + +static void job_done(struct dev_context *devc) +{ + devc->job_running = FALSE; +} + +static void job_again(struct dev_context *devc) +{ + devc->job_again = TRUE; +} + +static gboolean job_is_running(const struct dev_context *devc) +{ + return devc->job_running; +} + +static gboolean job_in_interval(const struct dev_context *devc) +{ + int64_t job_start = devc->jobs_start[devc->current_job]; + int64_t now = g_get_monotonic_time() / 1000; + int interval = job_current(devc)->interval; + if (interval == SAMPLERATE_INTERVAL) + interval = 1000 / devc->cur_samplerate; + return (now - job_start) < interval || interval == INFINITE_INTERVAL; +} + +static gboolean job_has_timeout(const struct dev_context *devc) +{ + int64_t job_start = devc->jobs_start[devc->current_job]; + int64_t now = g_get_monotonic_time() / 1000; + return job_is_running(devc) && (now - job_start) > JOB_TIMEOUT; +} + +static const struct agdmm_job *job_next(struct dev_context *devc) +{ + int current_job = devc->current_job; + do { + devc->current_job++; + if (!job_current(devc)->send) + devc->current_job = 0; + } while (job_in_interval(devc) && devc->current_job != current_job); + return job_current(devc); +} + +static void job_run_again(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc = sdi->priv; + devc->job_again = FALSE; + devc->job_running = TRUE; + if (job_current(devc)->send(sdi) == SR_ERR_NA) + job_done(devc); +} + +static void job_run(const struct sr_dev_inst *sdi) +{ + struct dev_context *devc = sdi->priv; + int64_t now = g_get_monotonic_time() / 1000; + devc->jobs_start[devc->current_job] = now; + job_run_again(sdi); +} + static void dispatch(const struct sr_dev_inst *sdi) { - struct dev_context *devc; - const struct agdmm_job *jobs; - int64_t now; - int i; + struct dev_context *devc = sdi->priv; - devc = sdi->priv; - jobs = devc->profile->jobs; - now = g_get_monotonic_time() / 1000; - for (i = 0; (&jobs[i])->interval; i++) { - if (now - devc->jobqueue[i] > (&jobs[i])->interval) { - sr_spew("Running job %d.", i); - (&jobs[i])->send(sdi); - devc->jobqueue[i] = now; - } + if (devc->job_again) { + job_run_again(sdi); + return; } + + if (!job_is_running(devc)) + job_next(devc); + else if (job_has_timeout(devc)) + job_done(devc); + + if (!job_is_running(devc) && !job_in_interval(devc)) + job_run(sdi); } -static void receive_line(const struct sr_dev_inst *sdi) +static gboolean receive_line(const struct sr_dev_inst *sdi) { struct dev_context *devc; const struct agdmm_recv *recvs, *recv; GRegex *reg; GMatchInfo *match; + gboolean stop = FALSE; int i; devc = sdi->priv; @@ -78,7 +149,13 @@ static void receive_line(const struct sr_dev_inst *sdi) g_regex_unref(reg); } if (recv) { - recv->recv(sdi, match); + enum job_type type = recv->recv(sdi, match); + if (type == job_current(devc)->type) + job_done(devc); + else if (type == JOB_AGAIN) + job_again(devc); + else if (type == JOB_STOP) + stop = TRUE; g_match_info_unref(match); g_regex_unref(reg); } else @@ -86,6 +163,7 @@ static void receive_line(const struct sr_dev_inst *sdi) /* Done with this. */ devc->buflen = 0; + return stop; } SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data) @@ -93,6 +171,7 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data) struct sr_dev_inst *sdi; struct dev_context *devc; struct sr_serial_dev_inst *serial; + gboolean stop = FALSE; int len; (void)fd; @@ -114,16 +193,16 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data) *(devc->buf + devc->buflen) = '\0'; if (*(devc->buf + devc->buflen - 1) == '\n') { /* End of line */ - receive_line(sdi); + stop = receive_line(sdi); break; } } } - dispatch(sdi); - - if (sr_sw_limits_check(&devc->limits)) - sdi->driver->dev_acquisition_stop(sdi); + if (sr_sw_limits_check(&devc->limits) || stop) + sr_dev_acquisition_stop(sdi); + else + dispatch(sdi); return TRUE; } @@ -198,7 +277,7 @@ static int recv_stat_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) g_free(s); - return SR_OK; + return JOB_STAT; } static int recv_stat_u124x(const struct sr_dev_inst *sdi, GMatchInfo *match) @@ -230,7 +309,40 @@ static int recv_stat_u124x(const struct sr_dev_inst *sdi, GMatchInfo *match) g_free(s); - return SR_OK; + return JOB_STAT; +} + +static int recv_stat_u124xc(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[0] |= SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG; + else + devc->cur_mqflags[0] &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG); + + /* Null function. */ + if (s[1] == '1') + devc->cur_mqflags[0] |= SR_MQFLAG_RELATIVE; + else + devc->cur_mqflags[0] &= ~SR_MQFLAG_RELATIVE; + + /* Triggered or auto hold modes. */ + if (s[7] == '1' || s[11] == '1') + devc->cur_mqflags[0] |= SR_MQFLAG_HOLD; + else + devc->cur_mqflags[0] &= ~SR_MQFLAG_HOLD; + + g_free(s); + + return JOB_STAT; } static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) @@ -264,7 +376,7 @@ static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match) g_free(s); - return SR_OK; + return JOB_STAT; } static int recv_stat_u128x(const struct sr_dev_inst *sdi, GMatchInfo *match) @@ -311,16 +423,16 @@ static int recv_stat_u128x(const struct sr_dev_inst *sdi, GMatchInfo *match) g_free(s); - return SR_OK; + return JOB_STAT; } static int send_fetc(const struct sr_dev_inst *sdi) { - struct dev_context *devc; - devc = sdi->priv; + struct dev_context *devc = sdi->priv; + if (devc->mode_squarewave) - return SR_OK; - devc->cur_channel = sr_next_enabled_channel(sdi, devc->cur_channel); + return SR_ERR_NA; + if (devc->cur_channel->index > 0) return agdmm_send(sdi, "FETC? @%d", devc->cur_channel->index + 1); else @@ -335,6 +447,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) struct sr_analog_encoding encoding; struct sr_analog_meaning meaning; struct sr_analog_spec spec; + struct sr_channel *prev_chan; float fvalue; const char *s; char *mstr; @@ -345,10 +458,9 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) i = devc->cur_channel->index; if (devc->cur_mq[i] == -1) - /* Haven't seen configuration yet, so can't know what - * the fetched float means. Not really an error, we'll - * get metadata soon enough. */ - return SR_OK; + /* This detects when channel P2 is reporting TEMP as an identical + * copy of channel P3. In this case, we just skip P2. */ + goto skip_value; s = g_match_info_get_string(match); if (!strcmp(s, "-9.90000000E+37") || !strcmp(s, "+9.90000000E+37")) { @@ -395,19 +507,21 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) sr_sw_limits_update_samples_read(&devc->limits, 1); - return SR_OK; +skip_value: + prev_chan = devc->cur_channel; + devc->cur_channel = sr_next_enabled_channel(sdi, devc->cur_channel); + if (devc->cur_channel->index > prev_chan->index) + return JOB_AGAIN; + else + return JOB_FETC; } static int send_conf(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); - /* Do not try to send CONF? for internal temperature channel. */ - if (devc->cur_conf->index == MAX(devc->profile->nb_channels - 1, 1)) - devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); - if (devc->cur_conf->index == MAX(devc->profile->nb_channels - 1, 1)) + if (devc->cur_conf->index >= MIN(devc->profile->nb_channels, 2)) return SR_ERR_NA; if (devc->cur_conf->index > 0) @@ -460,6 +574,12 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_mqflags[i] = 0; devc->cur_exponent[i] = 0; devc->cur_digits[i] = 3 - resolution; + } else if (!strcmp(mstr, "MA")) { + devc->cur_mq[i] = SR_MQ_CURRENT; + devc->cur_unit[i] = SR_UNIT_AMPERE; + devc->cur_mqflags[i] = 0; + devc->cur_exponent[i] = -3; + devc->cur_digits[i] = 8 - resolution; } else if (!strcmp(mstr, "UA")) { devc->cur_mq[i] = SR_MQ_CURRENT; devc->cur_unit[i] = SR_UNIT_AMPERE; @@ -486,9 +606,15 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) } else if (!strcmp(mstr, "DIOD")) { devc->cur_mq[i] = SR_MQ_VOLTAGE; devc->cur_unit[i] = SR_UNIT_VOLT; - devc->cur_mqflags[i] = SR_MQFLAG_DIODE; + devc->cur_mqflags[i] = SR_MQFLAG_DIODE | SR_MQFLAG_DC; devc->cur_exponent[i] = 0; devc->cur_digits[i] = 3; + } else if (!strcmp(mstr, "TEMP")) { + devc->cur_mq[i] = SR_MQ_TEMPERATURE; + devc->cur_unit[i] = SR_UNIT_CELSIUS; + devc->cur_mqflags[i] = 0; + devc->cur_exponent[i] = 0; + devc->cur_digits[i] = 1; } else if (!strcmp(mstr, "CAP")) { devc->cur_mq[i] = SR_MQ_CAPACITANCE; devc->cur_unit[i] = SR_UNIT_FARAD; @@ -511,14 +637,23 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_mqflags[i] |= SR_MQFLAG_RMS; } else if (!strcmp(mstr, "DC")) { devc->cur_mqflags[i] |= SR_MQFLAG_DC; + } else if (!strcmp(mstr, "ACDC")) { + devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS; } else { - sr_dbg("Unknown first argument '%s'.", mstr); + sr_dbg("Unknown first argument '%s'.", mstr); } g_free(mstr); } else devc->cur_mqflags[i] &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC); - return SR_OK; + struct sr_channel *prev_conf = devc->cur_conf; + devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); + if (devc->cur_conf->index >= MIN(devc->profile->nb_channels, 2)) + devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); + if (devc->cur_conf->index > prev_conf->index) + return JOB_AGAIN; + else + return JOB_CONF; } static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) @@ -559,6 +694,11 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_RMS; } else if (!strncmp(mstr + 5, "DC", 2)) { devc->cur_mqflags[i] |= SR_MQFLAG_DC; + } else if (!strncmp(mstr + 5, "HRAT", 4)) { + devc->cur_mq[i] = SR_MQ_HARMONIC_RATIO; + devc->cur_unit[i] = SR_UNIT_PERCENTAGE; + devc->cur_digits[i] = 2; + devc->cur_encoding[i] = 3; } } else devc->cur_mqflags[i] |= SR_MQFLAG_DC; @@ -613,27 +753,33 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) devc->cur_encoding[i] = 4; } else if (!strcmp(mstr, "CONT")) { devc->cur_mq[i] = SR_MQ_CONTINUITY; - devc->cur_unit[i] = SR_UNIT_BOOLEAN; + devc->cur_unit[i] = SR_UNIT_OHM; devc->cur_mqflags[i] = 0; devc->cur_exponent[i] = 0; } else if (!strcmp(mstr, "DIOD")) { devc->cur_mq[i] = SR_MQ_VOLTAGE; devc->cur_unit[i] = SR_UNIT_VOLT; - devc->cur_mqflags[i] = SR_MQFLAG_DIODE; + devc->cur_mqflags[i] = SR_MQFLAG_DIODE | SR_MQFLAG_DC; devc->cur_exponent[i] = 0; - devc->cur_digits[i] = 4; - devc->cur_encoding[i] = 5; + if (devc->profile->model == KEYSIGHT_U1281 || + devc->profile->model == KEYSIGHT_U1282) { + devc->cur_digits[i] = 4; + devc->cur_encoding[i] = 5; + } else { + devc->cur_digits[i] = 3; + devc->cur_encoding[i] = 4; + } } else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2) || - !strncmp(mstr, "TEMP", 2)) { + !strncmp(mstr, "TEMP", 4)) { devc->cur_mq[i] = SR_MQ_TEMPERATURE; m2 = g_match_info_fetch(match, 2); - if (!m2) + if (!m2 && devc->profile->nb_channels == 3) /* * TEMP without param is for secondary display (channel P2) * and is identical to channel P3, so discard it. */ devc->cur_mq[i] = -1; - else if (!strcmp(m2, "FAR")) + else if (m2 && !strcmp(m2, "FAR")) devc->cur_unit[i] = SR_UNIT_FAHRENHEIT; else devc->cur_unit[i] = SR_UNIT_CELSIUS; @@ -661,12 +807,148 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) * an error in this mode, so don't even call it. */ devc->mode_squarewave = 1; + } else if (!strcmp(mstr, "NCV")) { + devc->cur_mq[i] = SR_MQ_VOLTAGE; + devc->cur_unit[i] = SR_UNIT_VOLT; + devc->cur_mqflags[i] = SR_MQFLAG_AC; + if (devc->profile->model == KEYSIGHT_U1281 || + devc->profile->model == KEYSIGHT_U1282) { + devc->cur_exponent[i] = -3; + devc->cur_digits[i] = -1; + devc->cur_encoding[i] = 0; + } else { + devc->cur_exponent[i] = 0; + devc->cur_digits[i] = 2; + devc->cur_encoding[i] = 3; + } } else { sr_dbg("Unknown first argument '%s'.", mstr); } g_free(mstr); - return SR_OK; + struct sr_channel *prev_conf = devc->cur_conf; + devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); + if (devc->cur_conf->index >= MIN(devc->profile->nb_channels, 2)) + devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); + if (devc->cur_conf->index > prev_conf->index) + return JOB_AGAIN; + else + return JOB_CONF; +} + +static int send_log(const struct sr_dev_inst *sdi) +{ + const char *source[] = { "LOG:HAND", "LOG:TRIG", "LOG:AUTO", "LOG:EXPO" }; + struct dev_context *devc = sdi->priv; + return agdmm_send(sdi, "%s %d", + source[devc->data_source - 1], devc->cur_sample); +} + +static int recv_log(const struct sr_dev_inst *sdi, GMatchInfo *match, + const int mqs[], const int units[], const int exponents[], + unsigned int num_functions) +{ + struct dev_context *devc; + 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; + char *mstr; + unsigned function; + int value, negative, overload, exponent, alternate_unit, mq, unit; + int mqflags = 0; + float fvalue; + + sr_spew("LOG response '%s'.", g_match_info_get_string(match)); + + devc = sdi->priv; + + mstr = g_match_info_fetch(match, 2); + if (sr_atoi(mstr, (int*)&function) != SR_OK || function >= num_functions) { + g_free(mstr); + sr_dbg("Invalid function."); + return SR_ERR; + } + g_free(mstr); + + mstr = g_match_info_fetch(match, 3); + if (sr_atoi(mstr, &value) != SR_OK) { + g_free(mstr); + sr_dbg("Invalid value."); + return SR_ERR; + } + g_free(mstr); + + mstr = g_match_info_fetch(match, 1); + negative = mstr[7] & 2 ? -1 : 1; + overload = mstr[8] & 4; + exponent = (mstr[9] & 0xF) + exponents[function]; + alternate_unit = mstr[10] & 1; + + if (mstr[ 8] & 1) mqflags |= SR_MQFLAG_DC; + if (mstr[ 8] & 2) mqflags |= SR_MQFLAG_AC; + if (mstr[11] & 4) mqflags |= SR_MQFLAG_RELATIVE; + if (mstr[12] & 1) mqflags |= SR_MQFLAG_AVG; + if (mstr[12] & 2) mqflags |= SR_MQFLAG_MIN; + if (mstr[12] & 4) mqflags |= SR_MQFLAG_MAX; + if (function == 5) mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC; + g_free(mstr); + + mq = mqs[function]; + unit = units[function]; + if (alternate_unit) { + if (mq == SR_MQ_RESISTANCE) + mq = SR_MQ_CONTINUITY; + if (unit == SR_UNIT_DECIBEL_MW) + unit = SR_UNIT_DECIBEL_VOLT; + if (unit == SR_UNIT_CELSIUS) { + unit = SR_UNIT_FAHRENHEIT; + if (devc->profile->model == KEYSIGHT_U1281 || + devc->profile->model == KEYSIGHT_U1282) + exponent--; + } + } + + if (overload) + fvalue = NAN; + else + fvalue = negative * value * powf(10, exponent); + + sr_analog_init(&analog, &encoding, &meaning, &spec, -exponent); + analog.meaning->mq = mq; + analog.meaning->unit = unit; + analog.meaning->mqflags = mqflags; + analog.meaning->channels = g_slist_append(NULL, devc->cur_channel); + analog.num_samples = 1; + analog.data = &fvalue; + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + sr_session_send(sdi, &packet); + g_slist_free(analog.meaning->channels); + + sr_sw_limits_update_samples_read(&devc->limits, 1); + devc->cur_sample++; + + return JOB_LOG; +} + +static int recv_log_u124xc(const struct sr_dev_inst *sdi, GMatchInfo *match) +{ + static const int mqs[] = { SR_MQ_VOLTAGE, SR_MQ_VOLTAGE, SR_MQ_CURRENT, SR_MQ_CURRENT, SR_MQ_RESISTANCE, SR_MQ_VOLTAGE, SR_MQ_TEMPERATURE, SR_MQ_CAPACITANCE, SR_MQ_FREQUENCY, SR_MQ_HARMONIC_RATIO, SR_MQ_CURRENT }; + static const int units[] = { SR_UNIT_VOLT, SR_UNIT_VOLT, SR_UNIT_AMPERE, SR_UNIT_AMPERE, SR_UNIT_OHM, SR_UNIT_VOLT, SR_UNIT_CELSIUS, SR_UNIT_FARAD, SR_UNIT_HERTZ, SR_UNIT_PERCENTAGE, SR_UNIT_PERCENTAGE }; + static const int exponents[] = { -5, -4, -7, -3, -2, -3, -1, -10, -2, -2, -2 }; + + return recv_log(sdi, match, mqs, units, exponents, ARRAY_SIZE(mqs)); +} + +static int recv_log_u128x(const struct sr_dev_inst *sdi, GMatchInfo *match) +{ + static const int mqs[] = { SR_MQ_VOLTAGE, SR_MQ_VOLTAGE, SR_MQ_CURRENT, SR_MQ_CURRENT, SR_MQ_RESISTANCE, SR_MQ_VOLTAGE, SR_MQ_TEMPERATURE, SR_MQ_CAPACITANCE, SR_MQ_FREQUENCY, SR_MQ_DUTY_CYCLE, SR_MQ_PULSE_WIDTH, SR_MQ_VOLTAGE, SR_MQ_CURRENT, SR_MQ_CONDUCTANCE }; + static const int units[] = { SR_UNIT_VOLT, SR_UNIT_VOLT, SR_UNIT_AMPERE, SR_UNIT_AMPERE, SR_UNIT_OHM, SR_UNIT_VOLT, SR_UNIT_CELSIUS, SR_UNIT_FARAD, SR_UNIT_HERTZ, SR_UNIT_PERCENTAGE, SR_UNIT_SECOND, SR_UNIT_DECIBEL_MW, SR_UNIT_PERCENTAGE, SR_UNIT_SIEMENS }; + static const int exponents[] = { -6, -4, -9, -4, -3, -4, -1, -12, -3, -3, -6, -3, -2, -11 }; + + return recv_log(sdi, match, mqs, units, exponents, ARRAY_SIZE(mqs)); } /* This comes in whenever the rotary switch is changed to a new position. @@ -675,18 +957,43 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) * 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; + struct dev_context *devc = sdi->priv; sr_spew("Switch '%s'.", g_match_info_get_string(match)); + devc->current_job = 0; + devc->job_running = FALSE; + memset(devc->jobs_start, 0, sizeof(devc->jobs_start)); + devc->cur_mq[0] = -1; + if (devc->profile->nb_channels > 2) + devc->cur_mq[1] = -1; + return SR_OK; } -/* 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 }, +static int recv_err(const struct sr_dev_inst *sdi, GMatchInfo *match) +{ + struct dev_context *devc = sdi->priv; + + (void) match; + + if (devc->data_source != DATA_SOURCE_LIVE) + return JOB_STOP; /* In log mode, stop acquisition after receiving *E. */ + else + return JOB_AGAIN; +} + +/* Poll CONF/STAT at 1Hz and values at samplerate. */ +SR_PRIV const struct agdmm_job agdmm_jobs_live[] = { + { JOB_FETC, SAMPLERATE_INTERVAL, send_fetc }, + { JOB_CONF, 1000, send_conf }, + { JOB_STAT, 1000, send_stat }, + ALL_ZERO +}; + +/* Poll LOG as fast as possible. */ +SR_PRIV const struct agdmm_job agdmm_jobs_log[] = { + { JOB_LOG, 0, send_log }, ALL_ZERO }; @@ -704,25 +1011,52 @@ 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]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(VOLT|CURR|RES|CAP|FREQ) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6,8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6,8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6,8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6,8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, + { "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, { "^\"(DIOD)\"$", recv_conf_u124x_5x }, ALL_ZERO }; +SR_PRIV const struct agdmm_recv agdmm_recvs_u124xc[] = { + { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u124xc }, + { "^\\*([0-9])$", recv_switch }, + { "^([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))$", recv_fetc }, + { "^\"(VOLT|VOLT:AC|VOLT:HRAT|CURR|CURR:AC|RES|CONT|CAP|FREQ|FREQ:AC) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, + { "^\"(NCV) (HI|LO)\"$", recv_conf_u124x_5x }, + { "^\"(DIOD|TEMP)\"$", recv_conf_u124x_5x }, + { "^\"((\\d{2})(\\d{5})\\d{7})\"$", recv_log_u124xc }, + { "^\\*E$", recv_err }, + 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|FREQ) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, - { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(VOLT|CURR|RES|CONT|COND|CAP|FREQ) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(PULS:PWID|PULS:PWID:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{6}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, - { "^\"(DIOD)\"$", recv_conf_u124x_5x }, + { "^\"(DIOD|PULS:[PN]DUT)\"$", recv_conf_u124x_5x }, + ALL_ZERO +}; + +SR_PRIV const struct agdmm_recv agdmm_recvs_u127x[] = { + { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u123x }, + { "^\\*([0-9]+)$", recv_switch }, + { "^([-+][0-9]\\.[0-9]{8}E[-+][0-9]{2})$", recv_fetc }, + { "^\"(V|MV|A|MA|UA|FREQ),(\\d),(AC|DC|ACDC)\"$", recv_conf_u123x }, + { "^\"(RES|CAP),(\\d)\"$", recv_conf_u123x}, + { "^\"(DIOD|TEMP)\"$", recv_conf_u123x }, ALL_ZERO }; @@ -730,13 +1064,16 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u128x[] = { { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u128x }, { "^\\*([0-9])$", recv_switch }, { "^([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))$", recv_fetc }, - { "^\"(VOLT|CURR|RES|COND|CAP|FREQ|FC1|FC100) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, + { "^\"(VOLT|CURR|RES|CONT|COND|CAP|FREQ|FC1|FC100) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(FREQ:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(PULS:PWID|PULS:PWID:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x }, { "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, + { "^\"(NCV) (HIGH|LOW)\"$", recv_conf_u124x_5x }, { "^\"(DIOD|SQU|PULS:PDUT|TEMP)\"$", recv_conf_u124x_5x }, + { "^\"((\\d{2})(\\d{5})\\d{7})\"$", recv_log_u128x }, + { "^\\*E$", recv_err }, ALL_ZERO };