BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hameg-hmo: Rename SCPI_CMD_GET_VERTICAL_DIV to *_SCALE. 

Fix the name of the SCPI command used to get the vertical scale.
This commit is contained in:
Guido Trentalancia 2018-11-20 23:22:29 +01:00 committed by Uwe Hermann
parent 396af5ad7d
commit 66ddc22a1d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hardware/hameg-hmo/api.c
View File

@ -315,7 +315,7 @@ static int config_set(uint32_t key, GVariant *data,
g_ascii_formatd(float_str, sizeof(float_str), "%E",
(float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
(*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_SCALE],
j + 1, float_str);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)

10
src/hardware/hameg-hmo/protocol.c
View File

@ -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)

4
src/scpi.h
View File

@ -35,8 +35,8 @@
enum {
SCPI_CMD_GET_TIMEBASE = 1,
SCPI_CMD_SET_TIMEBASE,
SCPI_CMD_GET_VERTICAL_DIV,
SCPI_CMD_SET_VERTICAL_DIV,
SCPI_CMD_GET_VERTICAL_SCALE,
SCPI_CMD_SET_VERTICAL_SCALE,
SCPI_CMD_GET_TRIGGER_SLOPE,
SCPI_CMD_SET_TRIGGER_SLOPE,
SCPI_CMD_GET_TRIGGER_PATTERN,