X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fprotocol.c;h=ff9cf29ff2b84407499f21f8f52df2df890b5aa5;hb=1656e47def5422a5273f023d542d4d6a72668b42;hp=dd24270f0fd1b6ddc9d643954bc383425f8045d5;hpb=8de2dc3b2e6ee1cb2df31db567e59f197623007c;p=libsigrok.git

diff --git a/hardware/hameg-hmo/protocol.c b/hardware/hameg-hmo/protocol.c
index dd24270f..ff9cf29f 100644
--- a/hardware/hameg-hmo/protocol.c
+++ b/hardware/hameg-hmo/protocol.c
@@ -25,6 +25,8 @@ static const char *hameg_scpi_dialect[] = {
 	[SCPI_CMD_SET_TIMEBASE]		    = ":TIM:SCAL %s",
 	[SCPI_CMD_GET_COUPLING]		    = ":CHAN%d:COUP?",
 	[SCPI_CMD_SET_COUPLING]		    = ":CHAN%d:COUP %s",
+	[SCPI_CMD_GET_SAMPLE_RATE]	    = ":ACQ:SRAT?",
+	[SCPI_CMD_GET_SAMPLE_RATE_LIVE]	    = ":%s:DATA:POINTS?",
 	[SCPI_CMD_GET_ANALOG_DATA]	    = ":CHAN%d:DATA?",
 	[SCPI_CMD_GET_VERTICAL_DIV]	    = ":CHAN%d:SCAL?",
 	[SCPI_CMD_SET_VERTICAL_DIV]	    = ":CHAN%d:SCAL %s",
@@ -50,6 +52,8 @@ static const int32_t hmo_hwcaps[] = {
 	SR_CONF_NUM_TIMEBASE,
 	SR_CONF_TRIGGER_SLOPE,
 	SR_CONF_HORIZ_TRIGGERPOS,
+	SR_CONF_SAMPLERATE,
+	SR_CONF_LIMIT_FRAMES,
 };
 
 static const int32_t hmo_analog_caps[] = {
@@ -283,6 +287,10 @@ static void scope_state_dump(struct scope_config *config,
 	sr_info("Current timebase: %s", tmp);
 	g_free(tmp);
 
+	tmp = sr_samplerate_string(state->sample_rate);
+	sr_info("Current samplerate: %s", tmp);
+	g_free(tmp);
+
 	sr_info("Current trigger: %s (source), %s (slope) %2.2e (offset)",
 		(*config->trigger_sources)[state->trigger_source],
 		(*config->trigger_slopes)[state->trigger_slope],
@@ -400,6 +408,68 @@ static int digital_channel_state_get(struct sr_scpi_dev_inst *scpi,
 	return SR_OK;
 }
 
+SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	struct scope_state *state;
+	struct scope_config *config;
+
+	int tmp;
+	unsigned int i;
+	float tmp_float;
+	gboolean channel_found;
+	char tmp_str[MAX_COMMAND_SIZE];
+	char chan_name[20];
+
+	devc = sdi->priv;
+	config = devc->model_config;
+	state = devc->model_state;
+	channel_found = FALSE;
+
+	for (i = 0; i < config->analog_channels; ++i) {
+		if (state->analog_channels[i].state) {
+			g_snprintf(chan_name, sizeof(chan_name), "CHAN%d", i + 1);
+			g_snprintf(tmp_str, sizeof(tmp_str),
+				   (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE_LIVE],
+				   chan_name);
+			channel_found = TRUE;
+			break;
+		}
+	}
+
+	if (!channel_found) {
+		for (i = 0; i < config->digital_pods; i++) {
+			if (state->digital_pods[i]) {
+				g_snprintf(chan_name, sizeof(chan_name), "POD%d", i);
+				g_snprintf(tmp_str, sizeof(tmp_str),
+					   (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE_LIVE],
+					   chan_name);
+				channel_found = TRUE;
+				break;
+			}
+		}
+	}
+
+	/* No channel is active, ask the instrument for the sample rate
+	 * in single shot mode */
+	if (!channel_found) {
+		if (sr_scpi_get_float(sdi->conn,
+				      (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE],
+				      &tmp_float) != SR_OK)
+			return SR_ERR;
+
+		state->sample_rate = tmp_float;
+	} else {
+		if (sr_scpi_get_int(sdi->conn, tmp_str, &tmp) != SR_OK)
+			return SR_ERR;
+		state->sample_rate = tmp / (((float) (*config->timebases)[state->timebase][0] /
+					     (*config->timebases)[state->timebase][1]) *
+					    config->num_xdivs);
+	}
+
+	return SR_OK;
+}
+
 SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
@@ -450,6 +520,9 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
 		config->trigger_slopes, &state->trigger_slope) != SR_OK)
 		return SR_ERR;
 
+	if (hmo_update_sample_rate(sdi) != SR_OK)
+		return SR_ERR;
+
 	sr_info("Fetching finished.");
 
 	scope_state_dump(config, state);