X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=c913e6a1da4ee6ee46ec71cf08ac1bfc96390998;hb=942afb5abe9815ecac42f95167982a61aae2cb8a;hp=1b89231e6e9da8981a698a065689882edf5693ee;hpb=d8aad7281ebe4efde521bf96b7c009acc3d4c09a;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 1b89231e..c913e6a1 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -46,56 +46,40 @@ 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_V20, "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}},
-	{KORAD_KD3005P_V21_NOSP, "Korad", "KD3005P",
-		"KORADKD3005PV2.1", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{KORAD_KD3005P_V41, "Korad", "KD3005P",
-		"KORAD KD3005P V4.1", 1, {0, 31, 0.01}, {0, 5.1, 0.001}},
-	{KORAD_KD3005P_V68, "Korad", "KD3005P",
-		"KORAD KD3005P V6.8", 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}},
-	{TENMA_72_2710_V66, "Tenma", "72-2710",
-		"TENMA 72-2710 V6.6", 1, {0, 31, 0.01}, {0, 5.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, 0},
+	/* 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, 0},
+	{"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
 };
 
@@ -110,8 +94,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn, *serialcomm;
 	const char *force_detect;
 	struct sr_serial_dev_inst *serial;
+	size_t i;
 	char reply[50];
-	int ret, i, model_id;
+	int ret;
+	const struct korad_kaxxxxp_model *model;
 	size_t len;
 	char *serno;
 
@@ -182,35 +168,35 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		serno += strlen(serno_prefix);
 	}
 
-	model_id = -1;
+	model = NULL;
 	for (i = 0; models[i].id; i++) {
 		if (g_strcmp0(models[i].id, reply) != 0)
 			continue;
-		model_id = i;
+		model = &models[i];
 		break;
 	}
-	if (model_id < 0 && force_detect) {
+	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 (strcmp(models[i].id, force_detect) != 0)
 				continue;
 			sr_info("Found replacement, using it instead.");
-			model_id = i;
+			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;
@@ -223,7 +209,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;