agilent-dmm: Convert to SR_DF_ANALOG.
This commit is contained in:
parent
d4f59ce86d
commit
16aef67634
|
@ -130,7 +130,7 @@ 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 = -1;
|
devc->cur_mq = 0;
|
||||||
sdi->inst_type = SR_INST_SERIAL;
|
sdi->inst_type = SR_INST_SERIAL;
|
||||||
sdi->conn = serial;
|
sdi->conn = serial;
|
||||||
sdi->priv = devc;
|
sdi->priv = devc;
|
||||||
|
|
|
@ -264,7 +264,10 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
|
||||||
{
|
{
|
||||||
struct dev_context *devc;
|
struct dev_context *devc;
|
||||||
struct sr_datafeed_packet packet;
|
struct sr_datafeed_packet packet;
|
||||||
struct sr_datafeed_analog_old analog;
|
struct sr_datafeed_analog analog;
|
||||||
|
struct sr_analog_encoding encoding;
|
||||||
|
struct sr_analog_meaning meaning;
|
||||||
|
struct sr_analog_spec spec;
|
||||||
float fvalue;
|
float fvalue;
|
||||||
const char *s;
|
const char *s;
|
||||||
char *mstr;
|
char *mstr;
|
||||||
|
@ -296,14 +299,14 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
|
||||||
fvalue /= devc->cur_divider;
|
fvalue /= devc->cur_divider;
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
|
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
|
||||||
analog.mq = devc->cur_mq;
|
analog.meaning->mq = devc->cur_mq;
|
||||||
analog.unit = devc->cur_unit;
|
analog.meaning->unit = devc->cur_unit;
|
||||||
analog.mqflags = devc->cur_mqflags;
|
analog.meaning->mqflags = devc->cur_mqflags;
|
||||||
analog.channels = sdi->channels;
|
analog.meaning->channels = sdi->channels;
|
||||||
analog.num_samples = 1;
|
analog.num_samples = 1;
|
||||||
analog.data = &fvalue;
|
analog.data = &fvalue;
|
||||||
packet.type = SR_DF_ANALOG_OLD;
|
packet.type = SR_DF_ANALOG;
|
||||||
packet.payload = &analog;
|
packet.payload = &analog;
|
||||||
sr_session_send(sdi, &packet);
|
sr_session_send(sdi, &packet);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue