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

serial-dmm: Convert to SR_DF_ANALOG.

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

15
src/hardware/serial-dmm/protocol.c
View File

@ -44,7 +44,10 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
struct dmm_info *dmm; struct dmm_info *dmm;
float floatval; float floatval;
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;
struct dev_context *devc; struct dev_context *devc;
dmm = (struct dmm_info *)sdi->driver; dmm = (struct dmm_info *)sdi->driver;
@ -52,11 +55,11 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
log_dmm_packet(buf); log_dmm_packet(buf);
devc = sdi->priv; devc = sdi->priv;
memset(&analog, 0, sizeof(struct sr_datafeed_analog_old)); sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
analog.channels = sdi->channels; analog.meaning->channels = sdi->channels;
analog.num_samples = 1; analog.num_samples = 1;
analog.mq = -1; analog.meaning->mq = 0;
dmm->packet_parse(buf, &floatval, &analog, info); dmm->packet_parse(buf, &floatval, &analog, info);
analog.data = &floatval; analog.data = &floatval;
@ -65,9 +68,9 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
if (dmm->dmm_details) if (dmm->dmm_details)
dmm->dmm_details(&analog, info); dmm->dmm_details(&analog, info);
if (analog.mq != -1) { if (analog.meaning->mq != 0) {
/* Got a measurement. */ /* Got a measurement. */
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
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);

4
src/hardware/serial-dmm/protocol.h
View File

@ -47,9 +47,9 @@ struct dmm_info {
gboolean (*packet_valid)(const uint8_t *); gboolean (*packet_valid)(const uint8_t *);
/** Packet parsing function. */ /** Packet parsing function. */
int (*packet_parse)(const uint8_t *, float *, int (*packet_parse)(const uint8_t *, float *,
struct sr_datafeed_analog_old *, void *); struct sr_datafeed_analog *, void *);
/** */ /** */
void (*dmm_details)(struct sr_datafeed_analog_old *, void *); void (*dmm_details)(struct sr_datafeed_analog *, void *);
/** Size of chipset info struct. */ /** Size of chipset info struct. */
gsize info_size; gsize info_size;
}; };