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

agilent-dmm: remove IDN check at 1Hz, we just don't need it. 

Some debug message cleanup.
This commit is contained in:
Bert Vermeulen 2012-09-08 14:53:49 +02:00
parent 161a8a2726
commit 81599cc55b
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hardware/agilent-dmm/sched.c
View File

@ -145,22 +145,6 @@ static int agdmm_send(const struct sr_dev_inst *sdi, const char *cmd)
return SR_OK; return SR_OK;
} }
static int agdmm_ident_send(const struct sr_dev_inst *sdi)
{
return agdmm_send(sdi, "*IDN?");
}
static int agdmm_ident_recv(const struct sr_dev_inst *sdi, GMatchInfo *match)
{
(void)sdi;
sr_spew("got ident '%s'", g_match_info_get_string(match));
return SR_OK;
}
static int agdmm_stat_send(const struct sr_dev_inst *sdi) static int agdmm_stat_send(const struct sr_dev_inst *sdi)
{ {
@ -174,7 +158,7 @@ static int agdmm_stat_recv(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc = sdi->priv; devc = sdi->priv;
s = g_match_info_fetch(match, 1); s = g_match_info_fetch(match, 1);
sr_spew("got stat '%s'", s); sr_spew("agilent-dmm: STAT response '%s'", s);
/* 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. */
@ -277,7 +261,7 @@ SR_PRIV int agdmm_conf_recv(const struct sr_dev_inst *sdi, GMatchInfo *match)
struct dev_context *devc; struct dev_context *devc;
char *mstr; char *mstr;
sr_spew("got conf '%s'", g_match_info_get_string(match)); sr_spew("agilent-dmm: CONF? response '%s'", g_match_info_get_string(match));
devc = sdi->priv; devc = sdi->priv;
mstr = g_match_info_fetch(match, 1); mstr = g_match_info_fetch(match, 1);
if (!strcmp(mstr, "V")) { if (!strcmp(mstr, "V")) {
@ -354,19 +338,22 @@ SR_PRIV int agdmm_conf_recv(const struct sr_dev_inst *sdi, GMatchInfo *match)
return SR_OK; 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
* we do need to catch this here, or it'll show up in some other output. */
SR_PRIV int agdmm_switch_recv(const struct sr_dev_inst *sdi, GMatchInfo *match) SR_PRIV int agdmm_switch_recv(const struct sr_dev_inst *sdi, GMatchInfo *match)
{ {
(void)sdi; (void)sdi;
sr_spew("got switch '%s'", g_match_info_get_string(match)); sr_spew("agilent-dmm: switch '%s'", g_match_info_get_string(match));
return SR_OK; return SR_OK;
} }
SR_PRIV const struct agdmm_job u123x_jobs[] = { SR_PRIV const struct agdmm_job u123x_jobs[] = {
{ 1000, agdmm_ident_send },
{ 143, agdmm_stat_send }, { 143, agdmm_stat_send },
{ 1000, agdmm_conf_send }, { 1000, agdmm_conf_send },
{ 143, agdmm_fetc_send }, { 143, agdmm_fetc_send },