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

kern-scale: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-14 17:10:34 +02:00
parent 246399f788
commit 563ba4a5c2
3 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/kern-scale/protocol.c
View File

@ -33,25 +33,28 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
struct scale_info *scale; struct scale_info *scale;
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;
scale = (struct scale_info *)sdi->driver; scale = (struct scale_info *)sdi->driver;
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;
scale->packet_parse(buf, &floatval, &analog, info); scale->packet_parse(buf, &floatval, &analog, info);
analog.data = &floatval; analog.data = &floatval;
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);

2
src/hardware/kern-scale/protocol.h
View File

@ -40,7 +40,7 @@ struct scale_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 *);
/** Size of chipset info struct. */ /** Size of chipset info struct. */
gsize info_size; gsize info_size;
}; };

2
src/libsigrok-internal.h
View File

@ -1327,7 +1327,7 @@ struct kern_info {
SR_PRIV gboolean sr_kern_packet_valid(const uint8_t *buf); SR_PRIV gboolean sr_kern_packet_valid(const uint8_t *buf);
SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_kern_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog_old *analog, void *info); struct sr_datafeed_analog *analog, void *info);
/*--- sw_limits.c -----------------------------------------------------------*/ /*--- sw_limits.c -----------------------------------------------------------*/