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

korad-kaxxxxp: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-14 17:06:54 +02:00
parent 2938c9d1d3
commit 2e71534118
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hardware/korad-kaxxxxp/protocol.c
View File

@ -328,7 +328,10 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
struct dev_context *devc; struct dev_context *devc;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
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;
uint64_t elapsed_us; uint64_t elapsed_us;
(void)fd; (void)fd;
@ -345,22 +348,24 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
/* Get the value. */ /* Get the value. */
korad_kaxxxxp_get_reply(serial, devc); korad_kaxxxxp_get_reply(serial, devc);
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
/* Send the value forward. */ /* Send the value forward. */
packet.type = SR_DF_ANALOG_OLD; 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;
if (devc->target == KAXXXXP_CURRENT) { if (devc->target == KAXXXXP_CURRENT) {
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 = &devc->current; analog.data = &devc->current;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
} }
if (devc->target == KAXXXXP_VOLTAGE) { if (devc->target == KAXXXXP_VOLTAGE) {
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 = &devc->voltage; analog.data = &devc->voltage;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
sr_sw_limits_update_samples_read(&devc->limits, 1); sr_sw_limits_update_samples_read(&devc->limits, 1);