return SR_OK;
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
- return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
-}
-
#define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \
DELAY, REQUEST, VALID, PARSE, DETAILS) \
&((struct dmm_info) { \
.dev_open = std_serial_dev_open, \
.dev_close = std_serial_dev_close, \
.dev_acquisition_start = dev_acquisition_start, \
- .dev_acquisition_stop = dev_acquisition_stop, \
+ .dev_acquisition_stop = std_serial_dev_acquisition_stop, \
.context = NULL, \
}, \
VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
}).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.
+ */
+ /* bm25x based meters {{{ */
DMM(
- "bbcgm-2010", metex14,
- "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
- BBCGM_M2110_PACKET_SIZE, 0, 0, NULL,
- sr_m2110_packet_valid, sr_m2110_parse,
+ "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
+ ),
+ 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,
+ sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+ NULL
+ ),
+ 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,
+ NULL
+ ),
+ /* }}} */
+ /* fs9721 based meters {{{ */
DMM(
"digitek-dt4000zc", fs9721,
"Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400,
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,
sr_fs9721_10_temp_c
),
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
+ "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(
- "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,
+ "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(
- "mastech-ms8250b", fs9721,
- "MASTECH", "MS8250B", "2400/8n1/rts=0/dtr=1",
+ "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,
- NULL
+ sr_fs9721_00_temp_c
),
DMM(
"va-va18b", fs9721,
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(
+ "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
+ ),
+ /* }}} */
+ /* metex14 based meters {{{ */
+ DMM(
+ "bbcgm-2010", metex14,
+ "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
+ BBCGM_M2110_PACKET_SIZE, 0, 0, NULL,
+ sr_m2110_packet_valid, sr_m2110_parse,
+ NULL
+ ),
+ 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,
NULL
),
DMM(
- "peaktech-4370", metex14,
- "PeakTech", "4370", "1200/7n2/rts=0/dtr=1", 1200,
+ "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(
- "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
+ "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(
"radioshack-22-168", metex14,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
- 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
- ),
- 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(
"voltcraft-m3650cr", metex14,
"Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
+ /* }}} */
+ /* rs9lcd based meters {{{ */
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,
+ "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(
- /*
- * 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
- ),
- 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
- ),
- 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
- ),
- 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
),
- 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(
- /* 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,
- sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_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(
- "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,
- NULL
- ),
DMM(
"uni-t-ut71a-ser", ut71x,
"UNI-T", "UT71A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",
sr_ut71x_packet_valid, sr_ut71x_parse, NULL
),
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
- ),
- 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
),
+ /* }}} */
+ /* vc870 based meters {{{ */
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(
- "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(
- "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
- ),
- 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
- ),
- 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
+ "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.
+ */
);
projects / libsigrok.git / blobdiff