From: Gerhard Sittig <redacted>
Date: Thu, 15 Sep 2022 19:52:08 +0000 (+0200)
Subject: korad-kaxxxxp: alpha-sort list of supported models
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1c88133c8eb16b64fa5f859d902e1e4344b3a005;p=libsigrok.git

korad-kaxxxxp: alpha-sort list of supported models

Sort the models[] table by vendor name and model name. Use the enum
identifier as a sort key (haven't checked the ID response text).
---

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 1b89231e..d6adbf35 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -48,10 +48,6 @@ static const uint32_t devopts[] = {
 
 static const struct korad_kaxxxxp_model models[] = {
 	/* Device enum, vendor, model, ID reply, channels, voltage, current */
-	{VELLEMAN_PS3005D, "Velleman", "PS3005D",
-		"VELLEMANPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{VELLEMAN_LABPS3005D, "Velleman", "LABPS3005D",
-		"VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	{KORAD_KA3005P, "Korad", "KA3005P",
 		"KORADKA3005PV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	/* Sometimes the KA3005P has an extra 0x01 after the ID. */
@@ -74,28 +70,32 @@ static const struct korad_kaxxxxp_model models[] = {
 		"KORAD KD3005P V4.1", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	{KORAD_KD3005P_V68, "Korad", "KD3005P",
 		"KORAD KD3005P V6.8", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{RND_320_KD3005P, "RND", "KD3005P",
-		"RND 320-KD3005P V4.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+	{KORAD_KD6005P, "Korad", "KD6005P",
+		"KORAD KD6005P V2.2", 1, {0, 61, 0.01}, {0, 5.1, 0.001}},
 	{RND_320_KA3005P, "RND", "KA3005P",
 		"RND 320-KA3005P V5.5", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+	{RND_320_KD3005P, "RND", "KD3005P",
+		"RND 320-KD3005P V4.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	{RND_320K30PV, "RND", "KA3005P",
 		"RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{TENMA_72_2550_V2, "Tenma", "72-2550",
-		"TENMA72-2550V2.0", 1, {0, 61, 0.01}, {0, 3.1, 0.001}},
+	{STAMOS_SLS31_V20, "Stamos Soldering", "S-LS-31",
+		"S-LS-31 V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+	{TENMA_72_2535_V21, "Tenma", "72-2535",
+		"TENMA 72-2535 V2.1", 1, {0, 31, 0.01}, {0, 3.1, 0.001}},
 	{TENMA_72_2540_V20, "Tenma", "72-2540",
 		"TENMA72-2540V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	{TENMA_72_2540_V21, "Tenma", "72-2540",
 		"TENMA 72-2540 V2.1", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	{TENMA_72_2540_V52, "Tenma", "72-2540",
 		"TENMA 72-2540 V5.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{TENMA_72_2535_V21, "Tenma", "72-2535",
-		"TENMA 72-2535 V2.1", 1, {0, 31, 0.01}, {0, 3.1, 0.001}},
+	{TENMA_72_2550_V2, "Tenma", "72-2550",
+		"TENMA72-2550V2.0", 1, {0, 61, 0.01}, {0, 3.1, 0.001}},
 	{TENMA_72_2710_V66, "Tenma", "72-2710",
 		"TENMA 72-2710 V6.6", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{STAMOS_SLS31_V20, "Stamos Soldering", "S-LS-31",
-		"S-LS-31 V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{KORAD_KD6005P, "Korad", "KD6005P",
-		"KORAD KD6005P V2.2", 1, {0, 61, 0.01}, {0, 5.1, 0.001}},
+	{VELLEMAN_LABPS3005D, "Velleman", "LABPS3005D",
+		"VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+	{VELLEMAN_PS3005D, "Velleman", "PS3005D",
+		"VELLEMANPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
 	ALL_ZERO
 };
 
diff --git a/src/hardware/korad-kaxxxxp/protocol.h b/src/hardware/korad-kaxxxxp/protocol.h
index 9146f66d..a0cbdca6 100644
--- a/src/hardware/korad-kaxxxxp/protocol.h
+++ b/src/hardware/korad-kaxxxxp/protocol.h
@@ -32,8 +32,6 @@
 #define KAXXXXP_POLL_INTERVAL_MS 80
 
 enum {
-	VELLEMAN_PS3005D,
-	VELLEMAN_LABPS3005D,
 	KORAD_KA3005P,
 	KORAD_KA3005P_0X01,
 	KORAD_KA3005P_0XBC,
@@ -44,17 +42,19 @@ enum {
 	KORAD_KD3005P_V21_NOSP,
 	KORAD_KD3005P_V41,
 	KORAD_KD3005P_V68,
-	RND_320_KD3005P,
+	KORAD_KD6005P,
 	RND_320_KA3005P,
+	RND_320_KD3005P,
 	RND_320K30PV,
-	TENMA_72_2550_V2,
+	STAMOS_SLS31_V20,
+	TENMA_72_2535_V21,
 	TENMA_72_2540_V20,
 	TENMA_72_2540_V21,
 	TENMA_72_2540_V52,
-	TENMA_72_2535_V21,
+	TENMA_72_2550_V2,
 	TENMA_72_2710_V66,
-	STAMOS_SLS31_V20,
-	KORAD_KD6005P,
+	VELLEMAN_LABPS3005D,
+	VELLEMAN_PS3005D,
 	/* Support for future devices with this protocol. */
 };