X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fapi.c;h=268de9f6b934e25ed6eec5e90a738170f588c8ec;hb=8da30037cf8cf0fedb8e87cba9ca56189ed7df5f;hp=32f352a5291d948d70ac10cf3da8ffa663a6cf2f;hpb=1c0e1baaaaf0314f49470fb49a4f5e6ddc0ba1a1;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 32f352a5..268de9f6 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -68,8 +68,12 @@ static const struct korad_kaxxxxp_model models[] = {
 		"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
 };
 
@@ -195,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);
@@ -249,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;