buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]);
}
-SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info)
-{
- dmm_details_tp4000zc(analog, info); /* Same as TP4000ZC. */
-}
-
-SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info)
-{
- struct fs9721_info *info_local;
-
- info_local = (struct fs9721_info *)info;
-
- /* User-defined FS9721_LP3 flag 'c2c1_10' means temperature. */
- if (info_local->is_c2c1_10) {
- analog->mq = SR_MQ_TEMPERATURE;
- analog->unit = SR_UNIT_CELSIUS;
- }
-}
-
-SR_PRIV void dmm_details_va18b(struct sr_datafeed_analog *analog, void *info)
-{
- struct fs9721_info *info_local;
-
- info_local = (struct fs9721_info *)info;
-
- /* User-defined FS9721_LP3 flag 'c2c1_01' means temperature. */
- if (info_local->is_c2c1_01) {
- analog->mq = SR_MQ_TEMPERATURE;
- analog->unit = SR_UNIT_CELSIUS;
- }
-}
-
-SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info)
-{
- struct fs9721_info *info_local;
-
- info_local = (struct fs9721_info *)info;
-
- /* User-defined FS9721_LP3 flag 'c2c1_01' means temperature (F). */
- if (info_local->is_c2c1_01) {
- analog->mq = SR_MQ_TEMPERATURE;
- analog->unit = SR_UNIT_FAHRENHEIT;
- }
-
- /* User-defined FS9721_LP3 flag 'c2c1_10' means temperature (C). */
- if (info_local->is_c2c1_10) {
- analog->mq = SR_MQ_TEMPERATURE;
- analog->unit = SR_UNIT_CELSIUS;
- }
-}
-
static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
int dmm, void *info)
{
memset(&analog, 0, sizeof(struct sr_datafeed_analog));
- analog.probes = sdi->probes;
+ analog.channels = sdi->channels;
analog.num_samples = 1;
analog.mq = -1;
}
}
+/** Request packet, if required. */
+SR_PRIV int req_packet(struct sr_dev_inst *sdi, int dmm)
+{
+ struct dev_context *devc;
+ struct sr_serial_dev_inst *serial;
+ int ret;
+
+ if (!dmms[dmm].packet_request)
+ return SR_OK;
+
+ devc = sdi->priv;
+ serial = sdi->conn;
+
+ if (devc->req_next_at && (devc->req_next_at > g_get_monotonic_time())) {
+ sr_spew("Not requesting new packet yet, %" PRIi64 " ms left.",
+ ((devc->req_next_at - g_get_monotonic_time()) / 1000));
+ return SR_OK;
+ }
+
+ ret = dmms[dmm].packet_request(serial);
+ if (ret < 0) {
+ sr_err("Failed to request packet: %d.", ret);
+ return ret;
+ }
+
+ if (dmms[dmm].req_timeout_ms)
+ devc->req_next_at = g_get_monotonic_time() + (dmms[dmm].req_timeout_ms * 1000);
+
+ return SR_OK;
+}
+
static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
{
struct dev_context *devc;
/* Try to get as much data as the buffer can hold. */
len = DMM_BUFSIZE - devc->buflen;
len = serial_read(serial, devc->buf + devc->buflen, len);
- if (len < 1) {
+ if (len == 0)
+ return; /* No new bytes, nothing to do. */
+ if (len < 0) {
sr_err("Serial port read error: %d.", len);
return;
}
if (dmms[dmm].packet_valid(devc->buf + offset)) {
handle_packet(devc->buf + offset, sdi, dmm, info);
offset += dmms[dmm].packet_size;
+
+ /* Request next packet, if required. */
+ if (!dmms[dmm].packet_request)
+ break;
+ if (dmms[dmm].req_timeout_ms || dmms[dmm].req_delay_ms)
+ devc->req_next_at = g_get_monotonic_time() +
+ dmms[dmm].req_delay_ms * 1000;
+ req_packet(sdi, dmm);
} else {
offset++;
}
{
struct sr_dev_inst *sdi;
struct dev_context *devc;
- struct sr_serial_dev_inst *serial;
int64_t time;
- int ret;
(void)fd;
if (!(devc = sdi->priv))
return TRUE;
- serial = sdi->conn;
-
if (revents == G_IO_IN) {
/* Serial data arrived. */
handle_new_data(sdi, dmm, info);
} else {
- /* Timeout, send another packet request (if DMM needs it). */
- if (dmms[dmm].packet_request) {
- ret = dmms[dmm].packet_request(serial);
- if (ret < 0) {
- sr_err("Failed to request packet: %d.", ret);
- return FALSE;
- }
- }
+ /* Timeout; send another packet request if DMM needs it. */
+ if (dmms[dmm].packet_request && (req_packet(sdi, dmm) < 0))
+ return FALSE;
}
if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
/* Driver-specific receive_data() wrappers */
+RECEIVE_DATA(BBCGM_M2110, metex14) /* metex14_info used as a dummy. */
RECEIVE_DATA(DIGITEK_DT4000ZC, fs9721)
RECEIVE_DATA(TEKPOWER_TP4000ZC, fs9721)
RECEIVE_DATA(METEX_ME31, metex14)
RECEIVE_DATA(PEAKTECH_3410, metex14)
RECEIVE_DATA(MASTECH_MAS345, metex14)
RECEIVE_DATA(VA_VA18B, fs9721)
+RECEIVE_DATA(VA_VA40B, fs9721)
RECEIVE_DATA(METEX_M3640D, metex14)
+RECEIVE_DATA(METEX_M4650CR, metex14)
RECEIVE_DATA(PEAKTECH_4370, metex14)
RECEIVE_DATA(PCE_PCE_DM32, fs9721)
RECEIVE_DATA(RADIOSHACK_22_168, metex14)
RECEIVE_DATA(RADIOSHACK_22_805, metex14)
RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
+RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_M3650CR, metex14)
+RECEIVE_DATA(VOLTCRAFT_M3650D, metex14)
+RECEIVE_DATA(VOLTCRAFT_M4650CR, metex14)
+RECEIVE_DATA(VOLTCRAFT_ME42, metex14)
RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC830_SER, fs9922)
RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT60A_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT60E_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT60G_SER, es519xx)
+RECEIVE_DATA(UNI_T_UT61B_SER, fs9922)
+RECEIVE_DATA(UNI_T_UT61C_SER, fs9922)
RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
-RECEIVE_DATA(UNI_T_UT61E_SER, es51922)
+RECEIVE_DATA(UNI_T_UT61E_SER, es519xx)
+RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)
+RECEIVE_DATA(TENMA_72_7745_SER, fs9721)
+RECEIVE_DATA(TENMA_72_7750_SER, es519xx)
projects / libsigrok.git / blobdiff