hameg-hmo: Remove duplicate function call.

[libsigrok.git] / src / hardware / hameg-hmo / protocol.c

diff --git a/src/hardware/hameg-hmo/protocol.c b/src/hardware/hameg-hmo/protocol.c
index 2806352bf157308818890a2a3fe7cc18e8c0ed1a..ef30c6f72950c0860482a1540b4572ce70216bd0 100644 (file)
--- a/src/hardware/hameg-hmo/protocol.c
+++ b/src/hardware/hameg-hmo/protocol.c
@@ -39,8 +39,8 @@ static const char *hameg_scpi_dialect[] = {
        [SCPI_CMD_GET_SAMPLE_RATE]            = ":ACQ:SRAT?",
        [SCPI_CMD_GET_ANALOG_DATA]            = ":FORM:BORD %s;" \
                                                ":FORM REAL,32;:CHAN%d:DATA?",
-       [SCPI_CMD_GET_VERTICAL_DIV]           = ":CHAN%d:SCAL?",
-       [SCPI_CMD_SET_VERTICAL_DIV]           = ":CHAN%d:SCAL %s",
+       [SCPI_CMD_GET_VERTICAL_SCALE]         = ":CHAN%d:SCAL?",
+       [SCPI_CMD_SET_VERTICAL_SCALE]         = ":CHAN%d:SCAL %s",
        [SCPI_CMD_GET_DIG_POD_STATE]          = ":POD%d:STAT?",
        [SCPI_CMD_SET_DIG_POD_STATE]          = ":POD%d:STAT %d",
        [SCPI_CMD_GET_TRIGGER_SLOPE]          = ":TRIG:A:EDGE:SLOP?",
@@ -76,8 +76,8 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = {
        [SCPI_CMD_GET_SAMPLE_RATE]            = ":ACQ:SRAT?",
        [SCPI_CMD_GET_ANALOG_DATA]            = ":FORM:BORD %s;" \
                                                ":FORM REAL,32;:CHAN%d:DATA?",
-       [SCPI_CMD_GET_VERTICAL_DIV]           = ":CHAN%d:SCAL?",
-       [SCPI_CMD_SET_VERTICAL_DIV]           = ":CHAN%d:SCAL %s",
+       [SCPI_CMD_GET_VERTICAL_SCALE]         = ":CHAN%d:SCAL?",
+       [SCPI_CMD_SET_VERTICAL_SCALE]         = ":CHAN%d:SCAL %s",
        [SCPI_CMD_GET_DIG_POD_STATE]          = ":LOG%d:STAT?",
        [SCPI_CMD_SET_DIG_POD_STATE]          = ":LOG%d:STAT %d",
        [SCPI_CMD_GET_TRIGGER_SLOPE]          = ":TRIG:A:EDGE:SLOP?",
@@ -894,7 +894,7 @@ static int analog_channel_state_get(struct sr_dev_inst *sdi,
                        ch->enabled = state->analog_channels[i].state;
 
                g_snprintf(command, sizeof(command),
-                          (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_DIV],
+                          (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_SCALE],
                           i + 1);
 
                if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
@@ -1086,11 +1086,6 @@ SR_PRIV int hmo_scope_state_get(struct sr_dev_inst *sdi)
        if (digital_channel_state_get(sdi, config, state) != SR_OK)
                return SR_ERR;
 
-       if (sr_scpi_get_float(sdi->conn,
-                       (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
-                       &tmp_float) != SR_OK)
-               return SR_ERR;
-
        if (sr_scpi_get_string(sdi->conn,
                        (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
                        &tmp_str) != SR_OK)