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

uni-t-dmm: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-28 17:47:22 +02:00
parent f8467403e6
commit dff60e3ccc
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hardware/uni-t-dmm/protocol.c
View File

@ -57,14 +57,17 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
struct dev_context *devc; struct dev_context *devc;
struct dmm_info *dmm; struct dmm_info *dmm;
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;
float floatval; float floatval;
void *info; void *info;
int ret; int ret;
devc = sdi->priv; devc = sdi->priv;
dmm = (struct dmm_info *)sdi->driver; 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); info = g_malloc(dmm->info_size);
/* Parse the protocol packet. */ /* Parse the protocol packet. */
@ -82,10 +85,10 @@ static void decode_packet(struct sr_dev_inst *sdi, const uint8_t *buf)
g_free(info); g_free(info);
/* Send a sample packet with one analog value. */ /* Send a sample packet with one analog value. */
analog.channels = sdi->channels; analog.meaning->channels = sdi->channels;
analog.num_samples = 1; analog.num_samples = 1;
analog.data = &floatval; analog.data = &floatval;
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);

4
src/hardware/uni-t-dmm/protocol.h
View File

@ -37,8 +37,8 @@ struct dmm_info {
int packet_size; int packet_size;
gboolean (*packet_valid)(const uint8_t *); gboolean (*packet_valid)(const uint8_t *);
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 *);
gsize info_size; gsize info_size;
}; };