X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=86d34a47fa7f9ea2bfa539d89b33d23b5e4cc08c;hb=9cfc695ffe5f04622f61acb98ea4ac91c3f4ffc3;hp=bf6917e78ae240ccd646f075e2505ebebbd14410;hpb=803db07a1af036a5da65581ddbac23b7f84a4388;p=libsigrok.git

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index bf6917e7..86d34a47 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -43,7 +43,7 @@ static const uint32_t devopts[] = {
 };
 
 static const uint32_t devopts_cg[] = {
-	SR_CONF_ENABLED | SR_CONF_GET,
+	SR_CONF_ENABLED | SR_CONF_SET,
 	SR_CONF_REGULATION | SR_CONF_GET,
 	SR_CONF_VOLTAGE | SR_CONF_GET,
 	SR_CONF_CURRENT | SR_CONF_GET,
@@ -52,6 +52,8 @@ static const uint32_t devopts_cg[] = {
 	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET,
 	SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET,
 	SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_UNDER_VOLTAGE_CONDITION | SR_CONF_GET,
+	SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE | SR_CONF_GET,
 };
 
 SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
@@ -75,6 +77,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn, *serialcomm;
 	char buf[100];
 	char *bufptr;
+	double version;
 
 	devices = NULL;
 	drvc = di->context;
@@ -123,6 +126,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		return NULL;
 	}
 
+	version = g_ascii_strtod(buf + 8, NULL);
+	if (version < 1.10) {
+		sr_info("Firmware >= 1.10 required (got %1.2f).", version);
+		serial_close(serial);
+		return NULL;
+	}
+
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
 	sdi->status = SR_ST_ACTIVE;
 	sdi->vendor = g_strdup("Arachnid Labs");
@@ -242,6 +252,7 @@ static int config_get(uint32_t key, GVariant **data,
 	 *  - SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD
 	 *  - SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE
 	 *  - SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD
+	 *  - SR_CONF_ENABLED (state cannot be queried, only set)
 	 */
 
 	ret = SR_OK;
@@ -252,9 +263,6 @@ static int config_get(uint32_t key, GVariant **data,
 	case SR_CONF_LIMIT_MSEC:
 		*data = g_variant_new_uint64(devc->limit_msec);
 		break;
-	case SR_CONF_ENABLED:
-		*data = g_variant_new_boolean(TRUE); /* Always on. */
-		break;
 	case SR_CONF_REGULATION:
 		*data = g_variant_new_string("CC"); /* Always CC mode. */
 		break;
@@ -284,6 +292,12 @@ static int config_get(uint32_t key, GVariant **data,
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
 		*data = g_variant_new_boolean(devc->otp_active);
 		break;
+	case SR_CONF_UNDER_VOLTAGE_CONDITION:
+		*data = g_variant_new_boolean(TRUE); /* Always on. */
+		break;
+	case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE:
+		*data = g_variant_new_boolean(devc->uvc_active);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
@@ -312,6 +326,9 @@ static int config_set(uint32_t key, GVariant *data,
 	case SR_CONF_LIMIT_MSEC:
 		devc->limit_msec = g_variant_get_uint64(data);
 		break;
+	case SR_CONF_ENABLED:
+		ret = reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
+		break;
 	case SR_CONF_CURRENT_LIMIT:
 		ret = reloadpro_set_current_limit(sdi,
 			g_variant_get_double(data));