X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=366aaabe49f728eb24873424b0f00428ee9843e0;hb=551024f26f62cdea8eef1b787fbef31e1b58c466;hp=d0920c9b0921d42a4066bf33470ad6b0b9409232;hpb=048250d0e0a4cefdf192dbdb0e7f4dec3a881ed1;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index d0920c9b..366aaabe 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -24,6 +24,7 @@ static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, + SR_CONF_FORCE_DETECT, }; static const uint32_t drvopts[] = { @@ -45,65 +46,86 @@ static const uint32_t devopts[] = { SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET, }; +/* Voltage and current ranges. Values are: Min, max, step. */ +static const double volts_30[] = { 0, 31, 0.01, }; +static const double volts_60[] = { 0, 61, 0.01, }; +static const double amps_3[] = { 0, 3.1, 0.001, }; +static const double amps_5[] = { 0, 5.1, 0.001, }; + 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.1, 0.001}}, - {VELLEMAN_LABPS3005D, "Velleman", "LABPS3005D", - "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.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.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_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.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}}, + /* Vendor, model name, ID reply, channels, voltage, current, quirks. */ + {"Korad", "KA3005P", "KORADKA3005PV2.0", + 1, volts_30, amps_5, KORAD_QUIRK_ID_TRAILING}, + /* Some KA3005P have extra bytes after the ID text. */ + {"Korad", "KA3005P", "KORADKA3005PV2.0\x01", 1, volts_30, amps_5, 0}, + {"Korad", "KA3005P", "KORADKA3005PV2.0\xBC", 1, volts_30, amps_5, 0}, + {"Korad", "KA3005P", "KORAD KA3005P V4.2", 1, volts_30, amps_5, 0}, + {"Korad", "KA3005P", "KORAD KA3005P V5.5", 1, volts_30, amps_5, 0}, + {"Korad", "KD3005P", "KORAD KD3005P V2.0", 1, volts_30, amps_5, 0}, + {"Korad", "KD3005P", "KORADKD3005PV2.0", 1, volts_30, amps_5, 0}, + {"Korad", "KD3005P", "KORADKD3005PV2.1", 1, volts_30, amps_5, 0}, + {"Korad", "KD3005P", "KORAD KD3005P V4.1", 1, volts_30, amps_5, 0}, + {"Korad", "KD3005P", "KORAD KD3005P V6.8", 1, volts_30, amps_5, 0}, + {"Korad", "KD6005P", "KORAD KD6005P V2.2", 1, volts_60, amps_5, 0}, + {"RND", "KA3005P", "RND 320-KA3005P V5.5", 1, volts_30, amps_5, 0}, + {"RND", "KD3005P", "RND 320-KD3005P V4.2", 1, volts_30, amps_5, 0}, + {"RND", "KA3005P", "RND 320-KA3005P V2.0", 1, volts_30, amps_5, 0}, + {"Stamos Soldering", "S-LS-31", "S-LS-31 V2.0", + 1, volts_30, amps_5, KORAD_QUIRK_ID_NO_VENDOR}, + {"Tenma", "72-2535", "TENMA 72-2535 V2.1", 1, volts_30, amps_3, 0}, + {"Tenma", "72-2540", "TENMA72-2540V2.0", 1, volts_30, amps_5, 0}, + {"Tenma", "72-2540", "TENMA 72-2540 V2.1", 1, volts_30, amps_5, 0}, + {"Tenma", "72-2540", "TENMA 72-2540 V5.2", 1, volts_30, amps_5, 0}, + {"Tenma", "72-2550", "TENMA72-2550V2.0", 1, volts_60, amps_3, 0}, + {"Tenma", "72-2710", "TENMA 72-2710 V6.6", 1, volts_30, amps_5, 0}, + {"Velleman", "LABPS3005D", "VELLEMANLABPS3005DV2.0", + 1, volts_30, amps_5, KORAD_QUIRK_LABPS_OVP_EN}, + {"Velleman", "PS3005D", "VELLEMANPS3005DV2.0", + 1, volts_30, amps_5, 0}, ALL_ZERO }; +/* + * Bump this when adding new models[] above. Make sure the text buffer + * for the ID response can hold the longest sequence that we expect in + * the field which consists of: vendor + model [ + version ][ + serno ]. + * Don't be too generous here, the maximum receive buffer size affects + * the timeout within which the first response character is expected. + */ +static const size_t id_text_buffer_size = 48; + +/* + * Check whether the device's "*IDN?" response matches a supported model. + * The caller already stripped off the optional serial number. + */ +static gboolean model_matches(const struct korad_kaxxxxp_model *model, + const char *id_text) +{ + /* TODO Implement more versatile ID response text checks. */ + return g_strcmp0(model->id, id_text) == 0; +} + static GSList *scan(struct sr_dev_driver *di, GSList *options) { + static const char *serno_prefix = " SN:"; + struct dev_context *devc; GSList *l; struct sr_dev_inst *sdi; struct sr_config *src; const char *conn, *serialcomm; + const char *force_detect; struct sr_serial_dev_inst *serial; + size_t i; char reply[50]; - int i, model_id; - unsigned int len; + int ret; + const struct korad_kaxxxxp_model *model; + size_t len; + char *serno; conn = NULL; serialcomm = NULL; + force_detect = NULL; for (l = options; l; l = l->next) { src = l->data; @@ -114,6 +136,9 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) case SR_CONF_SERIALCOMM: serialcomm = g_variant_get_string(src->data, NULL); break; + case SR_CONF_FORCE_DETECT: + force_detect = g_variant_get_string(src->data, NULL); + break; default: sr_err("Unknown option %d, skipping.", src->key); break; @@ -124,55 +149,69 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return NULL; if (!serialcomm) serialcomm = "9600/8n1"; + if (force_detect && !*force_detect) + force_detect = NULL; serial = sr_serial_dev_inst_new(conn, serialcomm); if (serial_open(serial, SERIAL_RDWR) != SR_OK) return NULL; - /* Get the device model. */ - len = 0; - for (i = 0; models[i].id; i++) { - 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; + /* Communicate the identification request. */ + len = id_text_buffer_size; + if (len > sizeof(reply) - 1) + len = sizeof(reply) - 1; + sr_dbg("Want max %zu bytes.", len); - memset(&reply, 0, sizeof(reply)); - sr_dbg("Want max %d bytes.", len); - if ((korad_kaxxxxp_send_cmd(serial, "*IDN?") < 0)) + ret = korad_kaxxxxp_send_cmd(serial, "*IDN?"); + if (ret < 0) return NULL; - /* i is used here for debug purposes only. */ - if ((i = korad_kaxxxxp_read_chars(serial, len, reply)) < 0) + ret = korad_kaxxxxp_read_chars(serial, len, reply); + if (ret < 0) return NULL; - sr_dbg("Received: %d, %s", i, reply); - model_id = -1; + sr_dbg("Received: %d, %s", ret, reply); - /* Truncate before serial number. */ - char *sn = g_strrstr(reply, " SN:"); - if (sn) - *sn = '\0'; + /* + * Isolate the optional serial number at the response's end. + * Lookup the response's model ID in the list of known models. + */ + serno = g_strrstr(reply, serno_prefix); + if (serno) { + *serno = '\0'; + serno += strlen(serno_prefix); + } + model = NULL; for (i = 0; models[i].id; i++) { - if (!g_strcmp0(models[i].id, reply)) - model_id = i; + if (!model_matches(&models[i], reply)) + continue; + model = &models[i]; + break; + } + if (!model && force_detect) { + sr_warn("Found model ID '%s' is unknown, trying '%s' spec.", + reply, force_detect); + for (i = 0; models[i].id; i++) { + if (!model_matches(&models[i], force_detect)) + continue; + sr_info("Found replacement, using it instead."); + model = &models[i]; + break; + } } - if (model_id < 0) { + if (!model) { sr_err("Unknown model ID '%s' detected, aborting.", reply); return NULL; } - sr_dbg("Found: %s %s (idx %d, ID '%s').", models[model_id].vendor, - models[model_id].name, model_id, models[model_id].id); + sr_dbg("Found: %s %s (idx %zu, ID '%s').", model->vendor, model->name, + model - &models[0], model->id); sdi = g_malloc0(sizeof(struct sr_dev_inst)); sdi->status = SR_ST_INACTIVE; - sdi->vendor = g_strdup(models[model_id].vendor); - sdi->model = g_strdup(models[model_id].name); + sdi->vendor = g_strdup(model->vendor); + sdi->model = g_strdup(model->name); + if (serno) + sdi->serial_num = g_strdup(serno); sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; sdi->connection_id = g_strdup(conn); @@ -183,7 +222,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) 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->model = model; devc->req_sent_at = 0; devc->cc_mode_1_changed = FALSE; devc->cc_mode_2_changed = FALSE;