X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=a9f9cff81fcac132c498d1112317c27a7e052eae;hb=d5b1b76d65c446bed0dbabdccd66e51d8cdc8298;hp=3c80ec212a88811ef2006aedd5627769acd6d24d;hpb=ab34156b900e0166a75d03ceb6f36e4a7cc92415;p=libsigrok.git

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 3c80ec21..a9f9cff8 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -263,16 +263,20 @@ 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.
+	 */
 	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 +285,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,
@@ -422,36 +425,36 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		NULL
 	),
 	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-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-m3640d", metex14,
-		"Metex", "M-3640D", "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(
-		"metex-m4650cr", metex14,
-		"Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200,
+		"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
@@ -506,7 +509,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		NULL
 	),
 	/* }}} */
-	/* meters based on other chips (to get sorted) */
+	/* rs9lcd based meters {{{ */
 	DMM(
 		"radioshack-22-812", rs9lcd,
 		"RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800,
@@ -514,27 +517,23 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
 		NULL
 	),
+	/* }}} */
+	/* ut71x 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
-	),
-	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
 	),
@@ -569,21 +568,33 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
 		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.
+	 */
 );