X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fprotocol.c;h=04800257e3e131ce9bb54735b4a7d90f936989d3;hb=2e71534118686a5c9246b907617d6fa11e352417;hp=5151e1fa251b6b1a1b27e6b7f92eee03084f1a02;hpb=2938c9d1d3506626c83b08645b8398a4bd20ac1c;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c index 5151e1fa..04800257 100644 --- a/src/hardware/korad-kaxxxxp/protocol.c +++ b/src/hardware/korad-kaxxxxp/protocol.c @@ -328,7 +328,10 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data) struct dev_context *devc; struct sr_serial_dev_inst *serial; 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; (void)fd; @@ -345,22 +348,24 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data) /* Get the value. */ korad_kaxxxxp_get_reply(serial, devc); + sr_analog_init(&analog, &encoding, &meaning, &spec, 0); + /* Send the value forward. */ - packet.type = SR_DF_ANALOG_OLD; + packet.type = SR_DF_ANALOG; packet.payload = &analog; - analog.channels = sdi->channels; + analog.meaning->channels = sdi->channels; analog.num_samples = 1; if (devc->target == KAXXXXP_CURRENT) { - analog.mq = SR_MQ_CURRENT; - analog.unit = SR_UNIT_AMPERE; - analog.mqflags = 0; + analog.meaning->mq = SR_MQ_CURRENT; + analog.meaning->unit = SR_UNIT_AMPERE; + analog.meaning->mqflags = 0; analog.data = &devc->current; sr_session_send(sdi, &packet); } if (devc->target == KAXXXXP_VOLTAGE) { - analog.mq = SR_MQ_VOLTAGE; - analog.unit = SR_UNIT_VOLT; - analog.mqflags = SR_MQFLAG_DC; + analog.meaning->mq = SR_MQ_VOLTAGE; + analog.meaning->unit = SR_UNIT_VOLT; + analog.meaning->mqflags = SR_MQFLAG_DC; analog.data = &devc->voltage; sr_session_send(sdi, &packet); sr_sw_limits_update_samples_read(&devc->limits, 1);