From: Gerhard Sittig <redacted>
Date: Sat, 15 Jun 2019 21:50:07 +0000 (+0200)
Subject: uni-t-dmm: sort supported devices, collect the ut71x group
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=6ee37801751a6e76e6b5865d1b3c88b9d342fe53;p=libsigrok.git

uni-t-dmm: sort supported devices, collect the ut71x group
---

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index e9a44172..765e883a 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -221,6 +221,7 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_fs9721_00_temp_c
 	),
 	/* }}} */
+	/* {{{ ut372 */
 	DMM(
 		"uni-t-ut372", ut372,
 		"UNI-T", "UT372", 2400,
@@ -228,43 +229,8 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		sr_ut372_packet_valid, sr_ut372_parse,
 		NULL
 	),
-	DMM(
-		"uni-t-ut60g", es519xx,
-		/* The baudrate is actually 19230, see "Note 1" below. */
-		"UNI-T", "UT60G", 19200,
-		ES519XX_11B_PACKET_SIZE,
-		sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
-		NULL
-	),
-	DMM(
-		"uni-t-ut61b", fs9922,
-		"UNI-T", "UT61B", 2400,
-		FS9922_PACKET_SIZE,
-		sr_fs9922_packet_valid, sr_fs9922_parse,
-		NULL
-	),
-	DMM(
-		"uni-t-ut61c", fs9922,
-		"UNI-T", "UT61C", 2400,
-		FS9922_PACKET_SIZE,
-		sr_fs9922_packet_valid, sr_fs9922_parse,
-		NULL
-	),
-	DMM(
-		"uni-t-ut61d", fs9922,
-		"UNI-T", "UT61D", 2400,
-		FS9922_PACKET_SIZE,
-		sr_fs9922_packet_valid, sr_fs9922_parse,
-		NULL
-	),
-	DMM(
-		"uni-t-ut61e", es519xx,
-		/* The baudrate is actually 19230, see "Note 1" below. */
-		"UNI-T", "UT61E", 19200,
-		ES519XX_14B_PACKET_SIZE,
-		sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
-		NULL
-	),
+	/* }}} */
+	/* {{{ ut71x */
 	DMM(
 		"uni-t-ut71a", ut71x,
 		"UNI-T", "UT71A", 2400, UT71X_PACKET_SIZE,
@@ -295,23 +261,6 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		"UNI-T", "UT804", 2400, UT71X_PACKET_SIZE,
 		sr_ut71x_packet_valid, sr_ut71x_parse, NULL
 	),
-	DMM(
-		"voltcraft-vc830", fs9922,
-		/*
-		 * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
-		 * the FS9922 protocol. Instead, it only sets the user-defined
-		 * bit "z1" to indicate "diode mode" and "voltage".
-		 */
-		"Voltcraft", "VC-830", 2400,
-		FS9922_PACKET_SIZE,
-		sr_fs9922_packet_valid, sr_fs9922_parse,
-		&sr_fs9922_z1_diode
-	),
-	DMM(
-		"voltcraft-vc870", vc870,
-		"Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
-		sr_vc870_packet_valid, sr_vc870_parse, NULL
-	),
 	DMM(
 		"voltcraft-vc920", ut71x,
 		"Voltcraft", "VC-920", 2400, UT71X_PACKET_SIZE,
@@ -345,6 +294,61 @@ SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
 		UT71X_PACKET_SIZE,
 		sr_ut71x_packet_valid, sr_ut71x_parse, NULL
 	),
+	/* }}} */
+	DMM(
+		"uni-t-ut60g", es519xx,
+		/* The baudrate is actually 19230, see "Note 1" below. */
+		"UNI-T", "UT60G", 19200,
+		ES519XX_11B_PACKET_SIZE,
+		sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+		NULL
+	),
+	DMM(
+		"uni-t-ut61b", fs9922,
+		"UNI-T", "UT61B", 2400,
+		FS9922_PACKET_SIZE,
+		sr_fs9922_packet_valid, sr_fs9922_parse,
+		NULL
+	),
+	DMM(
+		"uni-t-ut61c", fs9922,
+		"UNI-T", "UT61C", 2400,
+		FS9922_PACKET_SIZE,
+		sr_fs9922_packet_valid, sr_fs9922_parse,
+		NULL
+	),
+	DMM(
+		"uni-t-ut61d", fs9922,
+		"UNI-T", "UT61D", 2400,
+		FS9922_PACKET_SIZE,
+		sr_fs9922_packet_valid, sr_fs9922_parse,
+		NULL
+	),
+	DMM(
+		"uni-t-ut61e", es519xx,
+		/* The baudrate is actually 19230, see "Note 1" below. */
+		"UNI-T", "UT61E", 19200,
+		ES519XX_14B_PACKET_SIZE,
+		sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
+		NULL
+	),
+	DMM(
+		"voltcraft-vc830", fs9922,
+		/*
+		 * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
+		 * the FS9922 protocol. Instead, it only sets the user-defined
+		 * bit "z1" to indicate "diode mode" and "voltage".
+		 */
+		"Voltcraft", "VC-830", 2400,
+		FS9922_PACKET_SIZE,
+		sr_fs9922_packet_valid, sr_fs9922_parse,
+		&sr_fs9922_z1_diode
+	),
+	DMM(
+		"voltcraft-vc870", vc870,
+		"Voltcraft", "VC-870", 9600, VC870_PACKET_SIZE,
+		sr_vc870_packet_valid, sr_vc870_parse, NULL
+	),
 	DMM(
 		"tenma-72-7750", es519xx,
 		/* The baudrate is actually 19230, see "Note 1" below. */