X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Farachnid-labs-re-load-pro%2Fapi.c;h=c14c20d400d05db58c3c55b32680f91893666b8e;hb=d810901a45e01b8e79f6b269dbb931b538071953;hp=4e186051a71d55b982f3b96827509194c60056eb;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;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 4e186051..c14c20d4 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
@@ -26,6 +25,7 @@
 
 #define CMD_VERSION "version\r\n"
 #define CMD_MONITOR "monitor 200\r\n"
+#define CMD_MONITOR_STOP "monitor 0\r\n"
 
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
@@ -37,14 +37,14 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-	SR_CONF_CONTINUOUS | SR_CONF_SET,
+	SR_CONF_CONTINUOUS,
 	SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const uint32_t devopts_cg[] = {
 	SR_CONF_ENABLED | SR_CONF_SET,
-	SR_CONF_REGULATION | SR_CONF_GET,
+	SR_CONF_REGULATION | SR_CONF_GET | SR_CONF_LIST,
 	SR_CONF_VOLTAGE | SR_CONF_GET,
 	SR_CONF_CURRENT | SR_CONF_GET,
 	SR_CONF_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
@@ -54,35 +54,29 @@ static const uint32_t devopts_cg[] = {
 	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_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info;
-
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-	return std_init(sr_ctx, di, LOG_PREFIX);
-}
+static const char *regulation[] = {
+	/* CC mode only. */
+	"CC",
+};
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
 	struct sr_channel_group *cg;
 	struct sr_channel *ch;
-	GSList *l, *devices;
+	GSList *l;
 	int ret, len;
 	const char *conn, *serialcomm;
 	char buf[100];
 	char *bufptr;
 	double version;
 
-	devices = NULL;
-	drvc = di->context;
-	drvc->instances = NULL;
-
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
 		src = l->data;
@@ -105,7 +99,18 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	if (serial_open(serial, SERIAL_RDWR) != SR_OK)
 		return NULL;
 
-	serial_flush(serial);
+	/*
+	 * First stop potentially running monitoring and wait for 50ms before
+	 * next command can be sent.
+	 */
+	if (serial_write_blocking(serial, CMD_MONITOR_STOP,
+			strlen(CMD_MONITOR_STOP), serial_timeout(serial,
+			strlen(CMD_MONITOR_STOP))) < (int)strlen(CMD_MONITOR_STOP)) {
+		sr_dbg("Unable to write while probing for hardware.");
+		serial_close(serial);
+		return NULL;
+	}
+	g_usleep(50 * 1000);
 
 	if (serial_write_blocking(serial, CMD_VERSION,
 			strlen(CMD_VERSION), serial_timeout(serial,
@@ -134,112 +139,61 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	}
 
 	sdi = g_malloc0(sizeof(struct sr_dev_inst));
-	sdi->status = SR_ST_ACTIVE;
+	sdi->status = SR_ST_INACTIVE;
 	sdi->vendor = g_strdup("Arachnid Labs");
 	sdi->model = g_strdup("Re:load Pro");
 	sdi->version = g_strdup(buf + 8);
-	sdi->driver = &arachnid_labs_re_load_pro_driver_info;
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
 
-	cg = g_malloc0(sizeof(struct sr_channel_group));
-	cg->name = g_strdup("1");
-	sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+	cg = sr_channel_group_new(sdi, "1", NULL);
 
 	ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "V");
 	cg->channels = g_slist_append(cg->channels, ch);
 
-	ch = sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "I");
+	ch = sr_channel_new(sdi, 1, SR_CHANNEL_ANALOG, TRUE, "I");
 	cg->channels = g_slist_append(cg->channels, ch);
 
 	devc = g_malloc0(sizeof(struct dev_context));
+	sr_sw_limits_init(&devc->limits);
 	sdi->priv = devc;
-	drvc->instances = g_slist_append(drvc->instances, sdi);
-	devices = g_slist_append(devices, sdi);
 
 	serial_close(serial);
-	if (!devices)
-		sr_serial_dev_inst_free(serial);
-
-	return devices;
-}
-
-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);
+	return std_scan_complete(di, g_slist_append(NULL, sdi));
 }
 
 static int config_list(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-	GVariantBuilder gvb;
-	int ret;
-
-	/* Always available. */
-	if (key == SR_CONF_SCAN_OPTIONS) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
-		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-			drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-		return SR_OK;
-	}
-
-	if (!sdi)
-		return SR_ERR_ARG;
-
-	ret = SR_OK;
-
 	if (!cg) {
-		/* No channel group: global options. */
-		switch (key) {
-		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-			break;
-		default:
-			return SR_ERR_NA;
-		}
+		return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 	} else {
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS:
-			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-				devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t));
+			*data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
+			break;
+		case SR_CONF_REGULATION:
+			*data = std_gvar_array_str(ARRAY_AND_SIZE(regulation));
 			break;
 		case SR_CONF_CURRENT_LIMIT:
-			g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-			/* Min, max, step. */
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(6.0));
-			g_variant_builder_add_value(&gvb, g_variant_new_double(0.001)); /* 1mA steps */
-			*data = g_variant_builder_end(&gvb);
+			*data = std_gvar_min_max_step(0.0, 6.0, 0.001);
+			break;
+		case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD:
+			*data = std_gvar_min_max_step(0.0, 60.0, 0.001);
 			break;
 		default:
 			return SR_ERR_NA;
 		}
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_get(uint32_t key, GVariant **data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 	float fvalue;
 
 	(void)cg;
@@ -255,14 +209,10 @@ static int config_get(uint32_t key, GVariant **data,
 	 *  - SR_CONF_ENABLED (state cannot be queried, only set)
 	 */
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
-		*data = g_variant_new_uint64(devc->limit_samples);
-		break;
 	case SR_CONF_LIMIT_MSEC:
-		*data = g_variant_new_uint64(devc->limit_msec);
-		break;
+		return sr_sw_limits_config_get(&devc->limits, key, data);
 	case SR_CONF_REGULATION:
 		*data = g_variant_new_string("CC"); /* Always CC mode. */
 		break;
@@ -293,51 +243,59 @@ static int config_get(uint32_t key, GVariant **data,
 		*data = g_variant_new_boolean(devc->otp_active);
 		break;
 	case SR_CONF_UNDER_VOLTAGE_CONDITION:
-		*data = g_variant_new_boolean(TRUE); /* Always on. */
+		if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK)
+			*data = g_variant_new_boolean(fvalue != 0.0);
 		break;
 	case SR_CONF_UNDER_VOLTAGE_CONDITION_ACTIVE:
 		*data = g_variant_new_boolean(devc->uvc_active);
 		break;
+	case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD:
+		if (reloadpro_get_under_voltage_threshold(sdi, &fvalue) == SR_OK)
+			*data = g_variant_new_double(fvalue);
+		break;
 	default:
 		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
 }
 
 static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	int ret;
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 
-	ret = SR_OK;
 	switch (key) {
 	case SR_CONF_LIMIT_SAMPLES:
-		devc->limit_samples = g_variant_get_uint64(data);
-		break;
 	case SR_CONF_LIMIT_MSEC:
-		devc->limit_msec = g_variant_get_uint64(data);
-		break;
+		return sr_sw_limits_config_set(&devc->limits, key, data);
 	case SR_CONF_ENABLED:
-		ret = reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
-		break;
+		return reloadpro_set_on_off(sdi, g_variant_get_boolean(data));
 	case SR_CONF_CURRENT_LIMIT:
-		ret = reloadpro_set_current_limit(sdi,
+		return reloadpro_set_current_limit(sdi, g_variant_get_double(data));
+	case SR_CONF_UNDER_VOLTAGE_CONDITION_THRESHOLD:
+		return reloadpro_set_under_voltage_threshold(sdi,
 			g_variant_get_double(data));
-		break;
 	default:
-		ret = SR_ERR_NA;
+		return SR_ERR_NA;
 	}
 
-	return ret;
+	return SR_OK;
+}
+
+static int dev_close(struct sr_dev_inst *sdi)
+{
+	if (serial_write_blocking(sdi->conn, CMD_MONITOR_STOP,
+			strlen(CMD_MONITOR_STOP), serial_timeout(sdi->conn,
+			strlen(CMD_MONITOR_STOP))) < (int)strlen(CMD_MONITOR_STOP)) {
+		sr_dbg("Unable to stop monitoring.");
+	}
+
+	return std_serial_dev_close(sdi);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -346,10 +304,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
+	devc->acquisition_running = TRUE;
+
 	serial = sdi->conn;
 
 	/* Send the 'monitor <ms>' command (doesn't have a reply). */
@@ -360,41 +317,50 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	/* Poll every 100ms, or whenever some data comes in. */
-	serial_source_add(sdi->session, serial, G_IO_IN, 100,
-			  reloadpro_receive_data, (void *)sdi);
-
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	sr_sw_limits_acquisition_start(&devc->limits);
+	std_session_send_df_header(sdi);
 
 	memset(devc->buf, 0, RELOADPRO_BUFSIZE);
 	devc->buflen = 0;
-	devc->num_samples = 0;
-	devc->starttime = g_get_monotonic_time();
+
+	g_mutex_init(&devc->acquisition_mutex);
+
+	serial_source_add(sdi->session, serial, G_IO_IN, 100,
+			  reloadpro_receive_data, (void *)sdi);
 
 	return SR_OK;
 }
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, sdi,
-		std_serial_dev_close, sdi->conn, LOG_PREFIX);
+	struct dev_context *devc;
+	int ret;
+
+	devc = sdi->priv;
+	devc->acquisition_running = FALSE;
+
+	ret = std_serial_dev_acquisition_stop(sdi);
+	g_mutex_clear(&devc->acquisition_mutex);
+
+	return ret;
 }
 
-SR_PRIV struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
+static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
 	.name = "arachnid-labs-re-load-pro",
 	.longname = "Arachnid Labs Re:load Pro",
 	.api_version = 1,
-	.init = init,
-	.cleanup = cleanup,
+	.init = std_init,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
-	.dev_clear = dev_clear,
+	.dev_list = std_dev_list,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = std_serial_dev_open,
-	.dev_close = std_serial_dev_close,
+	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(arachnid_labs_re_load_pro_driver_info);