lascar-el-usb: support for EL-USB-2*

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index 68a06eb1513f33300b5e8895d8f89bdeefd8f8e9..049c7b519e35286ea0505252b39577882279c839 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -317,12 +317,20 @@ static int lascar_proc_config(const struct sr_dev_inst *sdi)
        ret = SR_OK;
        switch (devc->profile->logformat) {
        case LOG_TEMP_RH:
-               /* TODO */
+               devc->sample_size = 2;
+               devc->temp_unit = devc->config[0x2e] | (devc->config[0x2f] << 8);
+               if (devc->temp_unit != 0 && devc->temp_unit != 1) {
+                       sr_dbg("invalid temperature unit %d", devc->temp_unit);
+                       /* Default to Celcius, we're all adults here. */
+                       devc->temp_unit = 0;
+               } else
+                       sr_dbg("temperature unit is %s", devc->temp_unit
+                                       ? "Fahrenheit" : "Celcius");
                break;
        case LOG_CO:
                devc->sample_size = 2;
-               devc->co_high = binary32_le_to_float(devc->config + 36);
-               devc->co_low = binary32_le_to_float(devc->config + 40);
+               devc->co_high = binary32_le_to_float(devc->config + 0x24);
+               devc->co_low = binary32_le_to_float(devc->config + 0x28);
                sr_dbg("EL-USB-CO calibration high %f low %f", devc->co_high,
                                devc->co_low);
                break;

diff --git a/hardware/lascar-el-usb/protocol.c b/hardware/lascar-el-usb/protocol.c
index f92611dafa2a201354909fd2cac6fd41a316ddad..bcdd0b08912d3f392f80287156795f277b35cea9 100644 (file)
--- 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 },
@@ -382,8 +382,9 @@ 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;
        samples = buflen / devc->sample_size;
@@ -392,7 +393,44 @@ static void lascar_el_usb_dispatch(struct sr_dev_inst *sdi, unsigned char *buf,
                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;

diff --git a/hardware/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h
index 80d23824378955fe9a62a6f4d96627e252e75cb7..e94839419f1a040fb3a1ea3a7614bca9817c2f22 100644 (file)
--- a/hardware/lascar-el-usb/protocol.h
+++ b/hardware/lascar-el-usb/protocol.h
@@ -55,10 +55,12 @@ struct dev_context {
        unsigned int rcvd_samples;
        unsigned int limit_samples;
        /* Model-specific */
-       /* EL-USB-CO: these are something like calibration values fixed per
-        * device, used to convert the sample values to CO ppm. */
+       /* EL-USB-CO: these are something like scaling and calibration values
+        * fixed per device, used to convert the sample values to CO ppm. */
        float co_high;
        float co_low;
+       /* Temperature units as stored in the device config. */
+       int temp_unit;
 };
 
 enum {