hameg-hmo: Fix for an incorrect samplerate being returned.

The hameg-hmo driver returns an incorrect sample rate: to reproduce this
bug, set the maximum sample rate from the ACQUIRE menu.

This patch fixes the driver so that the correct sample rate is returned.

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 4341bdfc6ee1e9a13bc517c5545c58b109fa8cac..836ce3ac345023ad09295dfcd2c1d38e3f09d5df 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -37,7 +37,6 @@ static const char *hameg_scpi_dialect[] = {
        [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]            = ":FORM:BORD %s;" \
                                                ":FORM REAL,32;:CHAN%d:DATA?",
        [SCPI_CMD_GET_VERTICAL_DIV]           = ":CHAN%d:SCAL?",
@@ -665,58 +664,18 @@ SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct scope_state *state;
        const 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)
-                       continue;
-               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].state)
-                               continue;
-                       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;
+       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);
-       }
+       state->sample_rate = tmp_float;
 
        return SR_OK;
 }

diff --git a/src/scpi.h b/src/scpi.h
index e551ba6b5aad17e1d70dfd9ea777674533c2f120..256aa4c1ceb9ba6b08d36b6c90ccecfebcd4051a 100644 (file)
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -57,7 +57,6 @@ enum {
        SCPI_CMD_GET_ANALOG_DATA,
        SCPI_CMD_GET_DIG_DATA,
        SCPI_CMD_GET_SAMPLE_RATE,
-       SCPI_CMD_GET_SAMPLE_RATE_LIVE,
        SCPI_CMD_GET_PROBE_UNIT,
        SCPI_CMD_GET_DIG_POD_THRESHOLD,
        SCPI_CMD_SET_DIG_POD_THRESHOLD,