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

hung-chang-dso-2100: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-28 17:45:33 +02:00
parent ae7d8a58de
commit 99f8fa2519
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hardware/hung-chang-dso-2100/protocol.c
View File

@ -331,16 +331,12 @@ static void push_samples(const struct sr_dev_inst *sdi, uint8_t *buf, size_t num
{ {
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
float *data = devc->samples; float *data = devc->samples;
struct sr_datafeed_analog_old analog = { struct sr_datafeed_analog analog;
.channels = devc->enabled_channel, struct sr_analog_encoding encoding;
.num_samples = num, struct sr_analog_meaning meaning;
.mq = SR_MQ_VOLTAGE, struct sr_analog_spec spec;
.unit = SR_UNIT_VOLT,
.mqflags = 0,
.data = data,
};
struct sr_datafeed_packet packet = { struct sr_datafeed_packet packet = {
.type = SR_DF_ANALOG_OLD, .type = SR_DF_ANALOG,
.payload = &analog, .payload = &analog,
}; };
float factor = devc->factor; float factor = devc->factor;
@ -348,6 +344,14 @@ static void push_samples(const struct sr_dev_inst *sdi, uint8_t *buf, size_t num
while (num--) while (num--)
data[num] = (buf[num] - 0x80) * factor; data[num] = (buf[num] - 0x80) * factor;
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.meaning->channels = devc->enabled_channel;
analog.meaning->mq = SR_MQ_VOLTAGE;
analog.meaning->unit = SR_UNIT_VOLT;
analog.meaning->mqflags = 0;
analog.num_samples = num;
analog.data = data;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
} }