#include "libsigrok-internal.h"
#include "protocol.h"
-#define SERIAL_WRITE_TIMEOUT_MS 1
-
-#define TC_POLL_PERIOD_MS 100
-#define TC_TIMEOUT_MS 1000
+#define PROBE_TO_MS 1000
+#define WRITE_TO_MS 1
+#define POLL_PERIOD_MS 100
static const char *poll_cmd = "getva";
0xa7, 0xf1, 0x06, 0x61, 0x9a, 0xb8, 0x72, 0x88,
};
-static const struct binary_analog_channel rdtech_tc_channels[] = {
- { "V", { 0 + 48, BVT_LE_UINT32, 1e-4, }, 4, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
- { "I", { 0 + 52, BVT_LE_UINT32, 1e-5, }, 5, SR_MQ_CURRENT, SR_UNIT_AMPERE },
- { "D+", { 64 + 32, BVT_LE_UINT32, 1e-2, }, 2, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
- { "D-", { 64 + 36, BVT_LE_UINT32, 1e-2, }, 2, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
- { "E0", { 64 + 12, BVT_LE_UINT32, 1e-3, }, 3, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR },
- { "E1", { 64 + 20, BVT_LE_UINT32, 1e-3, }, 3, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR },
- ALL_ZERO,
+static const struct rdtech_tc_channel_desc rdtech_tc_channels[] = {
+ { "V", { 0 + 48, BVT_LE_UINT32, 1, }, { 100, 1e6, }, 4, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
+ { "I", { 0 + 52, BVT_LE_UINT32, 1, }, { 10, 1e6, }, 5, SR_MQ_CURRENT, SR_UNIT_AMPERE },
+ { "D+", { 64 + 32, BVT_LE_UINT32, 1, }, { 10, 1e3, }, 2, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
+ { "D-", { 64 + 36, BVT_LE_UINT32, 1, }, { 10, 1e3, }, 2, SR_MQ_VOLTAGE, SR_UNIT_VOLT },
+ { "E0", { 64 + 12, BVT_LE_UINT32, 1, }, { 1, 1e3, }, 3, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR },
+ { "E1", { 64 + 20, BVT_LE_UINT32, 1, }, { 1, 1e3, }, 3, SR_MQ_ENERGY, SR_UNIT_WATT_HOUR },
};
static gboolean check_pac_crc(uint8_t *data)
int len;
uint8_t poll_pkt[TC_POLL_LEN];
- if (serial_write_blocking(serial, poll_cmd, strlen(poll_cmd),
- SERIAL_WRITE_TIMEOUT_MS) < 0) {
+ len = serial_write_blocking(serial,
+ poll_cmd, strlen(poll_cmd), WRITE_TO_MS);
+ if (len < 0) {
sr_err("Failed to send probe request.");
return SR_ERR;
}
- len = serial_read_blocking(serial, devc->buf, TC_POLL_LEN, TC_TIMEOUT_MS);
+ len = serial_read_blocking(serial, devc->buf, TC_POLL_LEN, PROBE_TO_MS);
if (len != TC_POLL_LEN) {
sr_err("Failed to read probe response.");
return SR_ERR;
}
devc->channels = rdtech_tc_channels;
+ devc->channel_count = ARRAY_SIZE(rdtech_tc_channels);
devc->dev_info.model_name = g_strndup((const char *)&poll_pkt[OFF_MODEL], LEN_MODEL);
devc->dev_info.fw_ver = g_strndup((const char *)&poll_pkt[OFF_FW_VER], LEN_FW_VER);
devc->dev_info.serial_num = read_u32le(&poll_pkt[OFF_SERIAL]);
struct dev_context *devc;
int64_t now, elapsed;
struct sr_serial_dev_inst *serial;
+ int len;
+ /*
+ * Don't send the request while receive data is being accumulated.
+ */
devc = sdi->priv;
+ if (!force && devc->buflen)
+ return SR_OK;
+
+ /*
+ * Send the request when the transmit interval was reached. Or
+ * when the caller forced the transmission.
+ */
now = g_get_monotonic_time() / 1000;
elapsed = now - devc->cmd_sent_at;
- if (!force && elapsed < TC_POLL_PERIOD_MS)
+ if (!force && elapsed < POLL_PERIOD_MS)
return SR_OK;
+ /*
+ * Transmit another measurement request. Only advance the
+ * interval after successful transmission.
+ */
serial = sdi->conn;
- if (serial_write_blocking(serial, poll_cmd, strlen(poll_cmd),
- SERIAL_WRITE_TIMEOUT_MS) < 0) {
+ len = serial_write_blocking(serial,
+ poll_cmd, strlen(poll_cmd), WRITE_TO_MS);
+ if (len < 0) {
sr_err("Unable to send poll request.");
return SR_ERR;
}
{
struct dev_context *devc;
uint8_t poll_pkt[TC_POLL_LEN];
- size_t i;
- GSList *ch;
+ size_t ch_idx;
+ const struct rdtech_tc_channel_desc *pch;
int ret;
+ float v;
devc = sdi->priv;
sr_spew("Received poll packet (len: %zu).", devc->buflen);
- if (devc->buflen != TC_POLL_LEN) {
- sr_err("Unexpected poll packet length: %zu", devc->buflen);
+ if (devc->buflen < TC_POLL_LEN) {
+ sr_err("Insufficient poll packet length: %zu", devc->buflen);
return SR_ERR_DATA;
}
return SR_ERR_DATA;
}
- i = 0;
- for (ch = sdi->channels; ch; ch = g_slist_next(ch)) {
- ret = bv_send_analog_channel(sdi, ch->data,
- &devc->channels[i], poll_pkt, TC_POLL_LEN);
- i++;
+ ret = SR_OK;
+ std_session_send_df_frame_begin(sdi);
+ for (ch_idx = 0; ch_idx < devc->channel_count; ch_idx++) {
+ pch = &devc->channels[ch_idx];
+ ret = bv_get_value(&v, &pch->spec, poll_pkt, TC_POLL_LEN);
if (ret != SR_OK)
- return ret;
+ break;
+ ret = feed_queue_analog_submit(devc->feeds[ch_idx], v, 1);
+ if (ret != SR_OK)
+ break;
}
+ std_session_send_df_frame_end(sdi);
- sr_sw_limits_update_samples_read(&devc->limits, 1);
+ sr_sw_limits_update_frames_read(&devc->limits, 1);
if (sr_sw_limits_check(&devc->limits))
sr_dev_acquisition_stop(sdi);
- return SR_OK;
+ return ret;
}
static int recv_poll_data(struct sr_dev_inst *sdi, struct sr_serial_dev_inst *serial)
{
struct dev_context *devc;
+ size_t space;
int len;
int ret;
- /* Serial data arrived. */
+ /* Receive data became available. Drain the transport layer. */
devc = sdi->priv;
while (devc->buflen < TC_POLL_LEN) {
- len = serial_read_nonblocking(serial, devc->buf + devc->buflen, 1);
+ space = sizeof(devc->buf) - devc->buflen;
+ len = serial_read_nonblocking(serial,
+ &devc->buf[devc->buflen], space);
if (len < 0)
return SR_ERR_IO;
if (len == 0)
devc->buflen += len;
}
- if (devc->buflen == TC_POLL_LEN) {
+ /*
+ * TODO Want to (re-)synchronize to the packet stream? The
+ * 'pac1' string literal would be a perfect match for that.
+ */
+
+ /* Process packets when their reception has completed. */
+ while (devc->buflen >= TC_POLL_LEN) {
ret = handle_poll_data(sdi);
if (ret != SR_OK)
return ret;
+ devc->buflen -= TC_POLL_LEN;
+ if (devc->buflen)
+ memmove(&devc->buf[0], &devc->buf[TC_POLL_LEN], devc->buflen);
}
- devc->buflen = 0;
return SR_OK;
}
projects / libsigrok.git / blobdiff