return SR_ERR;
}
- /* Common values for both probes. */
+ /* Clear 'analog', otherwise it'll contain random garbage. */
+ memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+
+ /* Common values for both channels. */
packet.type = SR_DF_ANALOG;
packet.payload = &analog;
analog.num_samples = 1;
/* Temperature. */
- l = g_slist_copy(sdi->probes);
+ l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 1));
- analog.probes = l;
+ analog.channels = l;
analog.mq = SR_MQ_TEMPERATURE;
analog.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */
analog.data = &temperature;
/* Humidity. */
if (mic_devs[idx].has_humidity) {
- l = g_slist_copy(sdi->probes);
+ l = g_slist_copy(sdi->channels);
l = g_slist_remove_link(l, g_slist_nth(l, 0));
- analog.probes = l;
+ analog.channels = l;
analog.mq = SR_MQ_RELATIVE_HUMIDITY;
analog.unit = SR_UNIT_PERCENTAGE;
analog.data = &humidity;
static void handle_new_data(struct sr_dev_inst *sdi, int idx)
{
struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
int len, i, offset = 0;
devc = sdi->priv;
+ serial = sdi->conn;
/* Try to get as much data as the buffer can hold. */
len = SERIAL_BUFSIZE - devc->buflen;
- len = serial_read(devc->serial, devc->buf + devc->buflen, len);
+ len = serial_read(serial, devc->buf + devc->buflen, len);
if (len < 1) {
sr_err("Serial port read error: %d.", len);
return;
struct dev_context *devc;
int64_t t;
static gboolean first_time = TRUE;
+ struct sr_serial_dev_inst *serial;
(void)fd;
if (!(devc = sdi->priv))
return TRUE;
+ serial = sdi->conn;
+
if (revents == G_IO_IN) {
/* New data arrived. */
handle_new_data(sdi, idx);
} else {
/* Timeout. */
if (first_time) {
- mic_cmd_set_realtime_mode(devc->serial);
+ mic_cmd_set_realtime_mode(serial);
first_time = FALSE;
}
}