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,
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)
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);
.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, \
* 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,
/* 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
),
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,
),
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,
),
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
),
/* }}} */
/* 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",
&sr_fs9922_z1_diode
),
/* }}} */
- /* meters based on other chips (to get sorted) */
+ /* 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
),
+ /* }}} */
+ /* metex14 based meters {{{ */
DMM(
- "metex-me31", metex14,
- "Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
+ "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(
- "peaktech-3410", metex14,
- "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600,
+ "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(
- "mastech-mas345", metex14,
- "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
+ "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-m3640d", metex14,
- "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
+ "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-m4650cr", metex14,
- "Metex", "M-4650CR", "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(
+ "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
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,
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(
"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-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
+ "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(
- "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
),
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
),
+ /* }}} */
+ /* 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.
+ */
);