X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fprotocol.c;h=15cdb0c234660548e714fc2e0b343fdf41845297;hb=dff60e3ccc5da17a0156d3072a0558732c4be94e;hp=f0b3997695a9591f8bf3913f1833124e50f0ecf9;hpb=f8467403e6f8656179ecd204ca75e307e4d3dfec;p=libsigrok.git diff --git a/src/hardware/uni-t-dmm/protocol.c b/src/hardware/uni-t-dmm/protocol.c index f0b39976..15cdb0c2 100644 --- a/src/hardware/uni-t-dmm/protocol.c +++ b/src/hardware/uni-t-dmm/protocol.c @@ -57,14 +57,17 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf) struct dev_context *devc; struct dmm_info *dmm; 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 floatval; void *info; int ret; devc = sdi->priv; dmm = (struct dmm_info *)sdi->driver; - memset(&analog, 0, sizeof(struct sr_datafeed_analog_old)); + sr_analog_init(&analog, &encoding, &meaning, &spec, 0); info = g_malloc(dmm->info_size); /* Parse the protocol packet. */ @@ -82,10 +85,10 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf) g_free(info); /* Send a sample packet with one analog value. */ - analog.channels = sdi->channels; + analog.meaning->channels = sdi->channels; analog.num_samples = 1; analog.data = &floatval; - packet.type = SR_DF_ANALOG_OLD; + packet.type = SR_DF_ANALOG; packet.payload = &analog; sr_session_send(sdi, &packet);