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

atten-pps3xxx: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-14 17:18:44 +02:00
parent 0417ada03e
commit 67eb7c6bdf
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hardware/atten-pps3xxx/protocol.c
View File

@ -37,37 +37,43 @@ static void handle_packet(const struct sr_dev_inst *sdi)
{ {
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 value, data[MAX_CHANNELS]; float value, data[MAX_CHANNELS];
int offset, i; int offset, i;
devc = sdi->priv; devc = sdi->priv;
dump_packet("received", devc->packet); dump_packet("received", devc->packet);
packet.type = SR_DF_ANALOG_OLD;
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
analog.channels = sdi->channels; analog.meaning->channels = sdi->channels;
analog.num_samples = 1; analog.num_samples = 1;
analog.mq = SR_MQ_VOLTAGE; analog.meaning->mq = SR_MQ_VOLTAGE;
analog.unit = SR_UNIT_VOLT; analog.meaning->unit = SR_UNIT_VOLT;
analog.mqflags = SR_MQFLAG_DC; analog.meaning->mqflags = SR_MQFLAG_DC;
analog.data = data; analog.data = data;
for (i = 0; i < devc->model->num_channels; i++) { for (i = 0; i < devc->model->num_channels; i++) {
offset = 2 + i * 4; offset = 2 + i * 4;
value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 100.0; value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 100.0;
analog.data[i] = value; ((float *)analog.data)[i] = value;
devc->config[i].output_voltage_last = value; devc->config[i].output_voltage_last = value;
} }
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
analog.mq = SR_MQ_CURRENT; analog.meaning->mq = SR_MQ_CURRENT;
analog.unit = SR_UNIT_AMPERE; analog.meaning->unit = SR_UNIT_AMPERE;
analog.mqflags = 0; analog.meaning->mqflags = 0;
analog.data = data; analog.data = data;
for (i = 0; i < devc->model->num_channels; i++) { for (i = 0; i < devc->model->num_channels; i++) {
offset = 4 + i * 4; offset = 4 + i * 4;
value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 1000.0; value = ((devc->packet[offset] << 8) + devc->packet[offset + 1]) / 1000.0;
analog.data[i] = value; ((float *)analog.data)[i] = value;
devc->config[i].output_current_last = value; devc->config[i].output_current_last = value;
} }
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);