X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=268de9f6b934e25ed6eec5e90a738170f588c8ec;hb=8da30037cf8cf0fedb8e87cba9ca56189ed7df5f;hp=7d8698231761f217ec47b671994688c15626fe57;hpb=76f712a73f3213a7ec0a38e38302cf2f04f48976;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 7d869823..268de9f6 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -55,12 +55,25 @@ static const struct korad_kaxxxxp_model models[] = {
 	/* 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}},
+	/* 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, 0.001}},
 	{KORAD_KD3005P, "Korad", "KD3005P",
 		"KORAD KD3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
 	{KORAD_KD3005P_V20_NOSP, "Korad", "KD3005P",
 		"KORADKD3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
 	{RND_320K30PV, "RND", "KA3005P",
 		"RND 320-KA3005P V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+	{TENMA_72_2540_V20, "Tenma", "72-2540",
+		"TENMA72-2540V2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+	{TENMA_72_2540_V21, "Tenma", "72-2540",
+		"TENMA 72-2540 V2.1", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+	{TENMA_72_2535_V21, "Tenma", "72-2535",
+		"TENMA 72-2535 V2.1", 1, {0, 31, 0.01}, {0, 3, 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, 0.001}},
 	ALL_ZERO
 };
 
@@ -122,7 +135,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sr_dbg("Received: %d, %s", i, reply);
 	model_id = -1;
 	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) {
@@ -186,16 +199,16 @@ static int config_get(uint32_t key, GVariant **data,
 		*data = g_variant_new_double(devc->voltage);
 		break;
 	case SR_CONF_VOLTAGE_TARGET:
-		korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_VOLTAGE_MAX, devc);
-		*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:
-		korad_kaxxxxp_get_value(sdi->conn, KAXXXXP_CURRENT_MAX, devc);
-		*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);
@@ -240,34 +253,34 @@ 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;
-		if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_VOLTAGE_MAX, 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;
-		if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_CURRENT_MAX, 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->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->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->set_ovp_enabled = bval;
 		if (korad_kaxxxxp_set_value(sdi->conn, KAXXXXP_OVP, devc) < 0)
 			return SR_ERR;
 		break;