BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

agilent-dmm: add support for reading secondary display and temperature

This commit is contained in:
Aurelien Jacobs 2016-09-11 18:56:52 +02:00 committed by Uwe Hermann
parent 3cc2028382
commit d822726dbf
3 changed files with 226 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/hardware/agilent-dmm/api.c
View File

@ -53,24 +53,24 @@ extern const struct agdmm_recv agdmm_recvs_u128x[];
#define SERIALCOMM "9600/8n1" #define SERIALCOMM "9600/8n1"
static const struct agdmm_profile supported_agdmm[] = { static const struct agdmm_profile supported_agdmm[] = {
{ AGILENT_U1231, "U1231A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, { AGILENT_U1231, "U1231A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x },
{ AGILENT_U1232, "U1232A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, { AGILENT_U1232, "U1232A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x },
{ AGILENT_U1233, "U1233A", agdmm_jobs_u12xx, agdmm_recvs_u123x }, { AGILENT_U1233, "U1233A", 1, agdmm_jobs_u12xx, agdmm_recvs_u123x },
{ AGILENT_U1241, "U1241A", agdmm_jobs_u12xx, agdmm_recvs_u124x }, { AGILENT_U1241, "U1241A", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x },
{ AGILENT_U1242, "U1242A", agdmm_jobs_u12xx, agdmm_recvs_u124x }, { AGILENT_U1242, "U1242A", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x },
{ AGILENT_U1241, "U1241B", agdmm_jobs_u12xx, agdmm_recvs_u124x }, { AGILENT_U1241, "U1241B", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x },
{ AGILENT_U1242, "U1242B", agdmm_jobs_u12xx, agdmm_recvs_u124x }, { AGILENT_U1242, "U1242B", 2, agdmm_jobs_u12xx, agdmm_recvs_u124x },
{ AGILENT_U1251, "U1251A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1251, "U1251A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ AGILENT_U1252, "U1252A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1252, "U1252A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ AGILENT_U1253, "U1253A", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1253, "U1253A", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ AGILENT_U1251, "U1251B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1251, "U1251B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ AGILENT_U1252, "U1252B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1252, "U1252B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ AGILENT_U1253, "U1253B", agdmm_jobs_u12xx, agdmm_recvs_u125x }, { AGILENT_U1253, "U1253B", 3, agdmm_jobs_u12xx, agdmm_recvs_u125x },
{ KEYSIGHT_U1281, "U1281A", agdmm_jobs_u12xx, agdmm_recvs_u128x }, { KEYSIGHT_U1281, "U1281A", 3, agdmm_jobs_u12xx, agdmm_recvs_u128x },
{ KEYSIGHT_U1282, "U1282A", agdmm_jobs_u12xx, agdmm_recvs_u128x }, { KEYSIGHT_U1282, "U1282A", 3, agdmm_jobs_u12xx, agdmm_recvs_u128x },
ALL_ZERO ALL_ZERO
}; };
@ -135,11 +135,21 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
devc = g_malloc0(sizeof(struct dev_context)); devc = g_malloc0(sizeof(struct dev_context));
sr_sw_limits_init(&devc->limits); sr_sw_limits_init(&devc->limits);
devc->profile = &supported_agdmm[i]; devc->profile = &supported_agdmm[i];
devc->cur_mq = 0; if (supported_agdmm[i].nb_channels > 1) {
int temp_chan = supported_agdmm[i].nb_channels - 1;
devc->cur_mq[temp_chan] = SR_MQ_TEMPERATURE;
devc->cur_unit[temp_chan] = SR_UNIT_CELSIUS;
devc->cur_digits[temp_chan] = 1;
devc->cur_encoding[temp_chan] = 2;
}
sdi->inst_type = SR_INST_SERIAL; sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial; sdi->conn = serial;
sdi->priv = devc; sdi->priv = devc;
sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
if (supported_agdmm[i].nb_channels > 1)
sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "P2");
if (supported_agdmm[i].nb_channels > 2)
sr_channel_new(sdi, 2, SR_CHANNEL_ANALOG, TRUE, "P3");
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
break; break;
} }
@ -202,6 +212,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
if (sdi->status != SR_ST_ACTIVE) if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc->cur_channel = sr_next_enabled_channel(sdi, NULL);
devc->cur_conf = sr_next_enabled_channel(sdi, NULL);
devc->cur_mq[0] = -1;
if (devc->profile->nb_channels > 2)
devc->cur_mq[1] = -1;
sr_sw_limits_acquisition_start(&devc->limits); sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi); std_session_send_df_header(sdi);

336
src/hardware/agilent-dmm/protocol.c
View File

@ -20,6 +20,7 @@
#include <config.h> #include <config.h>
#include <glib.h> #include <glib.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <libsigrok/libsigrok.h> #include <libsigrok/libsigrok.h>
@ -127,15 +128,18 @@ SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data)
return TRUE; return TRUE;
} }
static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd) static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd, ...)
{ {
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
va_list args;
char buf[32]; char buf[32];
serial = sdi->conn; serial = sdi->conn;
sr_spew("Sending '%s'.", cmd); va_start(args, cmd);
strncpy(buf, cmd, 28); vsnprintf(buf, sizeof(buf)-3, cmd, args);
va_end(args);
sr_spew("Sending '%s'.", buf);
if (!strncmp(buf, "*IDN?", 5)) if (!strncmp(buf, "*IDN?", 5))
strcat(buf, "\r\n"); strcat(buf, "\r\n");
else else
@ -165,20 +169,20 @@ static int recv_stat_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
/* Max, Min or Avg mode -- no way to tell which, so we'll /* Max, Min or Avg mode -- no way to tell which, so we'll
* set both flags to denote it's not a normal measurement. */ * set both flags to denote it's not a normal measurement. */
if (s[0] == '1') if (s[0] == '1')
devc->cur_mqflags |= SR_MQFLAG_MAX | SR_MQFLAG_MIN; devc->cur_mqflags[0] |= SR_MQFLAG_MAX | SR_MQFLAG_MIN;
else else
devc->cur_mqflags &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN); devc->cur_mqflags[0] &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN);
if (s[1] == '1') if (s[1] == '1')
devc->cur_mqflags |= SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] |= SR_MQFLAG_RELATIVE;
else else
devc->cur_mqflags &= ~SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] &= ~SR_MQFLAG_RELATIVE;
/* Triggered or auto hold modes. */ /* Triggered or auto hold modes. */
if (s[2] == '1' || s[3] == '1') if (s[2] == '1' || s[3] == '1')
devc->cur_mqflags |= SR_MQFLAG_HOLD; devc->cur_mqflags[0] |= SR_MQFLAG_HOLD;
else else
devc->cur_mqflags &= ~SR_MQFLAG_HOLD; devc->cur_mqflags[0] &= ~SR_MQFLAG_HOLD;
/* Temp/aux mode. */ /* Temp/aux mode. */
if (s[7] == '1') if (s[7] == '1')
@ -209,20 +213,20 @@ static int recv_stat_u124x(const struct sr_dev_inst *sdi, GMatchInfo *match)
/* Max, Min or Avg mode -- no way to tell which, so we'll /* Max, Min or Avg mode -- no way to tell which, so we'll
* set both flags to denote it's not a normal measurement. */ * set both flags to denote it's not a normal measurement. */
if (s[0] == '1') if (s[0] == '1')
devc->cur_mqflags |= SR_MQFLAG_MAX | SR_MQFLAG_MIN; devc->cur_mqflags[0] |= SR_MQFLAG_MAX | SR_MQFLAG_MIN;
else else
devc->cur_mqflags &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN); devc->cur_mqflags[0] &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN);
if (s[1] == '1') if (s[1] == '1')
devc->cur_mqflags |= SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] |= SR_MQFLAG_RELATIVE;
else else
devc->cur_mqflags &= ~SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] &= ~SR_MQFLAG_RELATIVE;
/* Hold mode. */ /* Hold mode. */
if (s[7] == '1') if (s[7] == '1')
devc->cur_mqflags |= SR_MQFLAG_HOLD; devc->cur_mqflags[0] |= SR_MQFLAG_HOLD;
else else
devc->cur_mqflags &= ~SR_MQFLAG_HOLD; devc->cur_mqflags[0] &= ~SR_MQFLAG_HOLD;
g_free(s); g_free(s);
@ -240,15 +244,15 @@ static int recv_stat_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
/* Peak hold mode. */ /* Peak hold mode. */
if (s[4] == '1') if (s[4] == '1')
devc->cur_mqflags |= SR_MQFLAG_MAX; devc->cur_mqflags[0] |= SR_MQFLAG_MAX;
else else
devc->cur_mqflags &= ~SR_MQFLAG_MAX; devc->cur_mqflags[0] &= ~SR_MQFLAG_MAX;
/* Triggered hold mode. */ /* Triggered hold mode. */
if (s[7] == '1') if (s[7] == '1')
devc->cur_mqflags |= SR_MQFLAG_HOLD; devc->cur_mqflags[0] |= SR_MQFLAG_HOLD;
else else
devc->cur_mqflags &= ~SR_MQFLAG_HOLD; devc->cur_mqflags[0] &= ~SR_MQFLAG_HOLD;
g_free(s); g_free(s);
@ -267,27 +271,27 @@ static int recv_stat_u128x(const struct sr_dev_inst *sdi, GMatchInfo *match)
/* Max, Min or Avg mode -- no way to tell which, so we'll /* Max, Min or Avg mode -- no way to tell which, so we'll
* set both flags to denote it's not a normal measurement. */ * set both flags to denote it's not a normal measurement. */
if (s[0] == '1') if (s[0] == '1')
devc->cur_mqflags |= SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG; devc->cur_mqflags[0] |= SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG;
else else
devc->cur_mqflags &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG); devc->cur_mqflags[0] &= ~(SR_MQFLAG_MAX | SR_MQFLAG_MIN | SR_MQFLAG_AVG);
/* Peak hold mode. */ /* Peak hold mode. */
if (s[4] == '4') if (s[4] == '4')
devc->cur_mqflags |= SR_MQFLAG_MAX; devc->cur_mqflags[0] |= SR_MQFLAG_MAX;
else else
devc->cur_mqflags &= ~SR_MQFLAG_MAX; devc->cur_mqflags[0] &= ~SR_MQFLAG_MAX;
/* Null function. */ /* Null function. */
if (s[1] == '1') if (s[1] == '1')
devc->cur_mqflags |= SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] |= SR_MQFLAG_RELATIVE;
else else
devc->cur_mqflags &= ~SR_MQFLAG_RELATIVE; devc->cur_mqflags[0] &= ~SR_MQFLAG_RELATIVE;
/* Triggered or auto hold modes. */ /* Triggered or auto hold modes. */
if (s[7] == '1' || s[11] == '1') if (s[7] == '1' || s[11] == '1')
devc->cur_mqflags |= SR_MQFLAG_HOLD; devc->cur_mqflags[0] |= SR_MQFLAG_HOLD;
else else
devc->cur_mqflags &= ~SR_MQFLAG_HOLD; devc->cur_mqflags[0] &= ~SR_MQFLAG_HOLD;
g_free(s); g_free(s);
@ -300,7 +304,11 @@ static int send_fetc(const struct sr_dev_inst *sdi)
devc = sdi->priv; devc = sdi->priv;
if (devc->mode_squarewave) if (devc->mode_squarewave)
return SR_OK; return SR_OK;
return agdmm_send(sdi, "FETC?"); devc->cur_channel = sr_next_enabled_channel(sdi, devc->cur_channel);
if (devc->cur_channel->index > 0)
return agdmm_send(sdi, "FETC? @%d", devc->cur_channel->index + 1);
else
return agdmm_send(sdi, "FETC?");
} }
static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match) static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
@ -314,11 +322,13 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
float fvalue; float fvalue;
const char *s; const char *s;
char *mstr; char *mstr;
int i;
sr_spew("FETC reply '%s'.", g_match_info_get_string(match)); sr_spew("FETC reply '%s'.", g_match_info_get_string(match));
devc = sdi->priv; devc = sdi->priv;
i = devc->cur_channel->index;
if (devc->cur_mq == -1) if (devc->cur_mq[i] == -1)
/* Haven't seen configuration yet, so can't know what /* Haven't seen configuration yet, so can't know what
* the fetched float means. Not really an error, we'll * the fetched float means. Not really an error, we'll
* get metadata soon enough. */ * get metadata soon enough. */
@ -338,22 +348,23 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
return SR_ERR; return SR_ERR;
} }
g_free(mstr); g_free(mstr);
if (devc->cur_exponent != 0) if (devc->cur_exponent[i] != 0)
fvalue *= powf(10, devc->cur_exponent); fvalue *= powf(10, devc->cur_exponent[i]);
} }
sr_analog_init(&analog, &encoding, &meaning, &spec, sr_analog_init(&analog, &encoding, &meaning, &spec,
devc->cur_digits - devc->cur_exponent); devc->cur_digits[i] - devc->cur_exponent[i]);
analog.meaning->mq = devc->cur_mq; analog.meaning->mq = devc->cur_mq[i];
analog.meaning->unit = devc->cur_unit; analog.meaning->unit = devc->cur_unit[i];
analog.meaning->mqflags = devc->cur_mqflags; analog.meaning->mqflags = devc->cur_mqflags[i];
analog.meaning->channels = sdi->channels; analog.meaning->channels = g_slist_append(NULL, devc->cur_channel);
analog.num_samples = 1; analog.num_samples = 1;
analog.data = &fvalue; analog.data = &fvalue;
encoding.digits = devc->cur_encoding - devc->cur_exponent; encoding.digits = devc->cur_encoding[i] - devc->cur_exponent[i];
packet.type = SR_DF_ANALOG; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
g_slist_free(analog.meaning->channels);
sr_sw_limits_update_samples_read(&devc->limits, 1); sr_sw_limits_update_samples_read(&devc->limits, 1);
@ -362,17 +373,31 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
static int send_conf(const struct sr_dev_inst *sdi) static int send_conf(const struct sr_dev_inst *sdi)
{ {
return agdmm_send(sdi, "CONF?"); 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))
return SR_ERR_NA;
if (devc->cur_conf->index > 0)
return agdmm_send(sdi, "CONF? @%d", devc->cur_conf->index + 1);
else
return agdmm_send(sdi, "CONF?");
} }
static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match) static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{ {
struct dev_context *devc; struct dev_context *devc;
char *mstr, *rstr; char *mstr, *rstr;
int resolution; int i, resolution;
sr_spew("CONF? response '%s'.", g_match_info_get_string(match)); sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv; devc = sdi->priv;
i = devc->cur_conf->index;
rstr = g_match_info_fetch(match, 2); rstr = g_match_info_fetch(match, 2);
if (rstr) if (rstr)
@ -381,90 +406,90 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
mstr = g_match_info_fetch(match, 1); mstr = g_match_info_fetch(match, 1);
if (!strcmp(mstr, "V")) { if (!strcmp(mstr, "V")) {
devc->cur_mq = SR_MQ_VOLTAGE; devc->cur_mq[i] = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT; devc->cur_unit[i] = SR_UNIT_VOLT;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 4 - resolution; devc->cur_digits[i] = 4 - resolution;
} else if (!strcmp(mstr, "MV")) { } else if (!strcmp(mstr, "MV")) {
if (devc->mode_tempaux) { if (devc->mode_tempaux) {
devc->cur_mq = SR_MQ_TEMPERATURE; devc->cur_mq[i] = SR_MQ_TEMPERATURE;
/* No way to detect whether Fahrenheit or Celsius /* No way to detect whether Fahrenheit or Celsius
* is used, so we'll just default to Celsius. */ * is used, so we'll just default to Celsius. */
devc->cur_unit = SR_UNIT_CELSIUS; devc->cur_unit[i] = SR_UNIT_CELSIUS;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 1; devc->cur_digits[i] = 1;
} else { } else {
devc->cur_mq = SR_MQ_VOLTAGE; devc->cur_mq[i] = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT; devc->cur_unit[i] = SR_UNIT_VOLT;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = -3; devc->cur_exponent[i] = -3;
devc->cur_digits = 5 - resolution; devc->cur_digits[i] = 5 - resolution;
} }
} else if (!strcmp(mstr, "A")) { } else if (!strcmp(mstr, "A")) {
devc->cur_mq = SR_MQ_CURRENT; devc->cur_mq[i] = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE; devc->cur_unit[i] = SR_UNIT_AMPERE;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 3 - resolution; devc->cur_digits[i] = 3 - resolution;
} else if (!strcmp(mstr, "UA")) { } else if (!strcmp(mstr, "UA")) {
devc->cur_mq = SR_MQ_CURRENT; devc->cur_mq[i] = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE; devc->cur_unit[i] = SR_UNIT_AMPERE;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = -6; devc->cur_exponent[i] = -6;
devc->cur_digits = 8 - resolution; devc->cur_digits[i] = 8 - resolution;
} else if (!strcmp(mstr, "FREQ")) { } else if (!strcmp(mstr, "FREQ")) {
devc->cur_mq = SR_MQ_FREQUENCY; devc->cur_mq[i] = SR_MQ_FREQUENCY;
devc->cur_unit = SR_UNIT_HERTZ; devc->cur_unit[i] = SR_UNIT_HERTZ;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 2 - resolution; devc->cur_digits[i] = 2 - resolution;
} else if (!strcmp(mstr, "RES")) { } else if (!strcmp(mstr, "RES")) {
if (devc->mode_continuity) { if (devc->mode_continuity) {
devc->cur_mq = SR_MQ_CONTINUITY; devc->cur_mq[i] = SR_MQ_CONTINUITY;
devc->cur_unit = SR_UNIT_BOOLEAN; devc->cur_unit[i] = SR_UNIT_BOOLEAN;
} else { } else {
devc->cur_mq = SR_MQ_RESISTANCE; devc->cur_mq[i] = SR_MQ_RESISTANCE;
devc->cur_unit = SR_UNIT_OHM; devc->cur_unit[i] = SR_UNIT_OHM;
} }
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 1 - resolution; devc->cur_digits[i] = 1 - resolution;
} else if (!strcmp(mstr, "DIOD")) { } else if (!strcmp(mstr, "DIOD")) {
devc->cur_mq = SR_MQ_VOLTAGE; devc->cur_mq[i] = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT; devc->cur_unit[i] = SR_UNIT_VOLT;
devc->cur_mqflags = SR_MQFLAG_DIODE; devc->cur_mqflags[i] = SR_MQFLAG_DIODE;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 3; devc->cur_digits[i] = 3;
} else if (!strcmp(mstr, "CAP")) { } else if (!strcmp(mstr, "CAP")) {
devc->cur_mq = SR_MQ_CAPACITANCE; devc->cur_mq[i] = SR_MQ_CAPACITANCE;
devc->cur_unit = SR_UNIT_FARAD; devc->cur_unit[i] = SR_UNIT_FARAD;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 9 - resolution; devc->cur_digits[i] = 9 - resolution;
} else } else
sr_dbg("Unknown first argument."); sr_dbg("Unknown first argument.");
g_free(mstr); g_free(mstr);
/* This is based on guess, supposing similarity with other models. */ /* This is based on guess, supposing similarity with other models. */
devc->cur_encoding = devc->cur_digits + 1; devc->cur_encoding[i] = devc->cur_digits[i] + 1;
if (g_match_info_get_match_count(match) == 4) { if (g_match_info_get_match_count(match) == 4) {
mstr = g_match_info_fetch(match, 3); mstr = g_match_info_fetch(match, 3);
/* Third value, if present, is always AC or DC. */ /* Third value, if present, is always AC or DC. */
if (!strcmp(mstr, "AC")) { if (!strcmp(mstr, "AC")) {
devc->cur_mqflags |= SR_MQFLAG_AC; devc->cur_mqflags[i] |= SR_MQFLAG_AC;
if (devc->cur_mq == SR_MQ_VOLTAGE) if (devc->cur_mq[i] == SR_MQ_VOLTAGE)
devc->cur_mqflags |= SR_MQFLAG_RMS; devc->cur_mqflags[i] |= SR_MQFLAG_RMS;
} else if (!strcmp(mstr, "DC")) { } else if (!strcmp(mstr, "DC")) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags[i] |= SR_MQFLAG_DC;
} else { } else {
sr_dbg("Unknown first argument '%s'.", mstr); sr_dbg("Unknown first argument '%s'.", mstr);
} }
g_free(mstr); g_free(mstr);
} else } else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC); devc->cur_mqflags[i] &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
return SR_OK; return SR_OK;
} }
@ -473,98 +498,105 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
{ {
struct dev_context *devc; struct dev_context *devc;
char *mstr, *rstr, *m2; char *mstr, *rstr, *m2;
int resolution; int i, resolution;
sr_spew("CONF? response '%s'.", g_match_info_get_string(match)); sr_spew("CONF? response '%s'.", g_match_info_get_string(match));
devc = sdi->priv; devc = sdi->priv;
i = devc->cur_conf->index;
devc->mode_squarewave = 0; devc->mode_squarewave = 0;
rstr = g_match_info_fetch(match, 4); rstr = g_match_info_fetch(match, 4);
if (rstr && sr_atoi(rstr, &resolution) == SR_OK) { if (rstr && sr_atoi(rstr, &resolution) == SR_OK) {
devc->cur_digits = -resolution; devc->cur_digits[i] = -resolution;
devc->cur_encoding = -resolution + 1; devc->cur_encoding[i] = -resolution + 1;
} }
g_free(rstr); g_free(rstr);
mstr = g_match_info_fetch(match, 1); mstr = g_match_info_fetch(match, 1);
if (!strncmp(mstr, "VOLT", 4)) { if (!strncmp(mstr, "VOLT", 4)) {
devc->cur_mq = SR_MQ_VOLTAGE; devc->cur_mq[i] = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT; devc->cur_unit[i] = SR_UNIT_VOLT;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
if (mstr[4] == ':') { if (mstr[4] == ':') {
if (!strncmp(mstr + 5, "ACDC", 4)) { if (!strncmp(mstr + 5, "ACDC", 4)) {
/* AC + DC offset */ /* AC + DC offset */
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS; devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "AC", 2)) { } else if (!strncmp(mstr + 5, "AC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS; devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "DC", 2)) { } else if (!strncmp(mstr + 5, "DC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags[i] |= SR_MQFLAG_DC;
} }
} else } else
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags[i] |= SR_MQFLAG_DC;
} else if (!strncmp(mstr, "CURR", 4)) { } else if (!strncmp(mstr, "CURR", 4)) {
devc->cur_mq = SR_MQ_CURRENT; devc->cur_mq[i] = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE; devc->cur_unit[i] = SR_UNIT_AMPERE;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
if (mstr[4] == ':') { if (mstr[4] == ':') {
if (!strncmp(mstr + 5, "ACDC", 4)) { if (!strncmp(mstr + 5, "ACDC", 4)) {
/* AC + DC offset */ /* AC + DC offset */
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS; devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "AC", 2)) { } else if (!strncmp(mstr + 5, "AC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS; devc->cur_mqflags[i] |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "DC", 2)) { } else if (!strncmp(mstr + 5, "DC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags[i] |= SR_MQFLAG_DC;
} }
} else } else
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags[i] |= SR_MQFLAG_DC;
} else if (!strcmp(mstr, "RES")) { } else if (!strcmp(mstr, "RES")) {
devc->cur_mq = SR_MQ_RESISTANCE; devc->cur_mq[i] = SR_MQ_RESISTANCE;
devc->cur_unit = SR_UNIT_OHM; devc->cur_unit[i] = SR_UNIT_OHM;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
} else if (!strcmp(mstr, "COND")) { } else if (!strcmp(mstr, "COND")) {
devc->cur_mq = SR_MQ_CONDUCTANCE; devc->cur_mq[i] = SR_MQ_CONDUCTANCE;
devc->cur_unit = SR_UNIT_SIEMENS; devc->cur_unit[i] = SR_UNIT_SIEMENS;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
} else if (!strcmp(mstr, "CAP")) { } else if (!strcmp(mstr, "CAP")) {
devc->cur_mq = SR_MQ_CAPACITANCE; devc->cur_mq[i] = SR_MQ_CAPACITANCE;
devc->cur_unit = SR_UNIT_FARAD; devc->cur_unit[i] = SR_UNIT_FARAD;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
} else if (!strncmp(mstr, "FREQ", 4) || !strncmp(mstr, "FC1", 3)) { } else if (!strncmp(mstr, "FREQ", 4) || !strncmp(mstr, "FC1", 3)) {
devc->cur_mq = SR_MQ_FREQUENCY; devc->cur_mq[i] = SR_MQ_FREQUENCY;
devc->cur_unit = SR_UNIT_HERTZ; devc->cur_unit[i] = SR_UNIT_HERTZ;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
} else if (!strcmp(mstr, "CONT")) { } else if (!strcmp(mstr, "CONT")) {
devc->cur_mq = SR_MQ_CONTINUITY; devc->cur_mq[i] = SR_MQ_CONTINUITY;
devc->cur_unit = SR_UNIT_BOOLEAN; devc->cur_unit[i] = SR_UNIT_BOOLEAN;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
} else if (!strcmp(mstr, "DIOD")) { } else if (!strcmp(mstr, "DIOD")) {
devc->cur_mq = SR_MQ_VOLTAGE; devc->cur_mq[i] = SR_MQ_VOLTAGE;
devc->cur_unit = SR_UNIT_VOLT; devc->cur_unit[i] = SR_UNIT_VOLT;
devc->cur_mqflags = SR_MQFLAG_DIODE; devc->cur_mqflags[i] = SR_MQFLAG_DIODE;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 4; devc->cur_digits[i] = 4;
devc->cur_encoding = 5; devc->cur_encoding[i] = 5;
} else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2) || } else if (!strncmp(mstr, "T1", 2) || !strncmp(mstr, "T2", 2) ||
!strncmp(mstr, "TEMP", 2)) { !strncmp(mstr, "TEMP", 2)) {
devc->cur_mq = SR_MQ_TEMPERATURE; devc->cur_mq[i] = SR_MQ_TEMPERATURE;
m2 = g_match_info_fetch(match, 2); m2 = g_match_info_fetch(match, 2);
if (!strcmp(m2, "FAR")) if (!m2)
devc->cur_unit = SR_UNIT_FAHRENHEIT; /*
* 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"))
devc->cur_unit[i] = SR_UNIT_FAHRENHEIT;
else else
devc->cur_unit = SR_UNIT_CELSIUS; devc->cur_unit[i] = SR_UNIT_CELSIUS;
g_free(m2); g_free(m2);
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 1; devc->cur_digits[i] = 1;
devc->cur_encoding = 2; devc->cur_encoding[i] = 2;
} else if (!strcmp(mstr, "SCOU")) { } else if (!strcmp(mstr, "SCOU")) {
/* /*
* Switch counter, not supported. Not sure what values * Switch counter, not supported. Not sure what values
@ -572,12 +604,12 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
* into libsigrok. * into libsigrok.
*/ */
} else if (!strncmp(mstr, "CPER:", 5)) { } else if (!strncmp(mstr, "CPER:", 5)) {
devc->cur_mq = SR_MQ_CURRENT; devc->cur_mq[i] = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_PERCENTAGE; devc->cur_unit[i] = SR_UNIT_PERCENTAGE;
devc->cur_mqflags = 0; devc->cur_mqflags[i] = 0;
devc->cur_exponent = 0; devc->cur_exponent[i] = 0;
devc->cur_digits = 2; devc->cur_digits[i] = 2;
devc->cur_encoding = 3; devc->cur_encoding[i] = 3;
} else if (!strcmp(mstr, "SQU")) { } else if (!strcmp(mstr, "SQU")) {
/* /*
* Square wave output, not supported. FETC just return * Square wave output, not supported. FETC just return
@ -659,6 +691,6 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u128x[] = {
{ "^\"(FREQ:[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 }, { "^\"(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 }, { "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
{ "^\"(DIOD|SQU)\"$", recv_conf_u124x_5x }, { "^\"(DIOD|SQU|TEMP)\"$", recv_conf_u124x_5x },
ALL_ZERO ALL_ZERO
}; };

17
src/hardware/agilent-dmm/protocol.h
View File

@ -22,6 +22,7 @@
#define LOG_PREFIX "agilent-dmm" #define LOG_PREFIX "agilent-dmm"
#define MAX_CHANNELS 3
#define AGDMM_BUFSIZE 256 #define AGDMM_BUFSIZE 256
/* Always USB-serial, 1ms is plenty. */ /* Always USB-serial, 1ms is plenty. */
@ -48,6 +49,7 @@ enum {
struct agdmm_profile { struct agdmm_profile {
int model; int model;
const char *modelname; const char *modelname;
int nb_channels;
const struct agdmm_job *jobs; const struct agdmm_job *jobs;
const struct agdmm_recv *recvs; const struct agdmm_recv *recvs;
}; };
@ -61,13 +63,14 @@ struct dev_context {
int64_t jobqueue[8]; int64_t jobqueue[8];
unsigned char buf[AGDMM_BUFSIZE]; unsigned char buf[AGDMM_BUFSIZE];
int buflen; int buflen;
int cur_mq; struct sr_channel *cur_channel;
int cur_unit; struct sr_channel *cur_conf;
int cur_mqflags; int cur_mq[MAX_CHANNELS];
int cur_digits; int cur_unit[MAX_CHANNELS];
int cur_encoding; int cur_mqflags[MAX_CHANNELS];
int cur_exponent; int cur_digits[MAX_CHANNELS];
int cur_acdc; int cur_encoding[MAX_CHANNELS];
int cur_exponent[MAX_CHANNELS];
int mode_tempaux; int mode_tempaux;
int mode_continuity; int mode_continuity;
int mode_squarewave; int mode_squarewave;