X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=3c9a2718f1a8fe9b5a09b8fde31cb92144777da4;hb=8b58a519e4d9e972f2cfc2f05ab2fc2c9f3fd591;hp=acd50961f25a1487f32ace54a56cb98e169b6164;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index acd50961..3c9a2718 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -2,6 +2,7 @@ * This file is part of the libsigrok project. * * Copyright (C) 2015 Hannu Vuolasaho + * Copyright (C) 2018-2019 Frank Stettner * * 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 @@ -46,14 +47,43 @@ 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.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.1, 0.001}}, + {KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P", + "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.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.1, 0.001}}, + {TENMA_72_2540_V20, "Tenma", "72-2540", + "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.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.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.1, 0.001}}, ALL_ZERO }; @@ -104,6 +134,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)) @@ -114,8 +151,14 @@ 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 (!strcmp(models[i].id, reply)) + if (!g_strcmp0(models[i].id, reply)) model_id = i; } if (model_id < 0) { @@ -132,13 +175,19 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1"); + sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V"); + sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I"); devc = g_malloc0(sizeof(struct dev_context)); sr_sw_limits_init(&devc->limits); + g_mutex_init(&devc->rw_mutex); devc->model = &models[model_id]; - devc->reply[5] = 0; 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. */ @@ -174,28 +223,36 @@ static int config_get(uint32_t key, GVariant **data, case SR_CONF_LIMIT_MSEC: return sr_sw_limits_config_get(&devc->limits, key, data); case SR_CONF_VOLTAGE: + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE, devc); *data = g_variant_new_double(devc->voltage); break; case SR_CONF_VOLTAGE_TARGET: - *data = g_variant_new_double(devc->voltage_max); + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE_TARGET, devc); + *data = g_variant_new_double(devc->voltage_target); break; case SR_CONF_CURRENT: + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_CURRENT, devc); *data = g_variant_new_double(devc->current); break; case SR_CONF_CURRENT_LIMIT: - *data = g_variant_new_double(devc->current_max); + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_CURRENT_LIMIT, devc); + *data = g_variant_new_double(devc->current_limit); break; case SR_CONF_ENABLED: + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_OUTPUT, devc); *data = g_variant_new_boolean(devc->output_enabled); break; case SR_CONF_REGULATION: /* Dual channel not supported. */ + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_STATUS, devc); *data = g_variant_new_string((devc->cc_mode[0]) ? "CC" : "CV"); break; case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_OCP, devc); *data = g_variant_new_boolean(devc->ocp_enabled); break; case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED: + korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_OVP, devc); *data = g_variant_new_boolean(devc->ovp_enabled); break; default: @@ -224,40 +281,35 @@ static int config_set(uint32_t key, GVariant *data, dval = g_variant_get_double(data); if (dval < devc->model->voltage[0] || dval > devc->model->voltage[1]) return SR_ERR_ARG; - devc->voltage_max = dval; - devc->target = KAXXXXP_VOLTAGE_MAX; - if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0) + devc->set_voltage_target = dval; + if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_VOLTAGE_TARGET, devc) < 0) return SR_ERR; break; case SR_CONF_CURRENT_LIMIT: dval = g_variant_get_double(data); if (dval < devc->model->current[0] || dval > devc->model->current[1]) return SR_ERR_ARG; - devc->current_max = dval; - devc->target = KAXXXXP_CURRENT_MAX; - if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0) + devc->set_current_limit = dval; + if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_CURRENT_LIMIT, devc) < 0) return SR_ERR; break; case SR_CONF_ENABLED: bval = g_variant_get_boolean(data); /* Set always so it is possible turn off with sigrok-cli. */ - devc->output_enabled = bval; - devc->target = KAXXXXP_OUTPUT; - if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0) + devc->set_output_enabled = bval; + if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_OUTPUT, devc) < 0) return SR_ERR; break; case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED: bval = g_variant_get_boolean(data); - devc->ocp_enabled = bval; - devc->target = KAXXXXP_OCP; - if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0) + devc->set_ocp_enabled = bval; + if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_OCP, devc) < 0) return SR_ERR; break; case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED: bval = g_variant_get_boolean(data); - devc->ovp_enabled = bval; - devc->target = KAXXXXP_OVP; - if (korad_kaxxxxp_set_value(sdi->conn, devc) < 0) + devc->set_ovp_enabled = bval; + if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_OVP, devc) < 0) return SR_ERR; break; default: @@ -271,10 +323,6 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; - GVariant *gvar; - GVariantBuilder gvb; - double dval; - int idx; devc = (sdi) ? sdi->priv : NULL; @@ -283,24 +331,14 @@ static int config_list(uint32_t key, GVariant **data, case SR_CONF_DEVICE_OPTIONS: return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_VOLTAGE_TARGET: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (idx = 0; idx < 3; idx++) { - dval = devc->model->voltage[idx]; - gvar = g_variant_new_double(dval); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + if (!devc || !devc->model) + return SR_ERR_ARG; + *data = std_gvar_min_max_step_array(devc->model->voltage); break; case SR_CONF_CURRENT_LIMIT: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - /* Min, max, step. */ - for (idx = 0; idx < 3; idx++) { - dval = devc->model->current[idx]; - gvar = g_variant_new_double(dval); - g_variant_builder_add_value(&gvb, gvar); - } - *data = g_variant_builder_end(&gvb); + if (!devc || !devc->model) + return SR_ERR_ARG; + *data = std_gvar_min_max_step_array(devc->model->current); break; default: return SR_ERR_NA; @@ -309,6 +347,17 @@ static int config_list(uint32_t key, GVariant **data, return SR_OK; } +static int dev_close(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + + devc = (sdi) ? sdi->priv : NULL; + if (devc) + g_mutex_clear(&devc->rw_mutex); + + return std_serial_dev_close(sdi); +} + static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -319,7 +368,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); - devc->reply_pending = FALSE; devc->req_sent_at = 0; serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, @@ -342,7 +390,7 @@ static struct sr_dev_driver korad_kaxxxxp_driver_info = { .config_set = config_set, .config_list = config_list, .dev_open = std_serial_dev_open, - .dev_close = std_serial_dev_close, + .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = std_serial_dev_acquisition_stop, .context = NULL,