X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Flascar-el-usb%2Fprotocol.c;h=54b88e01b5782c9901d0d496487f9d1965ea7fb4;hb=69e19dd7691f86ac001469d1b319e1358e0d9778;hp=52e8599cb3701ed14d14e8f45935dca727860f96;hpb=b6506d5e03e67c5029525d36016936cf9c858720;p=libsigrok.git

diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c
index 52e8599c..54b88e01 100644
--- a/hardware/lascar-el-usb/protocol.c
+++ b/hardware/lascar-el-usb/protocol.c
@@ -41,11 +41,11 @@ static const struct elusb_profile profiles[] = {
 	{ 9, "EL-USB-CO", LOG_CO },
 	{ 10, "EL-USB-TC", LOG_UNSUPPORTED },
 	{ 11, "EL-USB-CO300", LOG_CO },
-	{ 12, "EL-USB-2-LCD", LOG_UNSUPPORTED },
-	{ 13, "EL-USB-2+", LOG_UNSUPPORTED },
+	{ 12, "EL-USB-2-LCD", LOG_TEMP_RH },
+	{ 13, "EL-USB-2+", LOG_TEMP_RH },
 	{ 14, "EL-USB-1-PRO", LOG_UNSUPPORTED },
 	{ 15, "EL-USB-TC-LCD", LOG_UNSUPPORTED },
-	{ 16, "EL-USB-2-LCD+", LOG_UNSUPPORTED },
+	{ 16, "EL-USB-2-LCD+", LOG_TEMP_RH },
 	{ 17, "EL-USB-5", LOG_UNSUPPORTED },
 	{ 18, "EL-USB-1-RCG", LOG_UNSUPPORTED },
 	{ 19, "EL-USB-1-LCD", LOG_UNSUPPORTED },
@@ -200,6 +200,91 @@ cleanup:
 	return config;
 }
 
+/* Currently unused. */
+SR_PRIV int lascar_save_config(libusb_device_handle *dev_hdl,
+		unsigned char *config, int configlen)
+{
+	struct drv_context *drvc;
+	struct libusb_transfer *xfer_in, *xfer_out;
+	struct timeval tv;
+	int64_t start;
+	int buflen, ret;
+	unsigned char cmd[3], buf[256];
+
+	drvc = di->priv;
+
+	if (!(xfer_in = libusb_alloc_transfer(0)) ||
+			!(xfer_out = libusb_alloc_transfer(0)))
+		return SR_ERR;
+
+	/* Flush anything the F321 still has queued. */
+	while (libusb_bulk_transfer(dev_hdl, LASCAR_EP_IN, buf, 256, &buflen,
+			5) == 0 && buflen > 0)
+		;
+	ret = SR_OK;
+
+	/* Keep a read request waiting in the wings, ready to pounce
+	 * the moment the device sends something. */
+	libusb_fill_bulk_transfer(xfer_in, dev_hdl, LASCAR_EP_IN,
+			buf, 256, mark_xfer, 0, 10000);
+	if (libusb_submit_transfer(xfer_in) != 0) {
+		ret = SR_ERR;
+		goto cleanup;
+	}
+
+	/* Request device configuration structure. */
+	cmd[0] = 0x01;
+	cmd[1] = configlen & 0xff;
+	cmd[2] = (configlen >> 8) & 0xff;
+	libusb_fill_bulk_transfer(xfer_out, dev_hdl, LASCAR_EP_OUT,
+			cmd, 3, mark_xfer, 0, 100);
+	if (libusb_submit_transfer(xfer_out) != 0) {
+		ret = SR_ERR;
+		goto cleanup;
+	}
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	while (!xfer_out->user_data) {
+		g_usleep(5000);
+		libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
+	}
+
+	libusb_fill_bulk_transfer(xfer_out, dev_hdl, LASCAR_EP_OUT,
+			config, configlen, mark_xfer, 0, 100);
+	if (libusb_submit_transfer(xfer_out) != 0) {
+		ret = SR_ERR;
+		goto cleanup;
+	}
+	while (!xfer_in->user_data || !xfer_out->user_data) {
+		g_usleep(5000);
+		libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
+	}
+
+	if (xfer_in->actual_length != 1 || buf[0] != 0xff) {
+		sr_dbg("unexpected response after transfer");
+		ret = SR_ERR;
+	}
+
+cleanup:
+	if (!xfer_in->user_data || !xfer_in->user_data) {
+		if (!xfer_in->user_data)
+			libusb_cancel_transfer(xfer_in);
+		if (!xfer_out->user_data)
+			libusb_cancel_transfer(xfer_out);
+		start = g_get_monotonic_time();
+		while (!xfer_in->user_data || !xfer_out->user_data) {
+			if (g_get_monotonic_time() - start > 10000)
+				break;
+			g_usleep(1000);
+			libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
+		}
+	}
+	libusb_free_transfer(xfer_in);
+	libusb_free_transfer(xfer_out);
+
+	return ret;
+}
+
 static struct sr_dev_inst *lascar_identify(unsigned char *config)
 {
 	struct dev_context *devc;
@@ -297,17 +382,57 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	float *temp, *rh;
 	uint16_t s;
-	int samples, samples_left, i;
+	int samples, samples_left, i, j;
 
 	devc = sdi->priv;
+	analog.probes = sdi->probes;
+
 	samples = buflen / devc->sample_size;
 	samples_left = devc->logged_samples - devc->rcvd_samples;
 	if (samples_left < samples)
 		samples = samples_left;
 	switch (devc->profile->logformat) {
 	case LOG_TEMP_RH:
-		/* TODO */
+		packet.type = SR_DF_ANALOG;
+		packet.payload = &analog;
+		analog.mqflags = 0;
+		if (!(temp = g_try_malloc(sizeof(float) * samples)))
+			break;
+		if (!(rh = g_try_malloc(sizeof(float) * samples)))
+			break;
+		for (i = 0, j = 0; i < samples; i++) {
+			/* Both Celcius and Fahrenheit stored at base -40. */
+			if (devc->temp_unit == 0)
+				/* Celcius is stored in half-degree increments. */
+				temp[j] = buf[i * 2] / 2 - 40;
+			else
+				temp[j] = buf[i * 2] - 40;
+
+			rh[j] = buf[i * 2 + 1] / 2;
+
+			if (temp[j] == 0.0 && rh[j] == 0.0)
+				/* Skip invalid measurement. */
+				continue;
+			j++;
+		}
+		analog.num_samples = j;
+
+		analog.mq = SR_MQ_TEMPERATURE;
+		if (devc->temp_unit == 1)
+			analog.unit = SR_UNIT_FAHRENHEIT;
+		else
+			analog.unit = SR_UNIT_CELSIUS;
+		analog.data = temp;
+		sr_session_send(devc->cb_data, &packet);
+
+		analog.mq = SR_MQ_RELATIVE_HUMIDITY;
+		analog.unit = SR_UNIT_PERCENTAGE;
+		analog.data = rh;
+		sr_session_send(devc->cb_data, &packet);
+		g_free(temp);
+		g_free(rh);
 		break;
 	case LOG_CO:
 		packet.type = SR_DF_ANALOG;
@@ -320,7 +445,7 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
 			break;
 		for (i = 0; i < samples; i++) {
 			s = (buf[i * 2] << 8) | buf[i * 2 + 1];
-			analog.data[i] = s * devc->co_high + devc->co_low;
+			analog.data[i] = (s * devc->co_high + devc->co_low) / 1000000;
 			if (analog.data[i] < 0.0)
 				analog.data[i] = 0.0;
 		}