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

scpi-pps: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-28 17:46:31 +02:00
parent 94885d200d
commit 0de290a53e
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hardware/scpi-pps/protocol.c
View File

@ -58,7 +58,10 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
{ {
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;
const struct sr_dev_inst *sdi; const struct sr_dev_inst *sdi;
struct sr_channel *next_channel; struct sr_channel *next_channel;
struct sr_scpi_dev_inst *scpi; struct sr_scpi_dev_inst *scpi;
@ -80,21 +83,22 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
/* Retrieve requested value for this state. */ /* Retrieve requested value for this state. */
if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) { if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
pch = devc->cur_channel->priv; pch = devc->cur_channel->priv;
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
analog.channels = g_slist_append(NULL, devc->cur_channel); sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.meaning->channels = g_slist_append(NULL, devc->cur_channel);
analog.num_samples = 1; analog.num_samples = 1;
analog.mq = pch->mq; analog.meaning->mq = pch->mq;
if (pch->mq == SR_MQ_VOLTAGE) if (pch->mq == SR_MQ_VOLTAGE)
analog.unit = SR_UNIT_VOLT; analog.meaning->unit = SR_UNIT_VOLT;
else if (pch->mq == SR_MQ_CURRENT) else if (pch->mq == SR_MQ_CURRENT)
analog.unit = SR_UNIT_AMPERE; analog.meaning->unit = SR_UNIT_AMPERE;
else if (pch->mq == SR_MQ_POWER) else if (pch->mq == SR_MQ_POWER)
analog.unit = SR_UNIT_WATT; analog.meaning->unit = SR_UNIT_WATT;
analog.mqflags = SR_MQFLAG_DC; analog.meaning->mqflags = SR_MQFLAG_DC;
analog.data = &f; analog.data = &f;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
g_slist_free(analog.channels); g_slist_free(analog.meaning->channels);
} }
if (g_slist_length(sdi->channels) > 1) { if (g_slist_length(sdi->channels) > 1) {

4
src/hardware/scpi-pps/protocol.h
View File

@ -113,13 +113,13 @@ struct channel_group_spec {
}; };
struct pps_channel { struct pps_channel {
int mq; enum sr_mq mq;
unsigned int hw_output_idx; unsigned int hw_output_idx;
const char *hwname; const char *hwname;
}; };
struct pps_channel_instance { struct pps_channel_instance {
int mq; enum sr_mq mq;
int command; int command;
const char *prefix; const char *prefix;
}; };