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

tondaj-sl-814: Convert to SR_DF_ANALOG.

This commit is contained in:
Uwe Hermann 2016-05-14 16:33:35 +02:00
parent b02bb45f4c
commit c68ade3cc7
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hardware/tondaj-sl-814/protocol.c
View File

@ -34,7 +34,7 @@ enum {
}; };
static void parse_packet(const uint8_t *buf, float *floatval, static void parse_packet(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog_old *analog) struct sr_datafeed_analog *analog)
{ {
gboolean is_a, is_fast; gboolean is_a, is_fast;
uint16_t intval; uint16_t intval;
@ -69,18 +69,18 @@ static void parse_packet(const uint8_t *buf, float *floatval,
/* The value on the display always has one digit after the comma. */ /* The value on the display always has one digit after the comma. */
*floatval /= 10; *floatval /= 10;
analog->mq = SR_MQ_SOUND_PRESSURE_LEVEL; analog->meaning->mq = SR_MQ_SOUND_PRESSURE_LEVEL;
analog->unit = SR_UNIT_DECIBEL_SPL; analog->meaning->unit = SR_UNIT_DECIBEL_SPL;
if (is_a) if (is_a)
analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A; analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_A;
else else
analog->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C; analog->meaning->mqflags |= SR_MQFLAG_SPL_FREQ_WEIGHT_C;
if (is_fast) if (is_fast)
analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F; analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_F;
else else
analog->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S; analog->meaning->mqflags |= SR_MQFLAG_SPL_TIME_WEIGHT_S;
/* TODO: How to handle level? */ /* TODO: How to handle level? */
(void)level; (void)level;
@ -89,20 +89,24 @@ static void parse_packet(const uint8_t *buf, float *floatval,
static void decode_packet(struct sr_dev_inst *sdi) static void decode_packet(struct sr_dev_inst *sdi)
{ {
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;
float floatval; float floatval;
devc = sdi->priv; devc = sdi->priv;
memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
parse_packet(devc->buf, &floatval, &analog); parse_packet(devc->buf, &floatval, &analog);
/* 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);