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

lascar-el-usb: Use two probes for temp/humidity loggers

This commit is contained in:
Bert Vermeulen 2013-04-15 01:30:24 +02:00
parent 2150a69b76
commit 1d16675769
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hardware/lascar-el-usb/protocol.c
View File

@ -328,9 +328,23 @@ static struct sr_dev_inst *lascar_identify(unsigned char *config)
return NULL; return NULL;
sdi->driver = di; sdi->driver = di;
if (profile->logformat == LOG_TEMP_RH) {
/* Model this as two probes: temperature and humidity. */
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Temp")))
return NULL;
sdi->probes = g_slist_append(NULL, probe);
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "Hum")))
return NULL;
sdi->probes = g_slist_append(sdi->probes, probe);
} else if (profile->logformat == LOG_CO) {
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "CO")))
return NULL;
sdi->probes = g_slist_append(NULL, probe);
} else {
if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1"))) if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
return NULL; return NULL;
sdi->probes = g_slist_append(NULL, probe); sdi->probes = g_slist_append(NULL, probe);
}
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
return NULL; return NULL;
@ -384,12 +398,12 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
struct dev_context *devc; struct dev_context *devc;
struct sr_datafeed_packet packet; struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog; struct sr_datafeed_analog analog;
struct sr_probe *probe;
float *temp, *rh; float *temp, *rh;
uint16_t s; uint16_t s;
int samples, samples_left, i, j; int samples, samples_left, i, j;
devc = sdi->priv; devc = sdi->priv;
analog.probes = sdi->probes;
samples = buflen / devc->sample_size; samples = buflen / devc->sample_size;
samples_left = devc->logged_samples - devc->rcvd_samples; samples_left = devc->logged_samples - devc->rcvd_samples;
@ -421,6 +435,9 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
} }
analog.num_samples = j; analog.num_samples = j;
probe = sdi->probes->data;
if (probe->enabled) {
analog.probes = g_slist_append(NULL, probe);
analog.mq = SR_MQ_TEMPERATURE; analog.mq = SR_MQ_TEMPERATURE;
if (devc->temp_unit == 1) if (devc->temp_unit == 1)
analog.unit = SR_UNIT_FAHRENHEIT; analog.unit = SR_UNIT_FAHRENHEIT;
@ -428,17 +445,24 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
analog.unit = SR_UNIT_CELSIUS; analog.unit = SR_UNIT_CELSIUS;
analog.data = temp; analog.data = temp;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
}
probe = sdi->probes->next->data;
if (probe->enabled) {
analog.probes = g_slist_append(NULL, probe);
analog.mq = SR_MQ_RELATIVE_HUMIDITY; analog.mq = SR_MQ_RELATIVE_HUMIDITY;
analog.unit = SR_UNIT_PERCENTAGE; analog.unit = SR_UNIT_PERCENTAGE;
analog.data = rh; analog.data = rh;
sr_session_send(devc->cb_data, &packet); sr_session_send(devc->cb_data, &packet);
}
g_free(temp); g_free(temp);
g_free(rh); g_free(rh);
break; break;
case LOG_CO: case LOG_CO:
packet.type = SR_DF_ANALOG; packet.type = SR_DF_ANALOG;
packet.payload = &analog; packet.payload = &analog;
analog.probes = sdi->probes;
analog.num_samples = samples; analog.num_samples = samples;
analog.mq = SR_MQ_CARBON_MONOXIDE; analog.mq = SR_MQ_CARBON_MONOXIDE;
analog.unit = SR_UNIT_CONCENTRATION; analog.unit = SR_UNIT_CONCENTRATION;