X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=a54fe03f7508b1d305b31769b34cfa5d1debc155;hb=d1ad8b10bc9a928cb7b636bcf206ea59736a8658;hp=8047b09a3f79f3d01721a32fc4add020dbba50ec;hpb=53e875ab165f420d02d7132da07dd6f4ba509e98;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 8047b09a..a54fe03f 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -232,6 +232,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 +251,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
 	),
@@ -263,16 +270,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 +295,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 +325,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
@@ -451,7 +464,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
@@ -583,11 +596,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		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
 	),
+	/* }}} */
+	/*
+	 * The list is sorted. Add new items in the respective chip's group.
+	 */
 );