return SR_ERR;
}
g_free(mstr);
- if (devc->cur_divider > 0)
- fvalue /= devc->cur_divider;
+ if (devc->cur_exponent != 0)
+ fvalue *= powf(10, devc->cur_exponent);
}
- sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+ sr_analog_init(&analog, &encoding, &meaning, &spec,
+ devc->cur_digits - devc->cur_exponent);
analog.meaning->mq = devc->cur_mq;
analog.meaning->unit = devc->cur_unit;
analog.meaning->mqflags = devc->cur_mqflags;
analog.meaning->channels = sdi->channels;
analog.num_samples = 1;
analog.data = &fvalue;
+ encoding.digits = devc->cur_encoding - devc->cur_exponent;
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
sr_session_send(sdi, &packet);
static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
- char *mstr;
+ char *mstr, *rstr;
+ int resolution;
sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
+
+ rstr = g_match_info_fetch(match, 2);
+ if (rstr)
+ sr_atoi(rstr, &resolution);
+ g_free(rstr);
+
mstr = g_match_info_fetch(match, 1);
if (!strcmp(mstr, "V")) {
devc->cur_mq = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT;
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 4 - resolution;
} else if (!strcmp(mstr, "MV")) {
if (devc->mode_tempaux) {
devc->cur_mq = SR_MQ_TEMPERATURE;
* is used, so we'll just default to Celsius. */
devc->cur_unit = SR_UNIT_CELSIUS;
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 1;
} else {
devc->cur_mq = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT;
devc->cur_mqflags = 0;
- devc->cur_divider = 1000;
+ devc->cur_exponent = -3;
+ devc->cur_digits = 5 - resolution;
}
} 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;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 3 - resolution;
} 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;
+ devc->cur_exponent = -6;
+ devc->cur_digits = 8 - resolution;
} 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;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 2 - resolution;
} else if (!strcmp(mstr, "RES")) {
if (devc->mode_continuity) {
devc->cur_mq = SR_MQ_CONTINUITY;
devc->cur_unit = SR_UNIT_OHM;
}
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 1 - resolution;
+ } else if (!strcmp(mstr, "DIOD")) {
+ devc->cur_mq = SR_MQ_VOLTAGE;
+ devc->cur_unit = SR_UNIT_VOLT;
+ devc->cur_mqflags = SR_MQFLAG_DIODE;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 3;
} 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;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 9 - resolution;
} else
sr_dbg("Unknown first argument.");
g_free(mstr);
+ /* This is based on guess, supposing similarity with other models. */
+ devc->cur_encoding = devc->cur_digits + 1;
+
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. */
static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
struct dev_context *devc;
- char *mstr, *m2;
+ char *mstr, *rstr, *m2;
+ int resolution;
sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv;
- mstr = g_match_info_fetch(match, 1);
+
+ rstr = g_match_info_fetch(match, 4);
+ if (rstr && sr_atoi(rstr, &resolution) == SR_OK) {
+ devc->cur_digits = -resolution;
+ devc->cur_encoding = -resolution + 1;
+ }
+ g_free(rstr);
+
+ mstr = g_match_info_fetch(match, 1);
if (!strncmp(mstr, "VOLT", 4)) {
devc->cur_mq = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT;
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
if (mstr[4] == ':') {
- if (!strncmp(mstr + 5, "AC", 2)) {
+ if (!strncmp(mstr + 5, "ACDC", 4)) {
+ /* AC + DC offset */
+ devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
+ } else 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 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")) {
+ devc->cur_mqflags |= SR_MQFLAG_DC;
+ } else if (!strncmp(mstr, "CURR", 4)) {
devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE;
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ if (mstr[4] == ':') {
+ if (!strncmp(mstr + 5, "ACDC", 4)) {
+ /* AC + DC offset */
+ devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
+ } else 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
+ devc->cur_mqflags |= SR_MQFLAG_DC;
} 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;
+ devc->cur_exponent = 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;
+ devc->cur_exponent = 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;
+ devc->cur_exponent = 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;
+ devc->cur_exponent = 0;
+ } else if (!strcmp(mstr, "DIOD")) {
+ devc->cur_mq = SR_MQ_VOLTAGE;
+ devc->cur_unit = SR_UNIT_VOLT;
+ devc->cur_mqflags = SR_MQFLAG_DIODE;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 4;
+ devc->cur_encoding = 5;
} else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2)) {
devc->cur_mq = SR_MQ_TEMPERATURE;
m2 = g_match_info_fetch(match, 2);
devc->cur_unit = SR_UNIT_CELSIUS;
g_free(m2);
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 1;
+ devc->cur_encoding = 2;
} else if (!strcmp(mstr, "SCOU")) {
/*
* Switch counter, not supported. Not sure what values
devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_PERCENTAGE;
devc->cur_mqflags = 0;
- devc->cur_divider = 0;
+ devc->cur_exponent = 0;
+ devc->cur_digits = 2;
+ devc->cur_encoding = 3;
} else {
sr_dbg("Unknown first argument '%s'.", mstr);
}
return SR_OK;
}
-static int recv_conf(const struct sr_dev_inst *sdi, GMatchInfo *match)
-{
- struct dev_context *devc;
- char *mstr;
-
- 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_mq = SR_MQ_VOLTAGE;
- devc->cur_unit = SR_UNIT_VOLT;
- devc->cur_mqflags = SR_MQFLAG_DIODE;
- devc->cur_divider = 0;
- } else
- sr_dbg("Unknown single argument.");
- g_free(mstr);
-
- return SR_OK;
-}
-
/* 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
{ "^([-+][0-9]\\.[0-9]{8}E[-+][0-9]{2})$", recv_fetc },
{ "^\"(V|MV|A|UA|FREQ),(\\d),(AC|DC)\"$", recv_conf_u123x },
{ "^\"(RES|CAP),(\\d)\"$", recv_conf_u123x},
- { "^\"(DIOD)\"$", recv_conf },
+ { "^\"(DIOD)\"$", recv_conf_u123x },
ALL_ZERO
};
{ "^\"(\\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 },
+ { "^\"(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 },
{ "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
- { "^\"(DIOD)\"$", recv_conf },
+ { "^\"(DIOD)\"$", recv_conf_u124x_5x },
ALL_ZERO
};
{ "^\"(\\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\\.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 },
+ { "^\"(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 },
{ "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
- { "^\"(DIOD)\"$", recv_conf },
+ { "^\"(DIOD)\"$", recv_conf_u124x_5x },
ALL_ZERO
};