X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=009f37c5e63f5caadabb054b8a891bbd9530b503;hb=dcd212f7a2c9b9acba649dea782ee358e1dfbeb5;hp=bcff1913f5ee4d1e6db73e80acca88169dad6f75;hpb=388aa0fb6bf70557115d1f301aae1560e8c643bb;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index bcff1913..009f37c5 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -136,6 +136,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	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;
@@ -257,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,
@@ -442,6 +457,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		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,