X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=5843d5e7535b6f66043e532132286e5b62d55e4b;hb=d9e79c512289201a76e55435c09d7d7e68a1cf1b;hp=2d644dadfd4a53c342a9af5d7a7ddeb8676bcdea;hpb=c8852687778a33b9de218af800eec4ae7e3848a6;p=libsigrok.git diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c index 2d644dad..5843d5e7 100644 --- a/hardware/uni-t-dmm/protocol.c +++ b/hardware/uni-t-dmm/protocol.c @@ -1,7 +1,7 @@ /* * This file is part of the libsigrok project. * - * Copyright (C) 2012 Uwe Hermann + * Copyright (C) 2012-2013 Uwe Hermann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,8 @@ #include "libsigrok-internal.h" #include "protocol.h" +extern struct dmm_info udmms[]; + /* * Driver for various UNI-T multimeters (and rebranded ones). * @@ -49,30 +51,14 @@ * 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, void *info) { + struct dev_context *devc; struct sr_datafeed_packet packet; struct sr_datafeed_analog analog; - /// struct fs9721_info info; float floatval; int ret; @@ -80,9 +66,9 @@ static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf, memset(&analog, 0, sizeof(struct sr_datafeed_analog)); /* Parse the protocol packet. */ - ret = udmms[dmm].packet_parse(buf, &floatval, &analog, &info); + ret = udmms[dmm].packet_parse(buf, &floatval, &analog, info); if (ret != SR_OK) { - sr_err("Invalid DMM packet, ignoring."); + sr_dbg("Invalid DMM packet, ignoring."); return; } @@ -102,14 +88,17 @@ static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf, 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)); @@ -121,14 +110,14 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) } /* 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_dbg("Successfully claimed interface 0."); - /* Baudrate example: 19230 baud -> HEX(19230) == 0x4b1e */ + /* Set data for the HID feature report (e.g. baudrate). */ buf[0] = baudrate & 0xff; /* Baudrate, LSB */ buf[1] = (baudrate >> 8) & 0xff; /* Baudrate, MSB */ buf[2] = 0x00; /* Unknown/unused (?) */ @@ -140,7 +129,7 @@ static int hid_chip_init(struct dev_context *devc, uint16_t baudrate) 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, @@ -182,40 +171,32 @@ static void log_dmm_packet(const uint8_t *buf) buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]); } -static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data) +static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info) { - struct sr_dev_inst *sdi; struct dev_context *devc; + uint8_t buf[CHUNK_SIZE], *pbuf; int i, ret, len, num_databytes_in_chunk; - uint8_t buf[CHUNK_SIZE]; - uint8_t *pbuf; - static gboolean first_run = TRUE, synced_on_first_packet = FALSE; - static uint64_t data_byte_counter = 0; + struct sr_usb_dev_inst *usb; - (void)fd; - (void)revents; - - sdi = cb_data; devc = sdi->priv; - + usb = sdi->conn; pbuf = devc->protocol_buf; /* On the first run, we need to init the HID chip. */ - if (first_run) { - /* Note: The baudrate is DMM-specific (UT61D: 19230). */ - if ((ret = hid_chip_init(devc, udmms[dmm].baudrate)) != SR_OK) { + if (devc->first_run) { + if ((ret = hid_chip_init(sdi, udmms[dmm].baudrate)) != SR_OK) { sr_err("HID chip init failed: %d.", ret); - return FALSE; + return SR_ERR; } - memset(pbuf, 0x00, NUM_DATA_BYTES); - first_run = FALSE; + memset(pbuf, 0x00, DMM_BUFSIZE); + devc->first_run = FALSE; } memset(&buf, 0x00, CHUNK_SIZE); /* 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 */ @@ -224,45 +205,76 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data) if (ret < 0) { sr_err("USB receive error: %s.", libusb_error_name(ret)); - return FALSE; + return SR_ERR; } if (len != CHUNK_SIZE) { sr_err("Short packet: received %d/%d bytes.", len, CHUNK_SIZE); /* TODO: Print the bytes? */ - return FALSE; + return SR_ERR; } log_8byte_chunk((const uint8_t *)&buf); - if (buf[0] != 0xf0) { - /* First time: Synchronize to the start of a packet. */ - if (!synced_on_first_packet) { - if (!udmms[dmm].packet_valid(buf)) - return TRUE; - synced_on_first_packet = TRUE; - sr_spew("Successfully synchronized on first packet."); + /* If there are no data bytes just return (without error). */ + if (buf[0] == 0xf0) + return SR_OK; + + devc->bufoffset = 0; + + /* + * 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++, 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) { + if (udmms[dmm].packet_valid(pbuf + devc->bufoffset)) { + log_dmm_packet(pbuf + devc->bufoffset); + decode_packet(sdi, dmm, pbuf + devc->bufoffset, info); + devc->bufoffset += udmms[dmm].packet_size; + } else { + devc->bufoffset++; } + } - num_databytes_in_chunk = buf[0] & 0x0f; - for (i = 0; i < num_databytes_in_chunk; i++) - pbuf[data_byte_counter++] = buf[1 + i]; + /* Move remaining bytes to beginning of buffer. */ + for (i = 0; i < devc->buflen - devc->bufoffset; i++) + pbuf[i] = pbuf[devc->bufoffset + i]; + devc->buflen -= devc->bufoffset; - /* TODO: Handle > 14 bytes in pbuf? Can this happen? */ - if (data_byte_counter == NUM_DATA_BYTES) { - log_dmm_packet(pbuf); - data_byte_counter = 0; + return SR_OK; +} - if (!udmms[dmm].packet_valid(pbuf)) { - sr_err("Invalid packet."); - return TRUE; - } +static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data) +{ + int ret; + struct sr_dev_inst *sdi; + struct dev_context *devc; + int64_t time_ms; + + (void)fd; + (void)revents; - decode_packet(sdi, dmm, pbuf, info); + sdi = cb_data; + devc = sdi->priv; - memset(pbuf, 0x00, NUM_DATA_BYTES); - } - } + if ((ret = get_and_handle_data(sdi, dmm, info)) != SR_OK) + return FALSE; /* Abort acquisition if we acquired enough samples. */ if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { @@ -270,6 +282,15 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data) 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; } @@ -279,5 +300,16 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \ 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)