X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fappa-55ii%2Fprotocol.c;h=fabd2556678480bdbd3177e98f4929741eefb826;hb=52f6951c4e15900d4c617d886d8f8298706c9684;hp=c3a715be0076c0f27a508e3636b5d9445759ec90;hpb=81a9ab725f9ce9125c9bc22bc5ebd2903c26bc35;p=libsigrok.git diff --git a/hardware/appa-55ii/protocol.c b/hardware/appa-55ii/protocol.c index c3a715be..fabd2556 100644 --- a/hardware/appa-55ii/protocol.c +++ b/hardware/appa-55ii/protocol.c @@ -27,67 +27,90 @@ typedef enum { LOG_DATA = 0x14, LOG_START = 0x18, LOG_END = 0x19, -} PacketType; +} packet_type; static gboolean appa_55ii_checksum(const uint8_t *buf) { - int i, size = buf[3]+4, checksum = 0; - for (i=0; ipriv; + struct dev_context *devc; struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog = { 0 }; - float values[APPA_55II_NUM_PROBES], *val_ptr = values; + struct sr_datafeed_analog analog; + struct sr_probe *probe; + float values[APPA_55II_NUM_PROBES], *val_ptr; int i; + devc = sdi->priv; + if (devc->data_source != DATA_SOURCE_LIVE) return; + val_ptr = values; + memset(&analog, 0, sizeof(analog)); analog.num_samples = 1; analog.mq = SR_MQ_TEMPERATURE; analog.unit = SR_UNIT_CELSIUS; analog.mqflags = appa_55ii_flags(buf); analog.data = values; - for (i=0; iprobes, i); + for (i = 0; i < APPA_55II_NUM_PROBES; i++) { + probe = g_slist_nth_data(sdi->probes, i); if (!probe->enabled) continue; analog.probes = g_slist_append(analog.probes, probe); @@ -104,33 +127,42 @@ static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf) static void appa_55ii_log_metadata(struct sr_dev_inst *sdi, const uint8_t *buf) { - struct dev_context *devc = sdi->priv; + struct dev_context *devc; + + devc = sdi->priv; devc->num_log_records = (buf[5] << 8) + buf[4]; } static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; - int offset = 0; + struct dev_context *devc; + struct sr_datafeed_packet packet; + struct sr_datafeed_analog analog; + struct sr_probe *probe; + float values[APPA_55II_NUM_PROBES], *val_ptr; + const uint8_t *buf; + int16_t temp; + int offset, i; + + devc = sdi->priv; + offset = 0; while (devc->log_buf_len >= 20 && devc->num_log_records > 0) { - const uint8_t *buf = devc->log_buf + offset; - struct sr_datafeed_packet packet; - struct sr_datafeed_analog analog = { 0 }; - float values[APPA_55II_NUM_PROBES], *val_ptr = values; - int i; + buf = devc->log_buf + offset; + val_ptr = values; - /* FIXME: timestamp should be sent in the packet */ + /* FIXME: Timestamp should be sent in the packet. */ sr_dbg("Timestamp: %02d:%02d:%02d", buf[2], buf[3], buf[4]); + memset(&analog, 0, sizeof(analog)); analog.num_samples = 1; analog.mq = SR_MQ_TEMPERATURE; analog.unit = SR_UNIT_CELSIUS; analog.data = values; - for (i=0; iprobes, i); + for (i = 0; i < APPA_55II_NUM_PROBES; i++) { + temp = RL16(buf + 12 + 2 * i); + probe = g_slist_nth_data(sdi->probes, i); if (!probe->enabled) continue; analog.probes = g_slist_append(analog.probes, probe); @@ -153,15 +185,19 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi) static void appa_55ii_log_data(struct sr_dev_inst *sdi, const uint8_t *buf) { - struct dev_context *devc = sdi->priv; - const uint8_t *ptr = buf + 4;; - unsigned int size = buf[3]; + struct dev_context *devc; + const uint8_t *ptr; + unsigned int size; + int s; + devc = sdi->priv; if (devc->data_source != DATA_SOURCE_MEMORY) return; + ptr = buf + 4; + size = buf[3]; while (size > 0) { - int s = MIN(size, sizeof(devc->log_buf) - devc->log_buf_len); + s = MIN(size, sizeof(devc->log_buf) - devc->log_buf_len); memcpy(devc->log_buf + devc->log_buf_len, ptr, s); devc->log_buf_len += s; size -= s; @@ -173,8 +209,9 @@ static void appa_55ii_log_data(struct sr_dev_inst *sdi, const uint8_t *buf) static void appa_55ii_log_end(struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; + struct dev_context *devc; + devc = sdi->priv; if (devc->data_source != DATA_SOURCE_MEMORY) return; @@ -182,26 +219,42 @@ static void appa_55ii_log_end(struct sr_dev_inst *sdi) } static const uint8_t *appa_55ii_parse_data(struct sr_dev_inst *sdi, - const uint8_t *buf, int len) + const uint8_t *buf, int len) { if (len < 5) - return NULL; /* need more data */ + /* Need more data. */ + return NULL; if (buf[0] != 0x55 || buf[1] != 0x55) - return buf + 1; /* try to re-synchronize on a packet start */ + /* Try to re-synchronize on a packet start. */ + return buf + 1; - if (len < 5+buf[3]) - return NULL; /* need more data */ + if (len < 5 + buf[3]) + /* Need more data. */ + return NULL; if (!appa_55ii_checksum(buf)) - return buf + 4 + buf[3] + 1; /* skip broken packet */ - - switch ((PacketType) buf[2]) { - case LIVE_DATA: appa_55ii_live_data(sdi, buf); break; - case LOG_METADATA: appa_55ii_log_metadata(sdi, buf); break; - case LOG_DATA: appa_55ii_log_data(sdi, buf); break; - case LOG_START: break; - case LOG_END: appa_55ii_log_end(sdi); break; + /* Skip broken packet. */ + return buf + 4 + buf[3] + 1; + + switch ((packet_type)buf[2]) { + case LIVE_DATA: + appa_55ii_live_data(sdi, buf); + break; + case LOG_METADATA: + appa_55ii_log_metadata(sdi, buf); + break; + case LOG_DATA: + appa_55ii_log_data(sdi, buf); + break; + case LOG_START: + break; + case LOG_END: + appa_55ii_log_end(sdi); + break; + default: + sr_warn("Invalid packet type: 0x%02x.", buf[2]); + break; } return buf + 4 + buf[3] + 1; @@ -212,6 +265,7 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data) struct sr_dev_inst *sdi; struct dev_context *devc; struct sr_serial_dev_inst *serial; + int64_t time; const uint8_t *ptr, *next_ptr, *end_ptr; int len; @@ -253,10 +307,11 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data) } if (devc->limit_msec) { - int64_t time = (g_get_monotonic_time() - devc->start_time) / 1000; + time = (g_get_monotonic_time() - devc->start_time) / 1000; if (time > (int64_t)devc->limit_msec) { sr_info("Requested time limit reached."); - sdi->driver->dev_acquisition_stop(sdi, devc->session_cb_data); + sdi->driver->dev_acquisition_stop(sdi, + devc->session_cb_data); return TRUE; } }