X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fagilent-dmm%2Fprotocol.c;h=f004ec4b751531d525f22196b664d20b4632ebe3;hb=HEAD;hp=07d4453cea5b32f0375bb8a3fe7b70c98b03c109;hpb=b907d62fb83ee980abfd19912a1d055740f66fc9;p=libsigrok.git diff --git a/src/hardware/agilent-dmm/protocol.c b/src/hardware/agilent-dmm/protocol.c index 07d4453c..f004ec4b 100644 --- a/src/hardware/agilent-dmm/protocol.c +++ b/src/hardware/agilent-dmm/protocol.c @@ -35,7 +35,7 @@ static const struct agdmm_job *job_current(const struct dev_context *devc) { - return &devc->profile->jobs[devc->current_job]; + return &devc->jobs[devc->current_job]; } static void job_done(struct dev_context *devc) @@ -77,7 +77,7 @@ static const struct agdmm_job *job_next(struct dev_context *devc) devc->current_job++; if (!job_current(devc)->send) devc->current_job = 0; - } while(job_in_interval(devc) && devc->current_job != current_job); + } while (job_in_interval(devc) && devc->current_job != current_job); return job_current(devc); } @@ -116,12 +116,13 @@ static void dispatch(const struct sr_dev_inst *sdi) 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; @@ -153,6 +154,8 @@ static void receive_line(const struct sr_dev_inst *sdi) 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 @@ -160,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) @@ -167,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; @@ -188,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; } @@ -307,6 +312,39 @@ static int recv_stat_u124x(const struct sr_dev_inst *sdi, GMatchInfo *match) 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) { struct dev_context *devc; @@ -409,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; @@ -468,8 +507,8 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) sr_sw_limits_update_samples_read(&devc->limits, 1); -skip_value:; - struct sr_channel *prev_chan = devc->cur_channel; +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; @@ -482,7 +521,7 @@ static int send_conf(const struct sr_dev_inst *sdi) struct dev_context *devc = sdi->priv; /* Do not try to send CONF? for internal temperature channel. */ - 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) @@ -535,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; @@ -561,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; @@ -586,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 JOB_CONF; + 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) @@ -634,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; @@ -694,21 +759,27 @@ static int recv_conf_u124x_5x(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] = 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; @@ -736,6 +807,20 @@ 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); } @@ -743,7 +828,7 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) struct sr_channel *prev_conf = devc->cur_conf; 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)) devc->cur_conf = sr_next_enabled_channel(sdi, devc->cur_conf); if (devc->cur_conf->index > prev_conf->index) return JOB_AGAIN; @@ -751,6 +836,121 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match) 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. * We could use it to determine the major measurement mode, but we already * have the output of CONF? for that, which is more detailed. However @@ -771,14 +971,32 @@ static int recv_switch(const struct sr_dev_inst *sdi, GMatchInfo *match) return SR_OK; } +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_u12xx[] = { +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 +}; + SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = { { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u123x }, { "^\\*([0-9])$", recv_switch }, @@ -793,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 }; @@ -826,6 +1071,9 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u128x[] = { { "^\"(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 };