Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix data aquisition and Rohde & Schwarz support in hameg-hmo #259

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix data aquisition and Rohde & Schwarz support in hameg-hmo #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions src/hardware/hameg-hmo/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
#else
"LSBF",
#endif
ch->index + 1,
ch->index + 1);
break;
case SR_CHANNEL_LOGIC:
Expand Down Expand Up @@ -711,6 +712,7 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
{
GSList *l;
unsigned int i;
unsigned int k;
gboolean *pod_enabled, setup_changed;
char command[MAX_COMMAND_SIZE];
struct scope_state *state;
Expand Down Expand Up @@ -755,16 +757,20 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)

if (ch->enabled == state->digital_channels[ch->index])
break;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
ch->index, ch->enabled);

if (!(model->internal_flags & INTERN_NO_LOGIC_STATE_SET_SUPPORT)) {
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
ch->index, ch->enabled);

if (sr_scpi_send(scpi, command) != SR_OK) {
g_free(pod_enabled);
return SR_ERR;
if (sr_scpi_send(scpi, command) != SR_OK) {
g_free(pod_enabled);
return SR_ERR;
}

state->digital_channels[ch->index] = ch->enabled;
}

state->digital_channels[ch->index] = ch->enabled;
setup_changed = TRUE;
break;
default:
Expand All @@ -777,12 +783,31 @@ static int hmo_setup_channels(const struct sr_dev_inst *sdi)
for (i = 0; i < model->digital_pods; i++) {
if (state->digital_pods[i].state == pod_enabled[i])
continue;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE],
i + 1, pod_enabled[i]);
if (sr_scpi_send(scpi, command) != SR_OK) {
ret = SR_ERR;
break;

if (!(model->internal_flags & INTERN_NO_LOGIC_STATE_SET_SUPPORT)) {
/*
* Override digital channel state for all channels of a POD if
* individual channel states can't be set.
*/
for (k = 0; k < DIGITAL_CHANNELS_PER_POD; k++) {
state->digital_channels[k + i * DIGITAL_CHANNELS_PER_POD] = pod_enabled[i];
}
}

if (!(model->internal_flags & INTERN_NO_POD_STATE_SET_SUPPORT)) {
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_STATE],
i + 1, pod_enabled[i]);
if (sr_scpi_send(scpi, command) != SR_OK) {
ret = SR_ERR;
break;
}
}
else {
pod_enabled[i] = TRUE;
for (k = 0; k < DIGITAL_CHANNELS_PER_POD; k++) {
state->digital_channels[k + i * DIGITAL_CHANNELS_PER_POD] = TRUE;
}
}
state->digital_pods[i].state = pod_enabled[i];
setup_changed = TRUE;
Expand Down
74 changes: 61 additions & 13 deletions src/hardware/hameg-hmo/protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ static const char *hameg_scpi_dialect[] = {
[SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s",
[SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?",
[SCPI_CMD_GET_ANALOG_DATA] = ":FORM:BORD %s;" \
":FORM REAL,32;:CHAN%d:DATA?",
":FORM REAL,32;:CHAN%d:DATA:POIN MAX;:CHAN%d:DATA?",
[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?",
Expand Down Expand Up @@ -81,7 +81,7 @@ static const char *rohde_schwarz_log_not_pod_scpi_dialect[] = {
[SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s",
[SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?",
[SCPI_CMD_GET_ANALOG_DATA] = ":FORM:BORD %s;" \
":FORM REAL,32;:CHAN%d:DATA?",
":FORM REAL,32;:CHAN%d:DATA:POIN MAX;:CHAN%d:DATA?",
[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?",
Expand Down Expand Up @@ -612,6 +612,9 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT,
},
{
.name = {"RTB2004", NULL},
Expand Down Expand Up @@ -652,6 +655,9 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT,
},
{
.name = {"RTM3002", NULL},
Expand Down Expand Up @@ -692,6 +698,9 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT,
},
{
.name = {"RTM3004", NULL},
Expand Down Expand Up @@ -732,6 +741,9 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT,
},
{
.name = {"RTA4004", NULL},
Expand Down Expand Up @@ -772,6 +784,9 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT,
},
{
.name = {"RTH1002", NULL},
Expand Down Expand Up @@ -812,6 +827,10 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT
| INTERN_NO_POD_STATE_SET_SUPPORT,
},
{
.name = {"RTH1004", NULL},
Expand Down Expand Up @@ -852,6 +871,10 @@ static struct scope_config scope_models[] = {
.num_ydivs = 8,

.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,

.internal_flags = INTERN_NO_LOGIC_STATE_GET_SUPPORT
| INTERN_NO_LOGIC_STATE_SET_SUPPORT
| INTERN_NO_POD_STATE_SET_SUPPORT,
},
};

Expand All @@ -871,8 +894,19 @@ static void scope_state_dump(const struct scope_config *config,
}

for (i = 0; i < config->digital_channels; i++) {
sr_info("State of digital channel %d -> %s", i,
state->digital_channels[i] ? "On" : "Off");
if (!(config->internal_flags & INTERN_NO_LOGIC_STATE_GET_SUPPORT))
{
sr_info("State of digital channel %d -> %s", i,
state->digital_channels[i] ? "On" : "Off");
}
else if (!(config->internal_flags & INTERN_NO_POD_STATE_GET_SUPPORT))
{
sr_info("State of digital channel %d -> %s", i,
state->digital_pods[i / DIGITAL_CHANNELS_PER_POD].state ? "On" : "Off");
}
else {
sr_info("State of digital channel %d -> On", i);
}
}

for (i = 0; i < config->digital_pods; i++) {
Expand Down Expand Up @@ -1058,13 +1092,27 @@ static int digital_channel_state_get(struct sr_dev_inst *sdi,
struct sr_scpi_dev_inst *scpi = sdi->conn;

for (i = 0; i < config->digital_channels; i++) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_CHAN_STATE],
i);
if (!(config->internal_flags & INTERN_NO_LOGIC_STATE_GET_SUPPORT)) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_CHAN_STATE],
i);

if (sr_scpi_get_bool(scpi, command,
&state->digital_channels[i]) != SR_OK)
return SR_ERR;
if (sr_scpi_get_bool(scpi, command,
&state->digital_channels[i]) != SR_OK)
return SR_ERR;
}
else if (!(config->internal_flags & INTERN_NO_POD_STATE_GET_SUPPORT)) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_STATE],
i / DIGITAL_CHANNELS_PER_POD);

if (sr_scpi_get_bool(scpi, command,
&state->digital_channels[i]) != SR_OK)
return SR_ERR;
}
else {
state->digital_channels[i] = TRUE;
}

ch = get_channel_by_index_and_type(sdi->channels, i, SR_CHANNEL_LOGIC);
if (ch)
Expand Down Expand Up @@ -1518,13 +1566,13 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)

packet.type = SR_DF_ANALOG;

sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
analog.data = data->data;
analog.num_samples = data->len / sizeof(float);
/* Truncate acquisition if a smaller number of samples has been requested. */
if (devc->samples_limit > 0 && analog.num_samples > devc->samples_limit)
analog.num_samples = devc->samples_limit;
/* TODO: Use proper 'digits' value for this device (and its modes). */
sr_analog_init(&analog, &encoding, &meaning, &spec, 2);
encoding.is_signed = TRUE;
if (state->analog_channels[ch->index].probe_unit == 'V') {
meaning.mq = SR_MQ_VOLTAGE;
Expand All @@ -1536,7 +1584,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
meaning.channels = g_slist_append(NULL, ch);
packet.payload = &analog;
sr_session_send(sdi, &packet);
devc->num_samples = data->len / sizeof(float);
devc->num_samples += analog.num_samples;
g_slist_free(meaning.channels);
g_byte_array_free(data, TRUE);
data = NULL;
Expand Down Expand Up @@ -1613,7 +1661,7 @@ SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
* number of frames or after the specified number of samples, or
* continue reception by starting over at the first enabled channel.
*/
if (++devc->num_frames >= devc->frame_limit || devc->num_samples >= devc->samples_limit) {
if ((devc->frame_limit && ++devc->num_frames >= devc->frame_limit) || devc->num_samples >= devc->samples_limit) {
sr_dev_acquisition_stop(sdi);
hmo_cleanup_logic_data(devc);
} else {
Expand Down
9 changes: 9 additions & 0 deletions src/hardware/hameg-hmo/protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ struct scope_config {
const unsigned int num_ydivs;

const char *(*scpi_dialect)[];

const uint32_t internal_flags;
};

struct analog_channel_state {
Expand Down Expand Up @@ -133,6 +135,13 @@ struct dev_context {
GByteArray *logic_data;
};

enum internal_flags {
INTERN_NO_LOGIC_STATE_GET_SUPPORT = (1 << 0),
INTERN_NO_LOGIC_STATE_SET_SUPPORT = (1 << 1),
INTERN_NO_POD_STATE_GET_SUPPORT = (1 << 2),
INTERN_NO_POD_STATE_SET_SUPPORT = (1 << 3),
};

SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi);
SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi);
SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data);
Expand Down