[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?",
[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?",
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)
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)
if (sr_scpi_get_string(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_PATTERN],
- &state->trigger_pattern) != SR_OK)
+ &tmp_str) != SR_OK)
return SR_ERR;
+ strncpy(state->trigger_pattern,
+ sr_scpi_unquote_string(tmp_str),
+ MAX_ANALOG_CHANNEL_COUNT + MAX_DIGITAL_CHANNEL_COUNT);
+ g_free(tmp_str);
if (hmo_update_sample_rate(sdi) != SR_OK)
return SR_ERR;