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

scpi-pps: Fix broken channel selection code. 

Fixes bug #1279.
This commit is contained in:
Martin Ling 2018-09-11 13:08:12 +01:00
parent 88e4daa9ff
commit 3d11872282
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hardware/scpi-pps/protocol.c
View File

@ -34,7 +34,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
struct sr_analog_spec spec; struct sr_analog_spec spec;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
int channel_group_cmd; int channel_group_cmd;
char *channel_group_name; const char *channel_group_name;
struct pps_channel *pch; struct pps_channel *pch;
const struct channel_spec *ch_spec; const struct channel_spec *ch_spec;
int ret; int ret;
@ -52,14 +52,15 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
if (!(devc = sdi->priv)) if (!(devc = sdi->priv))
return TRUE; return TRUE;
pch = devc->cur_acquisition_channel->priv;
channel_group_cmd = 0; channel_group_cmd = 0;
channel_group_name = NULL; channel_group_name = NULL;
if (g_slist_length(sdi->channel_groups) > 1) { if (g_slist_length(sdi->channel_groups) > 1) {
channel_group_cmd = SCPI_CMD_SELECT_CHANNEL; channel_group_cmd = SCPI_CMD_SELECT_CHANNEL;
channel_group_name = g_strdup(devc->cur_acquisition_channel->name); channel_group_name = pch->hwname;
} }
pch = devc->cur_acquisition_channel->priv;
if (pch->mq == SR_MQ_VOLTAGE) { if (pch->mq == SR_MQ_VOLTAGE) {
gvtype = G_VARIANT_TYPE_DOUBLE; gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_VOLTAGE; cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
@ -78,7 +79,6 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
ret = sr_scpi_cmd_resp(sdi, devc->device->commands, ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd); channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd);
g_free(channel_group_name);
if (ret != SR_OK) if (ret != SR_OK)
return ret; return ret;
@ -106,6 +106,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
} }
analog.meaning->mqflags = SR_MQFLAG_DC; analog.meaning->mqflags = SR_MQFLAG_DC;
f = (float)g_variant_get_double(gvdata); f = (float)g_variant_get_double(gvdata);
g_variant_unref(gvdata);
analog.data = &f; analog.data = &f;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
g_slist_free(analog.meaning->channels); g_slist_free(analog.meaning->channels);

2
src/scpi.h
View File

@ -100,7 +100,7 @@ struct sr_scpi_dev_inst {
/* Only used for quirk workarounds, notably the Rigol DS1000 series. */ /* Only used for quirk workarounds, notably the Rigol DS1000 series. */
uint64_t firmware_version; uint64_t firmware_version;
GMutex scpi_mutex; GMutex scpi_mutex;
const char *actual_channel_name; char *actual_channel_name;
}; };
SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options, SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,

7
src/scpi/scpi.c
View File

@ -587,6 +587,7 @@ SR_PRIV void sr_scpi_free(struct sr_scpi_dev_inst *scpi)
scpi->free(scpi->priv); scpi->free(scpi->priv);
g_free(scpi->priv); g_free(scpi->priv);
g_free(scpi->actual_channel_name);
g_free(scpi); g_free(scpi);
} }
@ -1195,7 +1196,8 @@ SR_PRIV int sr_scpi_cmd(const struct sr_dev_inst *sdi,
if (channel_cmd && channel_name && if (channel_cmd && channel_name &&
g_strcmp0(channel_name, scpi->actual_channel_name)) { g_strcmp0(channel_name, scpi->actual_channel_name)) {
sr_spew("sr_scpi_cmd(): new channel = %s", channel_name); sr_spew("sr_scpi_cmd(): new channel = %s", channel_name);
scpi->actual_channel_name = channel_name; g_free(scpi->actual_channel_name);
scpi->actual_channel_name = g_strdup(channel_name);
ret = scpi_send(scpi, channel_cmd, channel_name); ret = scpi_send(scpi, channel_cmd, channel_name);
if (ret != SR_OK) if (ret != SR_OK)
return ret; return ret;
@ -1239,7 +1241,8 @@ SR_PRIV int sr_scpi_cmd_resp(const struct sr_dev_inst *sdi,
if (channel_cmd && channel_name && if (channel_cmd && channel_name &&
g_strcmp0(channel_name, scpi->actual_channel_name)) { g_strcmp0(channel_name, scpi->actual_channel_name)) {
sr_spew("sr_scpi_cmd_get(): new channel = %s", channel_name); sr_spew("sr_scpi_cmd_get(): new channel = %s", channel_name);
scpi->actual_channel_name = channel_name; g_free(scpi->actual_channel_name);
scpi->actual_channel_name = g_strdup(channel_name);
ret = scpi_send(scpi, channel_cmd, channel_name); ret = scpi_send(scpi, channel_cmd, channel_name);
if (ret != SR_OK) if (ret != SR_OK)
return ret; return ret;