X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=323f7cf5bed65683d630b5fc073ac73e8503b8b9;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;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..323f7cf5 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");
@@ -159,16 +169,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
 	return ((struct drv_context *)(di->context))->instances;
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-	return dev_clear(di);
-}
-
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -242,6 +242,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 +253,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 +282,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 +316,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));
@@ -323,19 +330,16 @@ static int config_set(uint32_t key, GVariant *data,
 	return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	int ret;
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	(void)cb_data;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
-
 	serial = sdi->conn;
 
 	/* Send the 'monitor <ms>' command (doesn't have a reply). */
@@ -350,7 +354,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	serial_source_add(sdi->session, serial, G_IO_IN, 100,
 			  reloadpro_receive_data, (void *)sdi);
 
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	memset(devc->buf, 0, RELOADPRO_BUFSIZE);
 	devc->buflen = 0;
@@ -360,9 +364,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, cb_data,
+	return std_serial_dev_acquisition_stop(sdi,
 		std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
@@ -371,10 +375,9 @@ SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
 	.longname = "Arachnid Labs Re:load Pro",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = dev_list,
-	.dev_clear = dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,