korad-kaxxxxp: Add a new ID for KORAD KA3005P V4.2 power supply

[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 268de9f6b934e25ed6eec5e90a738170f588c8ec..16437a259631b5f655fa7401d6909fbe75755ca7 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -2,7 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2015 Hannu Vuolasaho <vuokkosetae@gmail.com>
- * Copyright (C) 2018 Frank Stettner <frank-stettner@gmx.net>
+ * Copyright (C) 2018-2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,10 +58,14 @@ static const struct korad_kaxxxxp_model models[] = {
        /* Sometimes the KA3005P has an extra 0xBC after the ID. */
        {KORAD_KA3005P_0XBC, "Korad", "KA3005P",
                "KORADKA3005PV2.0\xBC", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+       {KORAD_KA3005P_V42, "Korad", "KA3005P",
+               "KORAD KA3005P V4.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {KORAD_KD3005P, "Korad", "KD3005P",
                "KORAD KD3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
        {KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P",
                "KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+       {RND_320_KD3005P, "RND", "KD3005P",
+               "RND 320-KD3005P V4.2", 1, {0, 31, 0.01}, {0, 5, 0.001}},
        {RND_320K30PV, "RND", "KA3005P",
                "RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
        {TENMA_72_2540_V20, "Tenma", "72-2540",
@@ -124,6 +128,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                if (strlen(models[i].id) > len)
                        len = strlen(models[i].id);
        }
+
+       /*
+        * Some models also include the serial number:
+        * RND 320-KD3005P V4.2 SN:59834414
+        */
+       len += 12;
+
        memset(&reply, 0, sizeof(reply));
        sr_dbg("Want max %d bytes.", len);
        if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0))
@@ -134,6 +145,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                return NULL;
        sr_dbg("Received: %d, %s", i, reply);
        model_id = -1;
+
+       /* Truncate before serial number. */
+       char *sn = g_strrstr(reply, " SN:");
+       if (sn)
+               *sn = '\0';
+
        for (i = 0; models[i].id; i++) {
                if (!g_strcmp0(models[i].id, reply))
                        model_id = i;
@@ -160,6 +177,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        g_mutex_init(&devc->rw_mutex);
        devc->model = &models[model_id];
        devc->req_sent_at = 0;
+       devc->cc_mode_1_changed = FALSE;
+       devc->cc_mode_2_changed = FALSE;
+       devc->output_enabled_changed = FALSE;
+       devc->ocp_enabled_changed = FALSE;
+       devc->ovp_enabled_changed = FALSE;
        sdi->priv = devc;
 
        /* Get current status of device. */