X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhameg-hmo%2Fapi.c;h=a7204219a736aa3427930144562e32a30d3f4d1c;hb=1203acc78fce690d6c63f734e1283091192c2d08;hp=0070b61569800e3132bbc8ae4e816eb1dac13696;hpb=e131be0ac34c36e374b78db9d01b8ef0e91eaed7;p=libsigrok.git

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 0070b615..a7204219 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -200,6 +200,9 @@ static int config_get(uint32_t key, GVariant **data,
 	case SR_CONF_TRIGGER_SLOPE:
 		*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
 		break;
+	case SR_CONF_TRIGGER_PATTERN:
+		*data = g_variant_new_string(state->trigger_pattern);
+		break;
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		*data = g_variant_new_double(state->horiz_triggerpos);
 		break;
@@ -250,11 +253,11 @@ static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	int ret, cg_type, idx, j;
-	char command[MAX_COMMAND_SIZE], float_str[30];
+	char command[MAX_COMMAND_SIZE], float_str[30], *tmp_str;
 	struct dev_context *devc;
 	const struct scope_config *model;
 	struct scope_state *state;
-	double tmp_d;
+	double tmp_d, tmp_d2;
 	gboolean update_sample_rate;
 
 	if (!sdi)
@@ -281,11 +284,14 @@ static int config_set(uint32_t key, GVariant *data,
 	case SR_CONF_TRIGGER_SOURCE:
 		if ((idx = std_str_idx(data, *model->trigger_sources, model->num_trigger_sources)) < 0)
 			return SR_ERR_ARG;
-		state->trigger_source = idx;
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE],
 			   (*model->trigger_sources)[idx]);
-		ret = sr_scpi_send(sdi->conn, command);
+		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+		    sr_scpi_get_opc(sdi->conn) != SR_OK)
+			return SR_ERR;
+		state->trigger_source = idx;
+		ret = SR_OK;
 		break;
 	case SR_CONF_VDIV:
 		if (!cg)
@@ -294,7 +300,6 @@ static int config_set(uint32_t key, GVariant *data,
 			return SR_ERR_ARG;
 		if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
 			return SR_ERR_ARG;
-		state->analog_channels[j].vdiv = idx;
 		g_ascii_formatd(float_str, sizeof(float_str), "%E",
 			(float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
 		g_snprintf(command, sizeof(command),
@@ -303,43 +308,68 @@ static int config_set(uint32_t key, GVariant *data,
 		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
 		    sr_scpi_get_opc(sdi->conn) != SR_OK)
 			return SR_ERR;
+		state->analog_channels[j].vdiv = idx;
 		ret = SR_OK;
 		break;
 	case SR_CONF_TIMEBASE:
 		if ((idx = std_u64_tuple_idx(data, *model->timebases, model->num_timebases)) < 0)
 			return SR_ERR_ARG;
-		state->timebase = idx;
 		g_ascii_formatd(float_str, sizeof(float_str), "%E",
 			(float) (*model->timebases)[idx][0] / (*model->timebases)[idx][1]);
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE],
 			   float_str);
-		ret = sr_scpi_send(sdi->conn, command);
+		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+		    sr_scpi_get_opc(sdi->conn) != SR_OK)
+			return SR_ERR;
+		state->timebase = idx;
+		ret = SR_OK;
 		update_sample_rate = TRUE;
 		break;
 	case SR_CONF_HORIZ_TRIGGERPOS:
 		tmp_d = g_variant_get_double(data);
 		if (tmp_d < 0.0 || tmp_d > 1.0)
 			return SR_ERR;
-		state->horiz_triggerpos = tmp_d;
-		tmp_d = -(tmp_d - 0.5) *
+		tmp_d2 = -(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_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d2);
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS],
 			   float_str);
-		ret = sr_scpi_send(sdi->conn, command);
+		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+		    sr_scpi_get_opc(sdi->conn) != SR_OK)
+			return SR_ERR;
+		state->horiz_triggerpos = tmp_d;
+		ret = SR_OK;
 		break;
 	case SR_CONF_TRIGGER_SLOPE:
 		if ((idx = std_str_idx(data, *model->trigger_slopes, model->num_trigger_slopes)) < 0)
 			return SR_ERR_ARG;
-		state->trigger_slope = idx;
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
 			   (*model->trigger_slopes)[idx]);
-		ret = sr_scpi_send(sdi->conn, command);
+		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+		    sr_scpi_get_opc(sdi->conn) != SR_OK)
+			return SR_ERR;
+		state->trigger_slope = idx;
+		ret = SR_OK;
+		break;
+	case SR_CONF_TRIGGER_PATTERN:
+		tmp_str = (char *)g_variant_get_string(data, 0);
+		idx = strlen(tmp_str);
+		if (idx == 0 || idx > model->analog_channels + model->digital_channels)
+			return SR_ERR_ARG;
+		g_snprintf(command, sizeof(command),
+			   (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_PATTERN],
+			   tmp_str);
+		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+		    sr_scpi_get_opc(sdi->conn) != SR_OK)
+			return SR_ERR;
+		g_free(state->trigger_pattern);
+		state->trigger_pattern = g_strdup(tmp_str);
+		ret = SR_OK;
 		break;
 	case SR_CONF_COUPLING:
 		if (!cg)
@@ -348,13 +378,13 @@ static int config_set(uint32_t key, GVariant *data,
 			return SR_ERR_ARG;
 		if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
 			return SR_ERR_ARG;
-		state->analog_channels[j].coupling = idx;
 		g_snprintf(command, sizeof(command),
 			   (*model->scpi_dialect)[SCPI_CMD_SET_COUPLING],
 			   j + 1, (*model->coupling_options)[idx]);
 		if (sr_scpi_send(sdi->conn, command) != SR_OK ||
 		    sr_scpi_get_opc(sdi->conn) != SR_OK)
 			return SR_ERR;
+		state->analog_channels[j].coupling = idx;
 		ret = SR_OK;
 		break;
 	case SR_CONF_LOGIC_THRESHOLD:
@@ -410,9 +440,6 @@ static int config_set(uint32_t key, GVariant *data,
 		break;
 	}
 
-	if (ret == SR_OK)
-		ret = sr_scpi_get_opc(sdi->conn);
-
 	if (ret == SR_OK && update_sample_rate)
 		ret = hmo_update_sample_rate(sdi);