X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=bf1e695e5a0856b17fc7344b4fc1ae557a9b98cf;hp=684047c6f529d40042875ead5a7102b03ee325f7;hb=HEAD;hpb=27186edacfe2cf168b0794c80672c422587cf8e8

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 684047c6..9af2bd5b 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -127,6 +127,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	 * happen to provide them. (This is a compromise to do it here,
 	 * and not extend the DMM_CONN() et al set of macros.)
 	 */
+	if (strcmp(dmm->di.name, "brymen-bm52x") == 0) {
+		/* Applicable to BM520s but not to BM820s. */
+		dmm->dmm_state_init = brymen_bm52x_state_init;
+		dmm->dmm_state_free = brymen_bm52x_state_free;
+		dmm->config_get = brymen_bm52x_config_get;
+		dmm->config_set = brymen_bm52x_config_set;
+		dmm->config_list = brymen_bm52x_config_list;
+		dmm->acquire_start = brymen_bm52x_acquire_start;
+	}
 	if (dmm->dmm_state_init)
 		dmm->dmm_state = dmm->dmm_state_init();
 
@@ -371,6 +380,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		sr_brymen_bm52x_packet_valid, sr_brymen_bm52x_parse,
 		NULL
 	),
+	DMM_CONN(
+		"brymen-bm82x", brymen_bm52x, "Brymen", "BM82x",
+		"hid/bu86x", NULL, BRYMEN_BM52X_PACKET_SIZE, 4000, 500,
+		sr_brymen_bm82x_packet_request,
+		sr_brymen_bm82x_packet_valid, sr_brymen_bm52x_parse,
+		NULL
+	),
 	/* }}} */
 	/* bm85x based meters {{{ */
 	DMM_LEN(
@@ -552,6 +568,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		FS9922_PACKET_SIZE, 0, 0, NULL,
 		sr_fs9922_packet_valid, sr_fs9922_parse, NULL
 	),
+	DMM(
+		"peaktech-2025", fs9922,
+		"PeakTech", "2025", "2400/8n1/rts=0/dtr=1",
+		FS9922_PACKET_SIZE, 0, 0, NULL,
+		sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+	),
 	DMM(
 		"sparkfun-70c", fs9922,
 		"SparkFun", "70C", "2400/8n1/rts=0/dtr=1",
@@ -603,21 +625,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		NULL
 	),
 	/* }}} */
-	/* ms2115b based meters {{{ */
+	/* meterman_38xr based meters {{{ */
 	DMM(
-		"mastech-ms2115b", ms2115b,
-		"MASTECH", "MS2115B", "1200/8n1",
-		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",
-		MS8250D_PACKET_SIZE, 0, 0, NULL,
-		sr_ms8250d_packet_valid, sr_ms8250d_parse,
+		"meterman-38xr", meterman_38xr,
+		"Meterman", "38XR", "9600/8n1/rts=0/dtr=1",
+		METERMAN_38XR_PACKET_SIZE, 0, 0, NULL,
+		meterman_38xr_packet_valid, meterman_38xr_parse,
 		NULL
 	),
 	/* }}} */
@@ -728,6 +741,24 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		NULL
 	),
 	/* }}} */
+	/* ms2115b based meters {{{ */
+	DMM(
+		"mastech-ms2115b", ms2115b,
+		"MASTECH", "MS2115B", "1200/8n1",
+		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",
+		MS8250D_PACKET_SIZE, 0, 0, NULL,
+		sr_ms8250d_packet_valid, sr_ms8250d_parse,
+		NULL
+	),
+	/* }}} */
 	/* rs9lcd based meters {{{ */
 	DMM(
 		"radioshack-22-812", rs9lcd,