korad-kaxxxxp: add model entry for Tenma 72-2705

[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..d36dc35815768f4d1637bb27cec0e155f7610847 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -61,13 +61,16 @@ 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},
        {"Tenma", "72-2540", "", 1, volts_30, amps_5, 0},
        {"Tenma", "72-2550", "", 1, volts_60, amps_3, 0},
+       {"Tenma", "72-2705", "", 1, volts_30, amps_3, 0},
        {"Tenma", "72-2710", "", 1, volts_30, amps_5, 0},
        {"Velleman", "LABPS3005D", "", 1, volts_30, amps_5,
                KORAD_QUIRK_LABPS_OVP_EN},
@@ -92,7 +95,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 +106,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;
        }
 
        /*
@@ -171,6 +196,30 @@ static gboolean model_matches(const struct korad_kaxxxxp_model *model,
        return TRUE;
 }
 
+/* Lookup a model from an ID response text. */
+static const struct korad_kaxxxxp_model *model_lookup(const char *id_text)
+{
+       size_t idx;
+       const struct korad_kaxxxxp_model *check;
+
+       if (!id_text || !*id_text)
+               return NULL;
+       sr_dbg("Looking up: [%s].", id_text);
+
+       for (idx = 0; idx < ARRAY_SIZE(models); idx++) {
+               check = &models[idx];
+               if (!check->name || !check->name[0])
+                       continue;
+               if (!model_matches(check, id_text))
+                       continue;
+               sr_dbg("Found: [%s] [%s]", check->vendor, check->name);
+               return check;
+       }
+       sr_dbg("Not found");
+
+       return NULL;
+}
+
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        static const char *serno_prefix = " SN:";
@@ -182,7 +231,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        const char *conn, *serialcomm;
        const char *force_detect;
        struct sr_serial_dev_inst *serial;
-       size_t i;
        char reply[50];
        int ret;
        const struct korad_kaxxxxp_model *model;
@@ -247,26 +295,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                serno += strlen(serno_prefix);
        }
 
-       model = NULL;
-       for (i = 0; models[i].name; i++) {
-               if (!model_matches(&models[i], reply))
-                       continue;
-               model = &models[i];
-               break;
-       }
+       model = model_lookup(reply);
        if (!model && force_detect) {
-               sr_warn("Found unknown model ID '%s', trying '%s' spec.",
+               sr_warn("Could not find model ID '%s', trying '%s'.",
                        reply, force_detect);
-               for (i = 0; models[i].name; i++) {
-                       if (!model_matches(&models[i], force_detect))
-                               continue;
+               model = model_lookup(force_detect);
+               if (model)
                        sr_info("Found replacement, using it instead.");
-                       model = &models[i];
-                       break;
-               }
        }
        if (!model) {
-               sr_err("Found unknown model ID '%s', aborting.", reply);
+               sr_err("Unsupported model ID '%s', aborting.", reply);
                return NULL;
        }
        sr_dbg("Found: %s %s (idx %zu).", model->vendor, model->name,