static const struct korad_kaxxxxp_model models[] = {
/* 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},
+ {"Korad", "KA3005P", "", 1, volts_30, amps_5,
+ KORAD_QUIRK_ID_TRAILING},
+ {"Korad", "KD3005P", "", 1, volts_30, amps_5, 0},
+ {"Korad", "KD6005P", "", 1, volts_60, 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},
+ {"Velleman", "PS3005D V1.3", "VELLEMANPS3005DV1.3" , 1, volts_30, amps_5,
+ KORAD_QUIRK_ID_TRAILING | KORAD_QUIRK_SLOW_PROCESSING},
+ {"Velleman", "PS3005D", "", 1, volts_30, amps_5, 0},
ALL_ZERO
};
const char *id_text)
{
gboolean matches;
- gboolean skip_vendor, accept_trail;
+ gboolean opt_version, skip_vendor, accept_trail;
const char *want;
if (!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;
}
/*
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:";
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;
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,
model - &models[0]);
- sdi = g_malloc0(sizeof(struct sr_dev_inst));
+ sdi = g_malloc0(sizeof(*sdi));
sdi->status = SR_ST_INACTIVE;
sdi->vendor = g_strdup(model->vendor);
sdi->model = g_strdup(model->name);
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));
+ devc = g_malloc0(sizeof(*devc));
sr_sw_limits_init(&devc->limits);
g_mutex_init(&devc->rw_mutex);
devc->model = model;
- devc->req_sent_at = 0;
+ devc->next_req_time = 0;
devc->cc_mode_1_changed = FALSE;
devc->cc_mode_2_changed = FALSE;
devc->output_enabled_changed = FALSE;
sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi);
- devc->req_sent_at = 0;
+ devc->next_req_time = 0;
serial = sdi->conn;
serial_source_add(sdi->session, serial, G_IO_IN,
KAXXXXP_POLL_INTERVAL_MS,
projects / libsigrok.git / blobdiff