korad-kaxxxxp: use ID text prefix with optional version for RND models

[libsigrok.git] / src / hardware / korad-kaxxxxp / api.c

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index effab3e337ff78f01f7da2ca319e7d28f179da4e..d04152af55bfb18de2851b8039a34fc97bd02784 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -61,8 +61,10 @@ static const struct korad_kaxxxxp_model models[] = {
                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},
+       {"RND", "KA3005P", "RND 320-KA3005P", 1, volts_30, amps_5,
+               KORAD_QUIRK_ID_OPT_VERSION},
+       {"RND", "KD3005P", "RND 320-KD3005P", 1, volts_30, amps_5,
+               KORAD_QUIRK_ID_OPT_VERSION},
        {"Stamos Soldering", "S-LS-31", "", 1, volts_30, amps_5,
                KORAD_QUIRK_ID_NO_VENDOR},
        {"Tenma", "72-2535", "", 1, volts_30, amps_3, 0},
@@ -92,7 +94,7 @@ static gboolean model_matches(const struct korad_kaxxxxp_model *model,
        const char *id_text)
 {
        gboolean matches;
-       gboolean skip_vendor, accept_trail;
+       gboolean opt_version, skip_vendor, accept_trail;
        const char *want;
 
        if (!model)
@@ -103,12 +105,34 @@ static gboolean model_matches(const struct korad_kaxxxxp_model *model,
         * then expect to see this very text in literal form. This
         * lets the driver map weird and untypical responses to a
         * specific set of display texts for vendor and model names.
+        * Accept an optionally trailing version if models[] says so.
         */
        if (model->id && model->id[0]) {
-               matches = g_strcmp0(model->id, id_text) == 0;
-               if (matches)
+               opt_version = model->quirks & KORAD_QUIRK_ID_OPT_VERSION;
+               if (!opt_version) {
+                       matches = g_strcmp0(id_text, model->id) == 0;
+                       if (!matches)
+                               return FALSE;
                        sr_dbg("Matches expected ID text: '%s'.", model->id);
-               return matches;
+                       return TRUE;
+               }
+               matches = g_str_has_prefix(id_text, model->id);
+               if (!matches)
+                       return FALSE;
+               id_text += strlen(model->id);
+               while (isspace((int)*id_text))
+                       id_text++;
+               if (*id_text == 'V') {
+                       id_text++;
+                       while (*id_text == '.' || isdigit((int)*id_text))
+                               id_text++;
+                       while (isspace((int)*id_text))
+                               id_text++;
+               }
+               if (*id_text)
+                       return FALSE;
+               sr_dbg("Matches expected ID text [vers]: '%s'.", model->id);
+               return TRUE;
        }
 
        /*