#include "libsigrok-internal.h"
#include "protocol.h"
+extern struct dmm_info udmms[];
+
/*
* Driver for various UNI-T multimeters (and rebranded ones).
*
* f0 00 00 00 00 00 00 00 (no data bytes)
* f2 55 77 00 00 00 00 00 (2 data bytes, 0x55 and 0x77)
* f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1)
- *
- * Chips and serial settings used in UNI-T DMMs (and rebranded ones):
- * - UNI-T UT108: ?
- * - UNI-T UT109: ?
- * - UNI-T UT30A: ?
- * - UNI-T UT30E: ?
- * - UNI-T UT60E: Fortune Semiconductor FS9721_LP3
- * - UNI-T UT60G: ?
- * - UNI-T UT61B: ?
- * - UNI-T UT61C: ?
- * - UNI-T UT61D: Fortune Semiconductor FS9922-DMM4
- * - UNI-T UT61E: Cyrustek ES51922
- * - UNI-T UT70B: ?
- * - Voltcraft VC-820: Fortune Semiconductor FS9721_LP3
- * - Voltcraft VC-840: Fortune Semiconductor FS9721_LP3
- * - ...
*/
static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf,
udmms[dmm].dmm_details(&analog, info);
/* Send a sample packet with one analog value. */
- analog.probes = sdi->probes;
+ analog.channels = sdi->channels;
analog.num_samples = 1;
analog.data = &floatval;
packet.type = SR_DF_ANALOG;
devc->num_samples++;
}
-static int hid_chip_init(struct dev_context *devc, uint16_t baudrate)
+static int hid_chip_init(struct sr_dev_inst *sdi, uint16_t baudrate)
{
int ret;
uint8_t buf[5];
+ struct sr_usb_dev_inst *usb;
+ usb = sdi->conn;
+
/* Detach kernel drivers which grabbed this device (if any). */
- if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
- ret = libusb_detach_kernel_driver(devc->usb->devhdl, 0);
+ if (libusb_kernel_driver_active(usb->devhdl, 0) == 1) {
+ ret = libusb_detach_kernel_driver(usb->devhdl, 0);
if (ret < 0) {
sr_err("Failed to detach kernel driver: %s.",
libusb_error_name(ret));
}
/* Claim interface 0. */
- if ((ret = libusb_claim_interface(devc->usb->devhdl, 0)) < 0) {
+ if ((ret = libusb_claim_interface(usb->devhdl, 0)) < 0) {
sr_err("Failed to claim interface 0: %s.",
libusb_error_name(ret));
return SR_ERR;
sr_spew("HID init = 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x (%d baud)",
buf[0], buf[1], buf[2], buf[3], buf[4], baudrate);
ret = libusb_control_transfer(
- devc->usb->devhdl, /* libusb device handle */
+ usb->devhdl, /* libusb device handle */
LIBUSB_REQUEST_TYPE_CLASS |
LIBUSB_RECIPIENT_INTERFACE |
LIBUSB_ENDPOINT_OUT,
struct dev_context *devc;
uint8_t buf[CHUNK_SIZE], *pbuf;
int i, ret, len, num_databytes_in_chunk;
+ struct sr_usb_dev_inst *usb;
devc = sdi->priv;
+ usb = sdi->conn;
pbuf = devc->protocol_buf;
/* On the first run, we need to init the HID chip. */
if (devc->first_run) {
- if ((ret = hid_chip_init(devc, udmms[dmm].baudrate)) != SR_OK) {
+ if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) {
sr_err("HID chip init failed: %d.", ret);
return SR_ERR;
}
/* Get data from EP2 using an interrupt transfer. */
ret = libusb_interrupt_transfer(
- devc->usb->devhdl, /* libusb device handle */
+ usb->devhdl, /* libusb device handle */
LIBUSB_ENDPOINT_IN | 2, /* EP2, IN */
(unsigned char *)&buf, /* receive buffer */
CHUNK_SIZE, /* wLength */
devc->bufoffset = 0;
- /* Append the 1-7 data bytes of this chunk to pbuf. */
+ /*
+ * Append the 1-7 data bytes of this chunk to pbuf.
+ *
+ * Special case:
+ * DMMs with Cyrustek ES51922 chip need serial settings of
+ * 19230/7o1. The WCH CH9325 UART to USB/HID chip used in (some
+ * versions of) the UNI-T UT-D04 cable however, will also send
+ * the parity bit to the host in the 8-byte data chunks. This bit
+ * is encoded in bit 7 of each of the 1-7 data bytes and must thus
+ * be removed in order for the actual ES51922 protocol parser to
+ * work properly.
+ */
num_databytes_in_chunk = buf[0] & 0x0f;
- for (i = 0; i < num_databytes_in_chunk; i++)
- pbuf[devc->buflen++] = buf[1 + i];
+ for (i = 0; i < num_databytes_in_chunk; i++, devc->buflen++) {
+ pbuf[devc->buflen] = buf[1 + i];
+ if (udmms[dmm].packet_parse == sr_es519xx_19200_14b_parse)
+ pbuf[devc->buflen] &= ~(1 << 7);
+ }
/* Now look for packets in that data. */
while ((devc->buflen - devc->bufoffset) >= udmms[dmm].packet_size) {
int ret;
struct sr_dev_inst *sdi;
struct dev_context *devc;
+ int64_t time_ms;
(void)fd;
(void)revents;
sdi->driver->dev_acquisition_stop(sdi, cb_data);
}
+ if (devc->limit_msec) {
+ time_ms = (g_get_monotonic_time() - devc->starttime) / 1000;
+ if (time_ms > (int64_t)devc->limit_msec) {
+ sr_info("Requested time limit reached.");
+ sdi->driver->dev_acquisition_stop(sdi, cb_data);
+ return TRUE;
+ }
+ }
+
return TRUE;
}
return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
/* Driver-specific receive_data() wrappers */
+RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
+RECEIVE_DATA(UNI_T_UT60A, fs9721)
+RECEIVE_DATA(UNI_T_UT60E, fs9721)
+RECEIVE_DATA(UNI_T_UT60G, es519xx)
+RECEIVE_DATA(UNI_T_UT61B, fs9922)
+RECEIVE_DATA(UNI_T_UT61C, fs9922)
RECEIVE_DATA(UNI_T_UT61D, fs9922)
+RECEIVE_DATA(UNI_T_UT61E, es519xx)
RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
+RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)
+RECEIVE_DATA(TENMA_72_7745, es519xx)
+RECEIVE_DATA(TENMA_72_7750, es519xx)
projects / libsigrok.git / blobdiff