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

mic-985xx: Convert to use SR_DF_ANALOG2.

This commit is contained in:
Uwe Hermann 2014-11-12 23:34:20 +01:00
parent a84a26d98a
commit 676877f6ce
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hardware/mic-985xx/protocol.c
View File

@ -93,7 +93,10 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
{ {
float temperature, humidity; float temperature, humidity;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog; struct sr_datafeed_analog2 analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
struct dev_context *devc; struct dev_context *devc;
GSList *l; GSList *l;
int ret; int ret;
@ -108,20 +111,39 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
return SR_ERR; return SR_ERR;
} }
/* Clear 'analog', otherwise it'll contain random garbage. */
memset(&analog, 0, sizeof(struct sr_datafeed_analog)); memset(&analog, 0, sizeof(struct sr_datafeed_analog));
memset(&encoding, 0, sizeof(struct sr_analog_encoding));
memset(&meaning, 0, sizeof(struct sr_analog_meaning));
memset(&spec, 0, sizeof(struct sr_analog_spec));
/* Common values for both channels. */ /* Common values for both channels. */
packet.type = SR_DF_ANALOG; packet.type = SR_DF_ANALOG2;
packet.payload = &analog; packet.payload = &analog;
analog.encoding = &encoding;
analog.meaning = &meaning;
analog.spec = &spec;
analog.num_samples = 1; analog.num_samples = 1;
encoding.unitsize = sizeof(float);
encoding.is_float = TRUE;
#ifdef WORDS_BIGENDIAN
encoding.is_bigendian = TRUE;
#else
encoding.is_bigendian = FALSE;
#endif
encoding.digits = 3; /* Values are always 3-digit numbers. */
encoding.is_digits_decimal = TRUE;
encoding.scale.p = 1;
encoding.scale.q = 1;
encoding.offset.p = 0;
encoding.offset.q = 1;
spec.spec_digits = encoding.digits;
/* Temperature. */ /* Temperature. */
l = g_slist_copy(sdi->channels); l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 1)); l = g_slist_remove_link(l, g_slist_nth(l, 1));
analog.channels = l; meaning.channels = l;
analog.mq = SR_MQ_TEMPERATURE; meaning.mq = SR_MQ_TEMPERATURE;
analog.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */ meaning.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */
analog.data = &temperature; analog.data = &temperature;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
g_slist_free(l); g_slist_free(l);
@ -130,9 +152,9 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
if (mic_devs[idx].has_humidity) { if (mic_devs[idx].has_humidity) {
l = g_slist_copy(sdi->channels); l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 0)); l = g_slist_remove_link(l, g_slist_nth(l, 0));
analog.channels = l; meaning.channels = l;
analog.mq = SR_MQ_RELATIVE_HUMIDITY; meaning.mq = SR_MQ_RELATIVE_HUMIDITY;
analog.unit = SR_UNIT_PERCENTAGE; meaning.unit = SR_UNIT_PERCENTAGE;
analog.data = &humidity; analog.data = &humidity;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
g_slist_free(l); g_slist_free(l);