X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=009f37c5e63f5caadabb054b8a891bbd9530b503;hb=dcd212f7a2c9b9acba649dea782ee358e1dfbeb5;hp=05a7d0cb395fc6e60500bc7518eaaace1358f70e;hpb=6c6e5e47f0c405e8d5a1eb3684152a99d358ff0e;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 05a7d0cb..009f37c5 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -34,8 +34,11 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_MULTIMETER, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_SET, @@ -53,6 +56,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) int dropped, ret; size_t len; uint8_t buf[128]; + size_t ch_idx; + char ch_name[12]; dmm = (struct dmm_info *)di; @@ -128,7 +133,27 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; sdi->priv = devc; - sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); + dmm->channel_count = 1; + if (dmm->packet_parse == sr_metex14_4packets_parse) + dmm->channel_count = 4; + if (dmm->packet_parse == sr_eev121gw_3displays_parse) { + dmm->channel_count = EEV121GW_DISPLAY_COUNT; + dmm->channel_formats = eev121gw_channel_formats; + } + if (dmm->packet_parse == sr_ms2115b_parse) { + dmm->channel_count = MS2115B_DISPLAY_COUNT; + dmm->channel_formats = ms2115b_channel_formats; + } + for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) { + size_t ch_num; + const char *fmt; + fmt = "P%zu"; + if (dmm->channel_formats && dmm->channel_formats[ch_idx]) + fmt = dmm->channel_formats[ch_idx]; + ch_num = ch_idx + 1; + snprintf(ch_name, sizeof(ch_name), fmt, ch_num); + sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name); + } devices = g_slist_append(devices, sdi); scan_cleanup: @@ -137,41 +162,22 @@ scan_cleanup: 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; 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, - scanopts, ARRAY_SIZE(scanopts), 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) @@ -179,15 +185,11 @@ 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; sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); - /* Poll every 50ms, or whenever some data comes in. */ serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, receive_data, (void *)sdi); @@ -206,6 +208,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) .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, \ @@ -216,7 +219,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) .context = NULL, \ }, \ VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \ - REQUEST, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \ + REQUEST, 1, NULL, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \ }).di SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, @@ -232,6 +235,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, * 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, @@ -244,7 +254,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, /* dtm0660 based meters {{{ */ DMM( "peaktech-3415", dtm0660, - "Peaktech", "3415", "2400/8n1/rts=0/dtr=1", + "PeakTech", "3415", "2400/8n1/rts=0/dtr=1", 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL ), @@ -255,6 +265,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL ), /* }}} */ + /* eev121gw based meters {{{ */ + DMM( + "eevblog-121gw", eev121gw, "EEVblog", "121GW", + "115200/8n1", 115200, EEV121GW_PACKET_SIZE, 0, 0, NULL, + sr_eev121gw_packet_valid, sr_eev121gw_3displays_parse, NULL + ), + /* }}} */ /* es519xx based meters {{{ */ DMM( "iso-tech-idm103n", es519xx, @@ -263,16 +280,23 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, 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, - /* 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 ), DMM( - /* Note: ES51986 baudrate is actually 19230! */ "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, @@ -281,7 +305,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "uni-t-ut61e-ser", es519xx, - /* 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, @@ -312,7 +335,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "peaktech-3330", fs9721, - "Peaktech", "3330", "2400/8n1/dtr=1", 2400, + "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 @@ -382,6 +405,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), /* }}} */ /* 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", @@ -400,6 +429,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, 2400, FS9922_PACKET_SIZE, 0, 0, NULL, sr_fs9922_packet_valid, sr_fs9922_parse, NULL ), + DMM( + "victor-dmm-ser", fs9922, + "Victor", "Victor DMMs (Mini-USB cable)", "2400/8n1", + 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 @@ -413,14 +448,34 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, &sr_fs9922_z1_diode ), /* }}} */ - /* metex14 based meters {{{ */ + /* m2110 based meters {{{ */ DMM( - "bbcgm-2010", metex14, + "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 ), + /* }}} */ + /* ms2115b based meters {{{ */ + DMM( + "mastech-ms2115b", ms2115b, + "MASTECH", "MS2115B", "1200/8n1", + 1200, MS2115B_PACKET_SIZE, 0, 0, NULL, + sr_ms2115b_packet_valid, sr_ms2115b_parse, + NULL + ), + /* }}} */ + /* ms8250d based meters {{{ */ + DMM( + "mastech-ms8250d", ms8250d, + "MASTECH", "MS8250D", "2400/8n1/rts=0/dtr=1", + 2400, MS8250D_PACKET_SIZE, 0, 0, NULL, + sr_ms8250d_packet_valid, sr_ms8250d_parse, + NULL + ), + /* }}} */ + /* metex14 based meters {{{ */ DMM( "mastech-mas345", metex14, "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, @@ -435,6 +490,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_metex14_packet_valid, sr_metex14_parse, NULL ), + DMM( + "metex-m3860m", metex14, + "Metex", "M-3860M", "9600/7n2/rts=0/dtr=1", 9600, + 4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_4packets_valid, sr_metex14_4packets_parse, + NULL + ), DMM( "metex-m4650cr", metex14, "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200, @@ -451,7 +513,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "peaktech-3410", metex14, - "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600, + "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 @@ -463,6 +525,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_metex14_packet_valid, sr_metex14_parse, NULL ), + DMM( + "peaktech-4390a", metex14, + "PeakTech", "4390A", "9600/7n2/rts=0/dtr=1", 9600, + 4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, + sr_metex14_4packets_valid, sr_metex14_4packets_parse, + NULL + ), DMM( "radioshack-22-168", metex14, "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200, @@ -517,20 +586,20 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, /* }}} */ /* ut71x based meters {{{ */ DMM( - "voltcraft-vc920-ser", ut71x, - "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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( - "voltcraft-vc940-ser", ut71x, - "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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( - "voltcraft-vc960-ser", ut71x, - "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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 ), @@ -565,29 +634,42 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "tenma-72-7730-ser", ut71x, - "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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( - "tenma-72-7732-ser", ut71x, - "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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( - "tenma-72-9380a-ser", ut71x, - "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "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 ), /* }}} */ - /* meters based on other chips (to get sorted) */ + /* 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 ), + /* }}} */ + /* vc96 based meters {{{ */ + DMM( + "voltcraft-vc96", vc96, + "Voltcraft", "VC-96", "1200/8n2", 1200, + VC96_PACKET_SIZE, 0, 0, NULL, + sr_vc96_packet_valid, sr_vc96_parse, + NULL + ), + /* }}} */ + /* + * The list is sorted. Add new items in the respective chip's group. + */ );