X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=d9d3a9ce5bc8bf8278342f5e02273a395fa3ed1b;hb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;hp=07fc9b41056a51d6ce488be676084c56959153b9;hpb=bcf9384d3d2cad0effb5ef2769697d8af05b8a17;p=libsigrok.git diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index 07fc9b41..d9d3a9ce 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -50,10 +50,15 @@ static const uint32_t devopts[] = { static const struct korad_kaxxxxp_model models[] = { /* Device enum, vendor, model, ID reply, channels, voltage, current */ - {VELLEMAN_LABPS_3005D, "Velleman", "LABPS3005D", + {VELLEMAN_PS3005D, "Velleman", "PS3005D", + "VELLEMANPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, + {VELLEMAN_LABPS3005D, "Velleman", "LABPS3005D", "VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, {KORAD_KA3005P, "Korad", "KA3005P", "KORADKA3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 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}}, ALL_ZERO }; @@ -133,7 +138,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sr_err("Unknown model ID '%s' detected, aborting.", reply); return NULL; } - sr_dbg("Found: %s %s", models[model_id].vendor, models[model_id].name); + sr_dbg("Found: %s %s (idx %d, ID '%s').", models[model_id].vendor, + models[model_id].name, model_id, models[model_id].id); /* Init device instance, etc. */ sdi = g_malloc0(sizeof(struct sr_dev_inst)); @@ -386,7 +392,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) devc = sdi->priv; devc->cb_data = cb_data; - /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); devc->starttime = g_get_monotonic_time();