X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=eb453c78a7a8b040b7217c63b7b457c272456ac9;hp=82575222e4aafc2c319a5834ef87426c162b5cf3;hb=19c9b176485e6033f024216a56058e507d47b2fc;hpb=f254bc4bba68d2cade0c8f7993d8fa8d3d9b556a diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 82575222..eb453c78 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -19,352 +19,77 @@ * along with this program. If not, see . */ +#include #include #include #include #include -#include #include -#include "libsigrok.h" +#include #include "libsigrok-internal.h" #include "protocol.h" -static const uint32_t hwopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_MULTIMETER, - SR_CONF_LIMIT_SAMPLES, - SR_CONF_LIMIT_MSEC, - SR_CONF_CONTINUOUS, }; -SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info; -SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info; -SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info; -SR_PRIV struct sr_dev_driver metex_me31_driver_info; -SR_PRIV struct sr_dev_driver peaktech_3410_driver_info; -SR_PRIV struct sr_dev_driver mastech_mas345_driver_info; -SR_PRIV struct sr_dev_driver va_va18b_driver_info; -SR_PRIV struct sr_dev_driver va_va40b_driver_info; -SR_PRIV struct sr_dev_driver metex_m3640d_driver_info; -SR_PRIV struct sr_dev_driver metex_m4650cr_driver_info; -SR_PRIV struct sr_dev_driver peaktech_4370_driver_info; -SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info; -SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info; -SR_PRIV struct sr_dev_driver radioshack_22_805_driver_info; -SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info; -SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_m3650cr_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_m4650cr_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_me42_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info; -SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut60g_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut61b_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info; -SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info; -SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info; -SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info; -SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info; -SR_PRIV struct sr_dev_driver brymen_bm25x_ser_driver_info; - -SR_PRIV struct dmm_info dmms[] = { - { - "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, - BBCGM_M2110_PACKET_SIZE, 0, 0, NULL, - sr_m2110_packet_valid, sr_m2110_parse, - NULL, - &bbcgm_m2110_driver_info, receive_data_BBCGM_M2110, - }, - { - "Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400, - FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_10_temp_c, - &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC, - }, - { - "TekPower", "TP4000ZC", "2400/8n1/dtr=1", 2400, - FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_10_temp_c, - &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_TP4000ZC, - }, - { - "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &metex_me31_driver_info, receive_data_METEX_ME31, - }, - { - "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &peaktech_3410_driver_info, receive_data_PEAKTECH_3410, - }, - { - "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &mastech_mas345_driver_info, receive_data_MASTECH_MAS345, - }, - { - "V&A", "VA18B", "2400/8n1", 2400, - FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_01_temp_c, - &va_va18b_driver_info, receive_data_VA_VA18B, - }, - { - "V&A", "VA40B", "2400/8n1", 2400, - FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_max_c_min, - &va_va40b_driver_info, receive_data_VA_VA40B, - }, - { - "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &metex_m3640d_driver_info, receive_data_METEX_M3640D, - }, - { - "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &metex_m4650cr_driver_info, receive_data_METEX_M4650CR, - }, - { - "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &peaktech_4370_driver_info, receive_data_PEAKTECH_4370, - }, - { - "PCE", "PCE-DM32", "2400/8n1", 2400, - FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_01_10_temp_f_c, - &pce_pce_dm32_driver_info, receive_data_PCE_PCE_DM32, - }, - { - "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &radioshack_22_168_driver_info, receive_data_RADIOSHACK_22_168, - }, - { - "RadioShack", "22-805", "600/7n2/rts=0/dtr=1", 600, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &radioshack_22_805_driver_info, receive_data_RADIOSHACK_22_805, - }, - { - "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, - RS9LCD_PACKET_SIZE, 0, 0, NULL, - sr_rs9lcd_packet_valid, sr_rs9lcd_parse, - NULL, - &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812, - }, - { - "Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_00_temp_c, - &tecpel_dmm_8061_ser_driver_info, - receive_data_TECPEL_DMM_8061_SER, - }, - { - "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 150, 20, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &voltcraft_m3650cr_driver_info, receive_data_VOLTCRAFT_M3650CR, - }, - { - "Voltcraft", "M-3650D", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &voltcraft_m3650d_driver_info, receive_data_VOLTCRAFT_M3650D, - }, - { - "Voltcraft", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, - METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &voltcraft_m4650cr_driver_info, receive_data_VOLTCRAFT_M4650CR, - }, - { - "Voltcraft", "ME-42", "600/7n2/rts=0/dtr=1", 600, - METEX14_PACKET_SIZE, 250, 60, sr_metex14_packet_request, - sr_metex14_packet_valid, sr_metex14_parse, - NULL, - &voltcraft_me42_driver_info, receive_data_VOLTCRAFT_ME42, - }, - { - "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - NULL, - &voltcraft_vc820_ser_driver_info, - receive_data_VOLTCRAFT_VC820_SER, - }, - { - /* - * Note: The VC830 doesn't set the 'volt' and 'diode' bits of - * the FS9922 protocol. Instead, it only sets the user-defined - * bit "z1" to indicate "diode mode" and "voltage". - */ - "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9922_PACKET_SIZE, 0, 0, NULL, - sr_fs9922_packet_valid, sr_fs9922_parse, - &sr_fs9922_z1_diode, - &voltcraft_vc830_ser_driver_info, - receive_data_VOLTCRAFT_VC830_SER, - }, - { - "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_00_temp_c, - &voltcraft_vc840_ser_driver_info, - receive_data_VOLTCRAFT_VC840_SER, - }, - { - "UNI-T", "UT60A (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - NULL, - &uni_t_ut60a_ser_driver_info, - receive_data_UNI_T_UT60A_SER, - }, - { - "UNI-T", "UT60E (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_00_temp_c, - &uni_t_ut60e_ser_driver_info, - receive_data_UNI_T_UT60E_SER, - }, - { - /* Note: ES51986 baudrate is actually 19230! */ - "UNI-T", "UT60G (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, - NULL, - &uni_t_ut60g_ser_driver_info, receive_data_UNI_T_UT60G_SER, - }, - { - "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9922_PACKET_SIZE, 0, 0, NULL, - sr_fs9922_packet_valid, sr_fs9922_parse, NULL, - &uni_t_ut61b_ser_driver_info, receive_data_UNI_T_UT61B_SER, - }, - { - "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9922_PACKET_SIZE, 0, 0, NULL, - sr_fs9922_packet_valid, sr_fs9922_parse, NULL, - &uni_t_ut61c_ser_driver_info, receive_data_UNI_T_UT61C_SER, - }, - { - "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9922_PACKET_SIZE, 0, 0, NULL, - sr_fs9922_packet_valid, sr_fs9922_parse, NULL, - &uni_t_ut61d_ser_driver_info, receive_data_UNI_T_UT61D_SER, - }, - { - /* Note: ES51922 baudrate is actually 19230! */ - "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_14B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, - NULL, - &uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER, - }, - { - "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", - 2400, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, - NULL, - &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N, - }, - { - "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", - 2400, FS9721_PACKET_SIZE, 0, 0, NULL, - sr_fs9721_packet_valid, sr_fs9721_parse, - sr_fs9721_00_temp_c, - &tenma_72_7745_ser_driver_info, receive_data_TENMA_72_7745_SER, - }, - { - /* Note: ES51986 baudrate is actually 19230! */ - "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", - 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, - sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, - NULL, - &tenma_72_7750_ser_driver_info, receive_data_TENMA_72_7750_SER, - }, - { - "Brymen", "BM25x (BC20X cable)", "9600/8n1/rts=1/dtr=1", - 9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL, - sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse, - NULL, - &brymen_bm25x_ser_driver_info, receive_data_BRYMEN_BM25X_SER, - }, +static const uint32_t devopts[] = { + SR_CONF_CONTINUOUS, + SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_SET, }; -static int dev_clear(int dmm) -{ - return std_dev_clear(dmms[dmm].di, NULL); -} - -static int init(struct sr_context *sr_ctx, int dmm) -{ - return std_init(sr_ctx, dmms[dmm].di, LOG_PREFIX); -} - -static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) +static GSList *scan(struct sr_dev_driver *di, GSList *options) { + struct dmm_info *dmm; + struct sr_config *src; + GSList *l, *devices; + const char *conn, *serialcomm; struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; - struct sr_channel *ch; struct sr_serial_dev_inst *serial; - GSList *devices; int dropped, ret; size_t len; uint8_t buf[128]; - if (!(serial = sr_serial_dev_inst_new(conn, serialcomm))) + dmm = (struct dmm_info *)di; + + conn = serialcomm = NULL; + for (l = options; l; l = l->next) { + src = l->data; + switch (src->key) { + case SR_CONF_CONN: + conn = g_variant_get_string(src->data, NULL); + break; + case SR_CONF_SERIALCOMM: + serialcomm = g_variant_get_string(src->data, NULL); + break; + } + } + if (!conn) return NULL; - if (serial_open(serial, SERIAL_RDWR | SERIAL_NONBLOCK) != SR_OK) + if (!serialcomm) + serialcomm = dmm->conn; + + serial = sr_serial_dev_inst_new(conn, serialcomm); + + if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; sr_info("Probing serial port %s.", conn); - drvc = dmms[dmm].di->priv; devices = NULL; serial_flush(serial); /* Request a packet if the DMM requires this. */ - if (dmms[dmm].packet_request) { - if ((ret = dmms[dmm].packet_request(serial)) < 0) { + if (dmm->packet_request) { + if ((ret = dmm->packet_request(serial)) < 0) { sr_err("Failed to request packet: %d.", ret); return FALSE; } @@ -378,9 +103,9 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) /* Let's get a bit of data and see if we can find a packet. */ len = sizeof(buf); - ret = serial_stream_detect(serial, buf, &len, dmms[dmm].packet_size, - dmms[dmm].packet_valid, 3000, - dmms[dmm].baudrate); + ret = serial_stream_detect(serial, buf, &len, dmm->packet_size, + dmm->packet_valid, 3000, + dmm->baudrate); if (ret != SR_OK) goto scan_cleanup; @@ -391,249 +116,498 @@ static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm) * combination of the nonstandard cable that ships with some devices * and the serial port or USB to serial adapter. */ - dropped = len - dmms[dmm].packet_size; - if (dropped > 2 * dmms[dmm].packet_size) + dropped = len - dmm->packet_size; + if (dropped > 2 * dmm->packet_size) sr_warn("Had to drop too much data."); sr_info("Found device on port %s.", conn); - if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, dmms[dmm].vendor, - dmms[dmm].device, NULL))) - goto scan_cleanup; - - if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("Device context malloc failed."); - goto scan_cleanup; - } - + sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi->status = SR_ST_INACTIVE; + sdi->vendor = g_strdup(dmm->vendor); + sdi->model = g_strdup(dmm->device); + devc = g_malloc0(sizeof(struct dev_context)); + sr_sw_limits_init(&devc->limits); sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sdi->priv = devc; - sdi->driver = dmms[dmm].di; - if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1"))) - goto scan_cleanup; - sdi->channels = g_slist_append(sdi->channels, ch); - drvc->instances = g_slist_append(drvc->instances, sdi); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); devices = g_slist_append(devices, sdi); scan_cleanup: serial_close(serial); - return devices; -} - -static GSList *scan(GSList *options, int dmm) -{ - struct sr_config *src; - GSList *l, *devices; - const char *conn, *serialcomm; - - conn = serialcomm = NULL; - for (l = options; l; l = l->next) { - src = l->data; - switch (src->key) { - case SR_CONF_CONN: - conn = g_variant_get_string(src->data, NULL); - break; - case SR_CONF_SERIALCOMM: - serialcomm = g_variant_get_string(src->data, NULL); - break; - } - } - if (!conn) - return NULL; - - if (serialcomm) { - /* Use the provided comm specs. */ - devices = sdmm_scan(conn, serialcomm, dmm); - } else { - /* Try the default. */ - devices = sdmm_scan(conn, dmms[dmm].conn, dmm); - } - - return devices; -} - -static GSList *dev_list(int dmm) -{ - return ((struct drv_context *)(dmms[dmm].di->priv))->instances; -} - -static int cleanup(int dmm) -{ - return dev_clear(dmm); + return std_scan_complete(di, devices); } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + devc = sdi->priv; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } - - switch (key) { - case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - sr_dbg("Setting sample limit to %" PRIu64 ".", - devc->limit_samples); - break; - case SR_CONF_LIMIT_MSEC: - devc->limit_msec = g_variant_get_uint64(data); - sr_dbg("Setting time limit to %" PRIu64 "ms.", - devc->limit_msec); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return sr_sw_limits_config_set(&devc->limits, key, data); } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; - (void)cg; - - switch (key) { - case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - hwopts, ARRAY_SIZE(hwopts), sizeof(uint32_t)); - break; - case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); } -static int dev_acquisition_start(const struct sr_dev_inst *sdi, - void *cb_data, int dmm) +static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + devc = sdi->priv; - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } - - devc->cb_data = cb_data; - - /* - * Reset the number of samples to take. If we've already collected our - * quota, but we start a new session, and don't reset this, we'll just - * quit without acquiring any new samples. - */ - devc->num_samples = 0; - devc->starttime = g_get_monotonic_time(); + sr_sw_limits_acquisition_start(&devc->limits); + std_session_send_df_header(sdi); - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); - - /* Poll every 50ms, or whenever some data comes in. */ serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, - dmms[dmm].receive_data, (void *)sdi); + receive_data, (void *)sdi); return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) -{ - return std_serial_dev_acquisition_stop(sdi, cb_data, std_serial_dev_close, - sdi->conn, LOG_PREFIX); -} - -/* Driver-specific API function wrappers */ -#define HW_INIT(X) \ -static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); } -#define HW_CLEANUP(X) \ -static int cleanup_##X(void) { return cleanup(X); } -#define HW_SCAN(X) \ -static GSList *scan_##X(GSList *options) { return scan(options, X); } -#define HW_DEV_LIST(X) \ -static GSList *dev_list_##X(void) { return dev_list(X); } -#define HW_DEV_CLEAR(X) \ -static int dev_clear_##X(void) { return dev_clear(X); } -#define HW_DEV_ACQUISITION_START(X) \ -static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \ -void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); } - -/* Driver structs and API function wrappers */ -#define DRV(ID, ID_UPPER, NAME, LONGNAME) \ -HW_INIT(ID_UPPER) \ -HW_CLEANUP(ID_UPPER) \ -HW_SCAN(ID_UPPER) \ -HW_DEV_LIST(ID_UPPER) \ -HW_DEV_CLEAR(ID_UPPER) \ -HW_DEV_ACQUISITION_START(ID_UPPER) \ -SR_PRIV struct sr_dev_driver ID##_driver_info = { \ - .name = NAME, \ - .longname = LONGNAME, \ - .api_version = 1, \ - .init = init_##ID_UPPER, \ - .cleanup = cleanup_##ID_UPPER, \ - .scan = scan_##ID_UPPER, \ - .dev_list = dev_list_##ID_UPPER, \ - .dev_clear = dev_clear_##ID_UPPER, \ - .config_get = NULL, \ - .config_set = config_set, \ - .config_list = config_list, \ - .dev_open = std_serial_dev_open, \ - .dev_close = std_serial_dev_close, \ - .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \ - .dev_acquisition_stop = dev_acquisition_stop, \ - .priv = NULL, \ -}; - -DRV(bbcgm_m2110, BBCGM_M2110, "bbcgm-m2110", "BBC Goertz Metrawatt M2110") -DRV(digitek_dt4000zc, DIGITEK_DT4000ZC, "digitek-dt4000zc", "Digitek DT4000ZC") -DRV(tekpower_tp4000zc, TEKPOWER_TP4000ZC, "tekpower-tp4000zc", "TekPower TP4000ZC") -DRV(metex_me31, METEX_ME31, "metex-me31", "Metex ME-31") -DRV(peaktech_3410, PEAKTECH_3410, "peaktech-3410", "PeakTech 3410") -DRV(mastech_mas345, MASTECH_MAS345, "mastech-mas345", "MASTECH MAS345") -DRV(va_va18b, VA_VA18B, "va-va18b", "V&A VA18B") -DRV(va_va40b, VA_VA40B, "va-va40b", "V&A VA40B") -DRV(metex_m3640d, METEX_M3640D, "metex-m3640d", "Metex M-3640D") -DRV(metex_m4650cr, METEX_M4650CR, "metex-m4650cr", "Metex M-4650CR") -DRV(peaktech_4370, PEAKTECH_4370, "peaktech-4370", "PeakTech 4370") -DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32") -DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168") -DRV(radioshack_22_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-805") -DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812") -DRV(tecpel_dmm_8061_ser, TECPEL_DMM_8061_SER, "tecpel-dmm-8061-ser", "Tecpel DMM-8061 (UT-D02 cable)") -DRV(voltcraft_m3650cr, VOLTCRAFT_M3650CR, "voltcraft-m3650cr", "Voltcraft M-3650CR") -DRV(voltcraft_m3650d, VOLTCRAFT_M3650D, "voltcraft-m3650d", "Voltcraft M-3650D") -DRV(voltcraft_m4650cr, VOLTCRAFT_M4650CR, "voltcraft-m4650cr", "Voltcraft M-4650CR") -DRV(voltcraft_me42, VOLTCRAFT_ME42, "voltcraft-me42", "Voltcraft ME-42") -DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)") -DRV(voltcraft_vc830_ser, VOLTCRAFT_VC830_SER, "voltcraft-vc830-ser", "Voltcraft VC-830 (UT-D02 cable)") -DRV(voltcraft_vc840_ser, VOLTCRAFT_VC840_SER, "voltcraft-vc840-ser", "Voltcraft VC-840 (UT-D02 cable)") -DRV(uni_t_ut60a_ser, UNI_T_UT60A_SER, "uni-t-ut60a-ser", "UNI-T UT60A (UT-D02 cable)") -DRV(uni_t_ut60e_ser, UNI_T_UT60E_SER, "uni-t-ut60e-ser", "UNI-T UT60E (UT-D02 cable)") -DRV(uni_t_ut60g_ser, UNI_T_UT60G_SER, "uni-t-ut60g-ser", "UNI-T UT60G (UT-D02 cable)") -DRV(uni_t_ut61b_ser, UNI_T_UT61B_SER, "uni-t-ut61b-ser", "UNI-T UT61B (UT-D02 cable)") -DRV(uni_t_ut61c_ser, UNI_T_UT61C_SER, "uni-t-ut61c-ser", "UNI-T UT61C (UT-D02 cable)") -DRV(uni_t_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)") -DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)") -DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N") -DRV(tenma_72_7745_ser, TENMA_72_7745_SER, "tenma-72-7745-ser", "Tenma 72-7745 (UT-D02 cable)") -DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)") -DRV(brymen_bm25x_ser, BRYMEN_BM25X_SER, "brymen-bm25x-ser", "Brymen BM25x (BC20X cable)") +#define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \ + DELAY, REQUEST, VALID, PARSE, DETAILS) \ + &((struct dmm_info) { \ + { \ + .name = ID, \ + .longname = VENDOR " " MODEL, \ + .api_version = 1, \ + .init = std_init, \ + .cleanup = std_cleanup, \ + .scan = scan, \ + .dev_list = std_dev_list, \ + .dev_clear = std_dev_clear, \ + .config_get = NULL, \ + .config_set = config_set, \ + .config_list = config_list, \ + .dev_open = std_serial_dev_open, \ + .dev_close = std_serial_dev_close, \ + .dev_acquisition_start = dev_acquisition_start, \ + .dev_acquisition_stop = std_serial_dev_acquisition_stop, \ + .context = NULL, \ + }, \ + VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \ + REQUEST, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \ + }).di + +SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, + /* + * The items are sorted by chipset first and then model name. + * + * This reflects the developer's perspective and is preferrable + * during maintenance, as a vendor/product based sort order does + * not work well for rebranded models, and from a support point + * of view it's more important to identify similarities between + * models and compatible devices. + * + * Fold marks {{{ }}} with matching braces were added, to further + * speed up navigation in the long list. + */ + /* asycii based meters {{{ */ + DMM( + "metrix-mx56c", asycii, "Metrix", "MX56C", + "2400/8n1", 2400, ASYCII_PACKET_SIZE, 0, 0, NULL, + sr_asycii_packet_valid, sr_asycii_parse, NULL + ), + /* }}} */ + /* bm25x based meters {{{ */ + DMM( + "brymen-bm25x", bm25x, + "Brymen", "BM25x", "9600/8n1/rts=1/dtr=1", + 9600, BRYMEN_BM25X_PACKET_SIZE, 0, 0, NULL, + sr_brymen_bm25x_packet_valid, sr_brymen_bm25x_parse, + NULL + ), + /* }}} */ + /* dtm0660 based meters {{{ */ + DMM( + "peaktech-3415", dtm0660, + "PeakTech", "3415", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), + DMM( + "velleman-dvm4100", dtm0660, + "Velleman", "DVM4100", "2400/8n1/rts=0/dtr=1", + 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, + sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL + ), + /* }}} */ + /* es519xx based meters {{{ */ + DMM( + "iso-tech-idm103n", es519xx, + "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", + 2400, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, + NULL + ), + /* + * Note: ES51922 and ES51986 baudrate is actually 19230. This is + * "out" by .15%, and so is well within the typical 1% margin + * that is considered acceptable in UART communication, and thus + * should not cause an issue. + * + * However, using 19230 as baudrate here will not work, as most DMM + * cables do not support that baudrate! + */ + DMM( + "tenma-72-7750-ser", es519xx, + "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, + NULL + ), + DMM( + "uni-t-ut60g-ser", es519xx, + "UNI-T", "UT60G (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, + NULL + ), + DMM( + "uni-t-ut61e-ser", es519xx, + "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", + 19200, ES519XX_14B_PACKET_SIZE, 0, 0, NULL, + sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, + NULL + ), + /* }}} */ + /* fs9721 based meters {{{ */ + DMM( + "digitek-dt4000zc", fs9721, + "Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_10_temp_c + ), + DMM( + "mastech-ms8250b", fs9721, + "MASTECH", "MS8250B", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + NULL + ), + DMM( + "pce-pce-dm32", fs9721, + "PCE", "PCE-DM32", "2400/8n1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_01_10_temp_f_c + ), + DMM( + "peaktech-3330", fs9721, + "PeakTech", "3330", "2400/8n1/dtr=1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_01_10_temp_f_c + ), + DMM( + "tecpel-dmm-8061-ser", fs9721, + "Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c + ), + DMM( + "tekpower-tp4000ZC", fs9721, + "TekPower", "TP4000ZC", "2400/8n1/dtr=1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_10_temp_c + ), + DMM( + "tenma-72-7745-ser", fs9721, + "Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c + ), + DMM( + "uni-t-ut60a-ser", fs9721, + "UNI-T", "UT60A (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + NULL + ), + DMM( + "uni-t-ut60e-ser", fs9721, + "UNI-T", "UT60E (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c + ), + DMM( + "va-va18b", fs9721, + "V&A", "VA18B", "2400/8n1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_01_temp_c + ), + DMM( + "va-va40b", fs9721, + "V&A", "VA40B", "2400/8n1", 2400, + FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_max_c_min + ), + DMM( + "voltcraft-vc820-ser", fs9721, + "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + NULL + ), + DMM( + "voltcraft-vc840-ser", fs9721, + "Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9721_PACKET_SIZE, 0, 0, NULL, + sr_fs9721_packet_valid, sr_fs9721_parse, + sr_fs9721_00_temp_c + ), + /* }}} */ + /* fs9922 based meters {{{ */ + DMM( + "sparkfun-70c", fs9922, + "SparkFun", "70C", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, 0, 0, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL + ), + DMM( + "uni-t-ut61b-ser", fs9922, + "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, 0, 0, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL + ), + DMM( + "uni-t-ut61c-ser", fs9922, + "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, 0, 0, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL + ), + DMM( + "uni-t-ut61d-ser", fs9922, + "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, 0, 0, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, NULL + ), + DMM( + /* + * Note: The VC830 doesn't set the 'volt' and 'diode' bits of + * the FS9922 protocol. Instead, it only sets the user-defined + * bit "z1" to indicate "diode mode" and "voltage". + */ + "voltcraft-vc830-ser", fs9922, + "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", + 2400, FS9922_PACKET_SIZE, 0, 0, NULL, + sr_fs9922_packet_valid, sr_fs9922_parse, + &sr_fs9922_z1_diode + ), + /* }}} */ + /* m2110 based meters {{{ */ + DMM( + "bbcgm-2010", m2110, + "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, + BBCGM_M2110_PACKET_SIZE, 0, 0, NULL, + sr_m2110_packet_valid, sr_m2110_parse, + NULL + ), + /* }}} */ + /* metex14 based meters {{{ */ + DMM( + "mastech-mas345", metex14, + "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "metex-m3640d", metex14, + "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "metex-m3860m", metex14, + "Metex", "M-3860M", "9600/7n2/rts=0/dtr=1", 9600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "metex-m4650cr", metex14, + "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "metex-me31", metex14, + "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "peaktech-3410", metex14, + "PeakTech", "3410", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "peaktech-4370", metex14, + "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "peaktech-4390a", metex14, + "PeakTech", "4390A", "9600/7n2/rts=0/dtr=1", 9600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "radioshack-22-168", metex14, + "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "radioshack-22-805", metex14, + "RadioShack", "22-805", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "voltcraft-m3650cr", metex14, + "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 150, 20, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "voltcraft-m3650d", metex14, + "Voltcraft", "M-3650D", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "voltcraft-m4650cr", metex14, + "Voltcraft", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, + METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + DMM( + "voltcraft-me42", metex14, + "Voltcraft", "ME-42", "600/7n2/rts=0/dtr=1", 600, + METEX14_PACKET_SIZE, 250, 60, sr_metex14_packet_request, + sr_metex14_packet_valid, sr_metex14_parse, + NULL + ), + /* }}} */ + /* rs9lcd based meters {{{ */ + DMM( + "radioshack-22-812", rs9lcd, + "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, + RS9LCD_PACKET_SIZE, 0, 0, NULL, + sr_rs9lcd_packet_valid, sr_rs9lcd_parse, + NULL + ), + /* }}} */ + /* ut71x based meters {{{ */ + DMM( + "tenma-72-7730-ser", ut71x, + "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-7732-ser", ut71x, + "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "tenma-72-9380a-ser", ut71x, + "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "uni-t-ut71a-ser", ut71x, + "UNI-T", "UT71A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "uni-t-ut71b-ser", ut71x, + "UNI-T", "UT71B (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "uni-t-ut71c-ser", ut71x, + "UNI-T", "UT71C (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "uni-t-ut71d-ser", ut71x, + "UNI-T", "UT71D (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "uni-t-ut71e-ser", ut71x, + "UNI-T", "UT71E (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "voltcraft-vc920-ser", ut71x, + "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "voltcraft-vc940-ser", ut71x, + "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + DMM( + "voltcraft-vc960-ser", ut71x, + "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + 2400, UT71X_PACKET_SIZE, 0, 0, NULL, + sr_ut71x_packet_valid, sr_ut71x_parse, NULL + ), + /* }}} */ + /* vc870 based meters {{{ */ + DMM( + "voltcraft-vc870-ser", vc870, + "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1", + 9600, VC870_PACKET_SIZE, 0, 0, NULL, + sr_vc870_packet_valid, sr_vc870_parse, NULL + ), + /* }}} */ + /* + * The list is sorted. Add new items in the respective chip's group. + */ +);