korad-kaxxxxp: add config_get() support for SR_CONF_CONN

[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 16437a259631b5f655fa7401d6909fbe75755ca7..d0920c9b0921d42a4066bf33470ad6b0b9409232 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -31,6 +31,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
+       SR_CONF_CONN | SR_CONF_GET,
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
@@ -47,37 +48,45 @@ 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, 0.001}},
+               "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, 0.001}},
+               "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, 0.001}},
+               "KORADKA3005PV2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        /* Sometimes the KA3005P has an extra 0x01 after the ID. */
        {KORAD_KA3005P_0X01, "Korad", "KA3005P",
-               "KORADKA3005PV2.0\x01", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+               "KORADKA3005PV2.0\x01", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        /* 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}},
+               "KORADKA3005PV2.0\xBC", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {KORAD_KA3005P_V42, "Korad", "KA3005P",
                "KORAD KA3005P V4.2", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
+       {KORAD_KA3005P_V55, "Korad", "KA3005P",
+               "KORAD KA3005P V5.5", 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 V2.0", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
        {KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P",
-               "KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+               "KORADKD3005PV2.0", 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, 0.001}},
+               "RND 320-KD3005P V4.2", 1, {0, 31, 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_320K30PV, "RND", "KA3005P",
-               "RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+               "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}},
        {TENMA_72_2540_V20, "Tenma", "72-2540",
-               "TENMA72-2540V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+               "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, 0.001}},
+               "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, 0.001}},
+               "TENMA 72-2535 V2.1", 1, {0, 31, 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}},
        {KORAD_KD6005P, "Korad", "KD6005P",
-               "KORAD KD6005P V2.2", 1, {0, 61, 0.01}, {0, 5, 0.001}},
+               "KORAD KD6005P V2.2", 1, {0, 61, 0.01}, {0, 5.1, 0.001}},
        ALL_ZERO
 };
 
@@ -120,8 +129,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       serial_flush(serial);
-
        /* Get the device model. */
        len = 0;
        for (i = 0; models[i].id; i++) {
@@ -168,6 +175,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->model = g_strdup(models[model_id].name);
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
+       sdi->connection_id = g_strdup(conn);
 
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V");
        sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I");
@@ -216,6 +224,9 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_LIMIT_SAMPLES:
        case SR_CONF_LIMIT_MSEC:
                return sr_sw_limits_config_get(&devc->limits, key, data);
+       case SR_CONF_CONN:
+               *data = g_variant_new_string(sdi->connection_id);
+               break;
        case SR_CONF_VOLTAGE:
                korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE, devc);
                *data = g_variant_new_double(devc->voltage);