X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fmic-985xx%2Fprotocol.c;h=ce5f0209649e3afc00a4f4f5c6b3accf508ff7a5;hb=d405193074b11296e33acb56945978c08f2f4f98;hp=932692078ed0d34c2057896cd8fe59553d584f95;hpb=7ec5b54955118d8c1ee003a02c3334f1a0046457;p=libsigrok.git diff --git a/hardware/mic-985xx/protocol.c b/hardware/mic-985xx/protocol.c index 93269207..ce5f0209 100644 --- a/hardware/mic-985xx/protocol.c +++ b/hardware/mic-985xx/protocol.c @@ -20,12 +20,173 @@ #include "protocol.h" -SR_PRIV int mic_985xx_receive_data(int fd, int revents, void *cb_data) +static int mic_send(struct sr_serial_dev_inst *serial, const char *cmd) { - (void)fd; + int ret; + + if ((ret = serial_write(serial, cmd, strlen(cmd))) < 0) { + sr_err("Error sending '%s' command: %d.", cmd, ret); + return SR_ERR; + } + + return SR_OK; +} + +SR_PRIV int mic_cmd_get_device_info(struct sr_serial_dev_inst *serial) +{ + return mic_send(serial, "I\r"); +} + +static int mic_cmd_set_realtime_mode(struct sr_serial_dev_inst *serial) +{ + return mic_send(serial, "S 1 M 2 32 3\r"); +} + +SR_PRIV gboolean packet_valid_temp(const uint8_t *buf) +{ + if (buf[0] != 'v' || buf[1] != ' ' || buf[5] != '\r') + return FALSE; + + if (!isdigit(buf[2]) || !isdigit(buf[3]) || !isdigit(buf[4])) + return FALSE; + + return TRUE; +} + +SR_PRIV gboolean packet_valid_temp_hum(const uint8_t *buf) +{ + if (buf[0] != 'v' || buf[1] != ' ' || buf[5] != ' ' || buf[9] != '\r') + return FALSE; + + if (!isdigit(buf[2]) || !isdigit(buf[3]) || !isdigit(buf[4])) + return FALSE; + + if (!isdigit(buf[6]) || !isdigit(buf[7]) || !isdigit(buf[8])) + return FALSE; + + return TRUE; +} + +static int packet_parse(const char *buf, int idx, float *temp, float *humidity) +{ + char tmp[4]; + + /* Packet format MIC98581: "v ttt\r". */ + /* Packet format MIC98583: "v ttt hhh\r". */ - const struct sr_dev_inst *sdi; + /* TODO: Sanity check on buf. For now we assume well-formed ASCII. */ + + tmp[3] = '\0'; + + strncpy((char *)&tmp, &buf[2], 3); + *temp = g_ascii_strtoull((const char *)&tmp, NULL, 10) / 10; + + if (mic_devs[idx].has_humidity) { + strncpy((char *)&tmp, &buf[6], 3); + *humidity = g_ascii_strtoull((const char *)&tmp, NULL, 10) / 10; + } + + return SR_OK; +} + +static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx) +{ + float temperature, humidity; + struct sr_datafeed_packet packet; + struct sr_datafeed_analog analog; struct dev_context *devc; + GSList *l; + int ret; + + (void)idx; + + devc = sdi->priv; + + ret = packet_parse((const char *)buf, idx, &temperature, &humidity); + if (ret < 0) { + sr_err("Failed to parse packet."); + return SR_ERR; + } + + /* 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->channels); + l = g_slist_remove_link(l, g_slist_nth(l, 1)); + analog.channels = l; + analog.mq = SR_MQ_TEMPERATURE; + analog.unit = SR_UNIT_CELSIUS; /* TODO: Use C/F correctly. */ + analog.data = &temperature; + sr_session_send(devc->cb_data, &packet); + g_slist_free(l); + + /* Humidity. */ + if (mic_devs[idx].has_humidity) { + l = g_slist_copy(sdi->channels); + l = g_slist_remove_link(l, g_slist_nth(l, 0)); + analog.channels = l; + analog.mq = SR_MQ_RELATIVE_HUMIDITY; + analog.unit = SR_UNIT_PERCENTAGE; + analog.data = &humidity; + sr_session_send(devc->cb_data, &packet); + g_slist_free(l); + } + + devc->num_samples++; + + return SR_OK; +} + +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(serial, devc->buf + devc->buflen, len); + if (len < 1) { + sr_err("Serial port read error: %d.", len); + return; + } + + devc->buflen += len; + + /* Now look for packets in that data. */ + while ((devc->buflen - offset) >= mic_devs[idx].packet_size) { + if (mic_devs[idx].packet_valid(devc->buf + offset)) { + handle_packet(devc->buf + offset, sdi, idx); + offset += mic_devs[idx].packet_size; + } else { + offset++; + } + } + + /* If we have any data left, move it to the beginning of our buffer. */ + for (i = 0; i < devc->buflen - offset; i++) + devc->buf[i] = devc->buf[offset + i]; + devc->buflen -= offset; +} + +static int receive_data(int fd, int revents, int idx, void *cb_data) +{ + struct sr_dev_inst *sdi; + struct dev_context *devc; + int64_t t; + static gboolean first_time = TRUE; + struct sr_serial_dev_inst *serial; + + (void)fd; if (!(sdi = cb_data)) return TRUE; @@ -33,9 +194,41 @@ SR_PRIV int mic_985xx_receive_data(int fd, int revents, void *cb_data) if (!(devc = sdi->priv)) return TRUE; + serial = sdi->conn; + if (revents == G_IO_IN) { - /* TODO */ + /* New data arrived. */ + handle_new_data(sdi, idx); + } else { + /* Timeout. */ + if (first_time) { + mic_cmd_set_realtime_mode(serial); + first_time = FALSE; + } + } + + if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { + sr_info("Requested number of samples reached."); + sdi->driver->dev_acquisition_stop(sdi, cb_data); + return TRUE; + } + + if (devc->limit_msec) { + t = (g_get_monotonic_time() - devc->starttime) / 1000; + if (t > (int64_t)devc->limit_msec) { + sr_info("Requested time limit reached."); + sdi->driver->dev_acquisition_stop(sdi, cb_data); + return TRUE; + } } return TRUE; } + +#define RECEIVE_DATA(ID_UPPER) \ +SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \ + return receive_data(fd, revents, ID_UPPER, cb_data); } + +/* Driver-specific receive_data() wrappers */ +RECEIVE_DATA(MIC_98581) +RECEIVE_DATA(MIC_98583)