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

hameg-hmo: Query probe unit (Volt, Ampere) from scope

This commit is contained in:
Stefan Brüns 2016-05-03 00:08:58 +02:00 committed by Uwe Hermann
parent 2d7da5df82
commit 448e81b1e5
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@ static const char *hameg_scpi_dialect[] = {
[SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s", [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s",
[SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?", [SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?",
[SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d", [SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d",
[SCPI_CMD_GET_PROBE_UNIT] = ":PROB%d:SET:ATT:UNIT?",
}; };
static const uint32_t hmo_devopts[] = { static const uint32_t hmo_devopts[] = {
@ -422,6 +423,19 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
if (scope_state_get_array_option(scpi, command, config->coupling_options, if (scope_state_get_array_option(scpi, command, config->coupling_options,
&state->analog_channels[i].coupling) != SR_OK) &state->analog_channels[i].coupling) != SR_OK)
return SR_ERR; return SR_ERR;
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_PROBE_UNIT],
i + 1);
if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
return SR_ERR;
if (tmp_str[0] == 'A')
state->analog_channels[i].probe_unit = 'A';
else
state->analog_channels[i].probe_unit = 'V';
g_free(tmp_str);
} }
return SR_OK; return SR_OK;

1
src/hardware/hameg-hmo/protocol.h
View File

@ -73,6 +73,7 @@ struct analog_channel_state {
float vertical_offset; float vertical_offset;
gboolean state; gboolean state;
char probe_unit;
}; };
struct scope_state { struct scope_state {