X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fapi.c;h=ff045f16425e61ad091be85868c2111845cb39fe;hb=102f12396660e0784134bccce5cc0679db325751;hp=b82d2a3ffe628d37f5efc0374cc018c07de0bc6b;hpb=ca28abd6a55c87c3c17fe839b3515ce1e5f121a5;p=libsigrok.git

diff --git a/hardware/hameg-hmo/api.c b/hardware/hameg-hmo/api.c
index b82d2a3f..ff045f16 100644
--- a/hardware/hameg-hmo/api.c
+++ b/hardware/hameg-hmo/api.c
@@ -35,10 +35,10 @@ static const int32_t hwopts[] = {
 };
 
 enum {
-	PG_INVALID = -1,
-	PG_NONE,
-	PG_ANALOG,
-	PG_DIGITAL,
+	CG_INVALID = -1,
+	CG_NONE,
+	CG_ANALOG,
+	CG_DIGITAL,
 };
 
 static int init(struct sr_context *sr_ctx)
@@ -133,10 +133,10 @@ static void clear_helper(void *priv)
 	hmo_scope_state_free(devc->model_state);
 
 	for (i = 0; i < model->analog_channels; ++i)
-		g_slist_free(devc->analog_groups[i].probes);
+		g_slist_free(devc->analog_groups[i].channels);
 
 	for (i = 0; i < model->digital_pods; ++i) {
-		g_slist_free(devc->digital_groups[i].probes);
+		g_slist_free(devc->digital_groups[i].channels);
 		g_free(devc->digital_groups[i].name);
 	}
 
@@ -183,34 +183,34 @@ static int cleanup(void)
 	return SR_OK;
 }
 
-static int check_probe_group(struct dev_context *devc,
-			     const struct sr_probe_group *probe_group)
+static int check_channel_group(struct dev_context *devc,
+			     const struct sr_channel_group *cg)
 {
 	unsigned int i;
 	struct scope_config *model;
 
 	model = devc->model_config;
 
-	if (!probe_group)
-		return PG_NONE;
+	if (!cg)
+		return CG_NONE;
 
 	for (i = 0; i < model->analog_channels; ++i)
-		if (probe_group == &devc->analog_groups[i])
-			return PG_ANALOG;
+		if (cg == &devc->analog_groups[i])
+			return CG_ANALOG;
 
 	for (i = 0; i < model->digital_pods; ++i)
-		if (probe_group == &devc->digital_groups[i])
-			return PG_DIGITAL;
+		if (cg == &devc->digital_groups[i])
+			return CG_DIGITAL;
 
-	sr_err("Invalid probe group specified.");
+	sr_err("Invalid channel group specified.");
 
-	return PG_INVALID;
+	return CG_INVALID;
 }
 
 static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		      const struct sr_probe_group *probe_group)
+		      const struct sr_channel_group *cg)
 {
-	int ret, pg_type;
+	int ret, cg_type;
 	unsigned int i;
 	struct dev_context *devc;
 	struct scope_config *model;
@@ -219,7 +219,7 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	ret = SR_ERR_NA;
@@ -231,19 +231,43 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_int32(model->num_xdivs);
 		ret = SR_OK;
 		break;
+	case SR_CONF_TIMEBASE:
+		*data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
+				      (*model->timebases)[state->timebase][1]);
+		ret = SR_OK;
+		break;
 	case SR_CONF_NUM_VDIV:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
-		} else if (pg_type == PG_ANALOG) {
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
+		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (probe_group != &devc->analog_groups[i])
+				if (cg != &devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_int32(model->num_ydivs);
 				ret = SR_OK;
 				break;
 			}
 
+		} else {
+			ret = SR_ERR_NA;
+		}
+		break;
+	case SR_CONF_VDIV:
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
+		} else if (cg_type == CG_ANALOG) {
+			for (i = 0; i < model->analog_channels; ++i) {
+				if (cg != &devc->analog_groups[i])
+					continue;
+				*data = g_variant_new("(tt)",
+						      (*model->vdivs)[state->analog_channels[i].vdiv][0],
+						      (*model->vdivs)[state->analog_channels[i].vdiv][1]);
+				ret = SR_OK;
+				break;
+			}
+
 		} else {
 			ret = SR_ERR_NA;
 		}
@@ -252,13 +276,21 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
 		ret = SR_OK;
 		break;
+	case SR_CONF_TRIGGER_SLOPE:
+		*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
+		ret = SR_OK;
+		break;
+	case SR_CONF_HORIZ_TRIGGERPOS:
+		*data = g_variant_new_double(state->horiz_triggerpos);
+		ret = SR_OK;
+		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
-		} else if (pg_type == PG_ANALOG) {
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
+		} else if (cg_type == CG_ANALOG) {
 			for (i = 0; i < model->analog_channels; ++i) {
-				if (probe_group != &devc->analog_groups[i])
+				if (cg != &devc->analog_groups[i])
 					continue;
 				*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
 				ret = SR_OK;
@@ -300,9 +332,9 @@ static GVariant *build_tuples(const uint64_t (*array)[][2], unsigned int n)
 }
 
 static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
-		      const struct sr_probe_group *probe_group)
+		      const struct sr_channel_group *cg)
 {
-	int ret, pg_type;
+	int ret, cg_type;
 	unsigned int i, j;
 	char command[MAX_COMMAND_SIZE], float_str[30];
 	struct dev_context *devc;
@@ -316,7 +348,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	model = devc->model_config;
@@ -345,9 +377,9 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
 		}
 
 		g_variant_get(data, "(tt)", &p, &q);
@@ -357,7 +389,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			    q != (*model->vdivs)[i][1])
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (probe_group != &devc->analog_groups[j - 1])
+				if (cg != &devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j - 1].vdiv = i;
 				g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
@@ -400,10 +432,16 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		if (tmp_d < 0.0 || tmp_d > 1.0)
 			return SR_ERR;
 
-		state->horiz_triggerpos = -(tmp_d - 0.5) * state->timebase * model->num_xdivs;
+		state->horiz_triggerpos = tmp_d;
+		tmp_d = -(tmp_d - 0.5) *
+			((double) (*model->timebases)[state->timebase][0] /
+			(*model->timebases)[state->timebase][1])
+			 * model->num_xdivs;
+
+		g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d);
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS],
-			   state->horiz_triggerpos);
+			   float_str);
 
 		ret = sr_scpi_send(sdi->conn, command);
 		break;
@@ -422,9 +460,9 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 		ret = sr_scpi_send(sdi->conn, command);
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE) {
-			sr_err("No probe group specified.");
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE) {
+			sr_err("No channel group specified.");
+			return SR_ERR_CHANNEL_GROUP;
 		}
 
 		tmp = g_variant_get_string(data, NULL);
@@ -433,7 +471,7 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 			if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
 				continue;
 			for (j = 1; j <= model->analog_channels; ++j) {
-				if (probe_group != &devc->analog_groups[j - 1])
+				if (cg != &devc->analog_groups[j - 1])
 					continue;
 				state->analog_channels[j-1].coupling = i;
 
@@ -466,27 +504,27 @@ static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		       const struct sr_probe_group *probe_group)
+		       const struct sr_channel_group *cg)
 {
-	int pg_type;
+	int cg_type;
 	struct dev_context *devc;
 	struct scope_config *model;
 
 	if (!sdi || !(devc = sdi->priv))
 		return SR_ERR_ARG;
 
-	if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+	if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID)
 		return SR_ERR;
 
 	model = devc->model_config;
 
 	switch (key) {
 	case SR_CONF_DEVICE_OPTIONS:
-		if (pg_type == PG_NONE) {
+		if (cg_type == CG_NONE) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				model->hw_caps, model->num_hwcaps,
 				sizeof(int32_t));
-		} else if (pg_type == PG_ANALOG) {
+		} else if (cg_type == CG_ANALOG) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
 				model->analog_hwcaps, model->num_analog_hwcaps,
 				sizeof(int32_t));
@@ -496,8 +534,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		}
 		break;
 	case SR_CONF_COUPLING:
-		if (pg_type == PG_NONE)
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE)
+			return SR_ERR_CHANNEL_GROUP;
 		*data = g_variant_new_strv(*model->coupling_options,
 			   g_strv_length((char **)*model->coupling_options));
 		break;
@@ -505,12 +543,16 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 		*data = g_variant_new_strv(*model->trigger_sources,
 			   g_strv_length((char **)*model->trigger_sources));
 		break;
+	case SR_CONF_TRIGGER_SLOPE:
+		*data = g_variant_new_strv(*model->trigger_slopes,
+			   g_strv_length((char **)*model->trigger_slopes));
+		break;
 	case SR_CONF_TIMEBASE:
 		*data = build_tuples(model->timebases, model->num_timebases);
 		break;
 	case SR_CONF_VDIV:
-		if (pg_type == PG_NONE)
-			return SR_ERR_PROBE_GROUP;
+		if (cg_type == CG_NONE)
+			return SR_ERR_CHANNEL_GROUP;
 		*data = build_tuples(model->vdivs, model->num_vdivs);
 		break;
 	default:
@@ -523,53 +565,53 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
 SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
 {
 	char command[MAX_COMMAND_SIZE];
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct scope_config *model;
 
 	devc = sdi->priv;
 	model = devc->model_config;
 
-	probe = devc->current_probe->data;
+	ch = devc->current_channel->data;
 
-	switch (probe->type) {
-	case SR_PROBE_ANALOG:
+	switch (ch->type) {
+	case SR_CHANNEL_ANALOG:
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA],
-			   probe->index + 1);
+			   ch->index + 1);
 		break;
-	case SR_PROBE_LOGIC:
+	case SR_CHANNEL_LOGIC:
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_GET_DIG_DATA],
-			   probe->index < 8 ? 1 : 2);
+			   ch->index < 8 ? 1 : 2);
 		break;
 	default:
-		sr_err("Invalid probe type.");
+		sr_err("Invalid channel type.");
 		break;
 	}
 
 	return sr_scpi_send(sdi->conn, command);
 }
 
-static int hmo_check_probes(GSList *probes)
+static int hmo_check_channels(GSList *channels)
 {
 	GSList *l;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4;
 
 	enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE;
 
-	for (l = probes; l; l = l->next) {
-		probe = l->data;
-		switch (probe->type) {
-		case SR_PROBE_ANALOG:
-			if (probe->index == 2)
+	for (l = channels; l; l = l->next) {
+		ch = l->data;
+		switch (ch->type) {
+		case SR_CHANNEL_ANALOG:
+			if (ch->index == 2)
 				enabled_chan3 = TRUE;
-			else if (probe->index == 3)
+			else if (ch->index == 3)
 				enabled_chan4 = TRUE;
 			break;
-		case SR_PROBE_LOGIC:
-			if (probe->index < 8)
+		case SR_CHANNEL_LOGIC:
+			if (ch->index < 8)
 				enabled_pod1 = TRUE;
 			else
 				enabled_pod2 = TRUE;
@@ -586,7 +628,7 @@ static int hmo_check_probes(GSList *probes)
 	return SR_OK;
 }
 
-static int hmo_setup_probes(const struct sr_dev_inst *sdi)
+static int hmo_setup_channels(const struct sr_dev_inst *sdi)
 {
 	GSList *l;
 	unsigned int i;
@@ -594,7 +636,7 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
 	char command[MAX_COMMAND_SIZE];
 	struct scope_state *state;
 	struct scope_config *model;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
 
@@ -606,39 +648,39 @@ static int hmo_setup_probes(const struct sr_dev_inst *sdi)
 
 	pod_enabled = g_try_malloc0(sizeof(gboolean) * model->digital_pods);
 
-	for (l = sdi->probes; l; l = l->next) {
-		probe = l->data;
-		switch (probe->type) {
-		case SR_PROBE_ANALOG:
-			if (probe->enabled == state->analog_channels[probe->index].state)
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		switch (ch->type) {
+		case SR_CHANNEL_ANALOG:
+			if (ch->enabled == state->analog_channels[ch->index].state)
 				break;
 			g_snprintf(command, sizeof(command),
 				   (*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
-				   probe->index + 1, probe->enabled);
+				   ch->index + 1, ch->enabled);
 
 			if (sr_scpi_send(scpi, command) != SR_OK)
 				return SR_ERR;
-			state->analog_channels[probe->index].state = probe->enabled;
+			state->analog_channels[ch->index].state = ch->enabled;
 			setup_changed = TRUE;
 			break;
-		case SR_PROBE_LOGIC:
+		case SR_CHANNEL_LOGIC:
 			/*
 			 * A digital POD needs to be enabled for every group of
-			 * 8 probes.
+			 * 8 channels.
 			 */
-			if (probe->enabled)
-				pod_enabled[probe->index < 8 ? 0 : 1] = TRUE;
+			if (ch->enabled)
+				pod_enabled[ch->index < 8 ? 0 : 1] = TRUE;
 
-			if (probe->enabled == state->digital_channels[probe->index])
+			if (ch->enabled == state->digital_channels[ch->index])
 				break;
 			g_snprintf(command, sizeof(command),
 				   (*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
-				   probe->index, probe->enabled);
+				   ch->index, ch->enabled);
 
 			if (sr_scpi_send(scpi, command) != SR_OK)
 				return SR_ERR;
 
-			state->digital_channels[probe->index] = probe->enabled;
+			state->digital_channels[ch->index] = ch->enabled;
 			setup_changed = TRUE;
 			break;
 		default:
@@ -670,7 +712,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 {
 	GSList *l;
 	gboolean digital_added;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	struct dev_context *devc;
 	struct sr_scpi_dev_inst *scpi;
 
@@ -681,38 +723,39 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	devc = sdi->priv;
 	digital_added = FALSE;
 
-	for (l = sdi->probes; l; l = l->next) {
-		probe = l->data;
-		if (!probe->enabled)
+	for (l = sdi->channels; l; l = l->next) {
+		ch = l->data;
+		if (!ch->enabled)
 			continue;
-		/* Only add a single digital probe. */
-		if (probe->type != SR_PROBE_LOGIC || !digital_added) {
-			devc->enabled_probes = g_slist_append(
-					devc->enabled_probes, probe);
-			if (probe->type == SR_PROBE_LOGIC)
+		/* Only add a single digital channel. */
+		if (ch->type != SR_CHANNEL_LOGIC || !digital_added) {
+			devc->enabled_channels = g_slist_append(
+					devc->enabled_channels, ch);
+			if (ch->type == SR_CHANNEL_LOGIC)
 				digital_added = TRUE;
 		}
 	}
 
-	if (!devc->enabled_probes)
+	if (!devc->enabled_channels)
 		return SR_ERR;
 
-	if (hmo_check_probes(devc->enabled_probes) != SR_OK) {
-		sr_err("Invalid probe configuration specified!");
+	if (hmo_check_channels(devc->enabled_channels) != SR_OK) {
+		sr_err("Invalid channel configuration specified!");
 		return SR_ERR_NA;
 	}
 
-	if (hmo_setup_probes(sdi) != SR_OK) {
-		sr_err("Failed to setup probe configuration!");
+	if (hmo_setup_channels(sdi) != SR_OK) {
+		sr_err("Failed to setup channel configuration!");
 		return SR_ERR;
 	}
 
-	sr_scpi_source_add(scpi, G_IO_IN, 50, hmo_receive_data, (void *)sdi);
+	sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 50,
+			hmo_receive_data, (void *)sdi);
 
 	/* Send header packet to the session bus. */
 	std_session_send_df_header(cb_data, LOG_PREFIX);
 
-	devc->current_probe = devc->enabled_probes;
+	devc->current_channel = devc->enabled_channels;
 
 	return hmo_request_data(sdi);
 }
@@ -735,10 +778,10 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	devc = sdi->priv;
 
 	devc->num_frames = 0;
-	g_slist_free(devc->enabled_probes);
-	devc->enabled_probes = NULL;
+	g_slist_free(devc->enabled_channels);
+	devc->enabled_channels = NULL;
 	scpi = sdi->conn;
-	sr_scpi_source_remove(scpi);
+	sr_scpi_source_remove(sdi->session, scpi);
 
 	return SR_OK;
 }