From: Gerhard Sittig <redacted>
Date: Thu, 15 Sep 2022 20:44:53 +0000 (+0200)
Subject: korad-kaxxxxp: trim down list of supported models (renames RND models)
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d241cc20bd476712806a36ee2838670434ce1d32;p=libsigrok.git

korad-kaxxxxp: trim down list of supported models (renames RND models)

Remove expected ID response literals from the list of supported models
when the generic "vendor and name" approach matches. Remove duplicate
entries (those which only differed in firmware version numbers or in
trailing garbage) which were obsoleted by the generic match approach.

This user perceivably "renames" previously and still currently supported
RND devices. Presents the RND vendor's "320-" prefix before the "KA3005"
stem. Should be acceptable given that this is the vendor's article name.
Exclusively affects display texts, the user provided driver name which
addresses the PSU remains as it was before.

The table of supported models now contains no entry with a fixed wanted
response text. But the match logic keeps support for this condition, so
that future entries can use it when required. RND entries could use it
when the "320-" prefix is undesirable, but version numbers are not
stripped transparently by the match logic's implementation.
---

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c380aec1..effab3e3 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -57,34 +57,21 @@ static const double amps_5[] = { 0, 5.1, 0.001, };
 
 static const struct korad_kaxxxxp_model models[] = {
 	/* Vendor, model name, ID reply, channels, voltage, current, quirks. */
-	{"Korad", "KA3005P", "KORADKA3005PV2.0",
-		1, volts_30, amps_5, KORAD_QUIRK_ID_TRAILING},
-	/* Some KA3005P have extra bytes after the ID text. */
-	{"Korad", "KA3005P", "KORADKA3005PV2.0\x01", 1, volts_30, amps_5, 0},
-	{"Korad", "KA3005P", "KORADKA3005PV2.0\xBC", 1, volts_30, amps_5, 0},
-	{"Korad", "KA3005P", "KORAD KA3005P V4.2", 1, volts_30, amps_5, 0},
-	{"Korad", "KA3005P", "KORAD KA3005P V5.5", 1, volts_30, amps_5, 0},
-	{"Korad", "KD3005P", "KORAD KD3005P V2.0", 1, volts_30, amps_5, 0},
-	{"Korad", "KD3005P", "KORADKD3005PV2.0", 1, volts_30, amps_5, 0},
-	{"Korad", "KD3005P", "KORADKD3005PV2.1", 1, volts_30, amps_5, 0},
-	{"Korad", "KD3005P", "KORAD KD3005P V4.1", 1, volts_30, amps_5, 0},
-	{"Korad", "KD3005P", "KORAD KD3005P V6.8", 1, volts_30, amps_5, 0},
-	{"Korad", "KD6005P", "KORAD KD6005P V2.2", 1, volts_60, amps_5, 0},
-	{"RND", "KA3005P", "RND 320-KA3005P V5.5", 1, volts_30, amps_5, 0},
-	{"RND", "KD3005P", "RND 320-KD3005P V4.2", 1, volts_30, amps_5, 0},
-	{"RND", "KA3005P", "RND 320-KA3005P V2.0", 1, volts_30, amps_5, 0},
-	{"Stamos Soldering", "S-LS-31", "S-LS-31 V2.0",
-		1, volts_30, amps_5, KORAD_QUIRK_ID_NO_VENDOR},
-	{"Tenma", "72-2535", "TENMA 72-2535 V2.1", 1, volts_30, amps_3, 0},
-	{"Tenma", "72-2540", "TENMA72-2540V2.0", 1, volts_30, amps_5, 0},
-	{"Tenma", "72-2540", "TENMA 72-2540 V2.1", 1, volts_30, amps_5, 0},
-	{"Tenma", "72-2540", "TENMA 72-2540 V5.2", 1, volts_30, amps_5, 0},
-	{"Tenma", "72-2550", "TENMA72-2550V2.0", 1, volts_60, amps_3, 0},
-	{"Tenma", "72-2710", "TENMA 72-2710 V6.6", 1, volts_30, amps_5, 0},
-	{"Velleman", "LABPS3005D", "VELLEMANLABPS3005DV2.0",
-		1, volts_30, amps_5, KORAD_QUIRK_LABPS_OVP_EN},
-	{"Velleman", "PS3005D", "VELLEMANPS3005DV2.0",
-		1, volts_30, amps_5, 0},
+	{"Korad", "KA3005P", "", 1, volts_30, amps_5,
+		KORAD_QUIRK_ID_TRAILING},
+	{"Korad", "KD3005P", "", 1, volts_30, amps_5, 0},
+	{"Korad", "KD6005P", "", 1, volts_60, amps_5, 0},
+	{"RND", "320-KA3005P", "", 1, volts_30, amps_5, 0},
+	{"RND", "320-KD3005P", "", 1, volts_30, amps_5, 0},
+	{"Stamos Soldering", "S-LS-31", "", 1, volts_30, amps_5,
+		KORAD_QUIRK_ID_NO_VENDOR},
+	{"Tenma", "72-2535", "", 1, volts_30, amps_3, 0},
+	{"Tenma", "72-2540", "", 1, volts_30, amps_5, 0},
+	{"Tenma", "72-2550", "", 1, volts_60, amps_3, 0},
+	{"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
+	{"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
+		KORAD_QUIRK_LABPS_OVP_EN},
+	{"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
 	ALL_ZERO
 };