hmo_scope_state_free(devc->model_state);
for (i = 0; i < model->analog_channels; ++i)
- g_slist_free(devc->analog_groups[i].probes);
+ g_slist_free(devc->analog_groups[i].channels);
for (i = 0; i < model->digital_pods; ++i) {
- g_slist_free(devc->digital_groups[i].probes);
+ g_slist_free(devc->digital_groups[i].channels);
g_free(devc->digital_groups[i].name);
}
return SR_OK;
}
-static int check_probe_group(struct dev_context *devc,
- const struct sr_probe_group *probe_group)
+static int check_channel_group(struct dev_context *devc,
+ const struct sr_channel_group *cg)
{
unsigned int i;
struct scope_config *model;
model = devc->model_config;
- if (!probe_group)
+ if (!cg)
return PG_NONE;
for (i = 0; i < model->analog_channels; ++i)
- if (probe_group == &devc->analog_groups[i])
+ if (cg == &devc->analog_groups[i])
return PG_ANALOG;
for (i = 0; i < model->digital_pods; ++i)
- if (probe_group == &devc->digital_groups[i])
+ if (cg == &devc->digital_groups[i])
return PG_DIGITAL;
- sr_err("Invalid probe group specified.");
+ sr_err("Invalid channel group specified.");
return PG_INVALID;
}
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
int ret, pg_type;
unsigned int i;
if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG;
- if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+ if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
return SR_ERR;
ret = SR_ERR_NA;
*data = g_variant_new_int32(model->num_xdivs);
ret = SR_OK;
break;
+ case SR_CONF_TIMEBASE:
+ *data = g_variant_new("(tt)", (*model->timebases)[state->timebase][0],
+ (*model->timebases)[state->timebase][1]);
+ ret = SR_OK;
+ break;
case SR_CONF_NUM_VDIV:
+ if (pg_type == PG_NONE) {
+ sr_err("No channel group specified.");
+ return SR_ERR_CHANNEL_GROUP;
+ } else if (pg_type == PG_ANALOG) {
+ for (i = 0; i < model->analog_channels; ++i) {
+ if (cg != &devc->analog_groups[i])
+ continue;
+ *data = g_variant_new_int32(model->num_ydivs);
+ ret = SR_OK;
+ break;
+ }
+
+ } else {
+ ret = SR_ERR_NA;
+ }
+ break;
+ case SR_CONF_VDIV:
if (pg_type == PG_NONE) {
sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
for (i = 0; i < model->analog_channels; ++i) {
if (probe_group != &devc->analog_groups[i])
continue;
- *data = g_variant_new_int32(model->num_ydivs);
+ *data = g_variant_new("(tt)",
+ (*model->vdivs)[state->analog_channels[i].vdiv][0],
+ (*model->vdivs)[state->analog_channels[i].vdiv][1]);
ret = SR_OK;
break;
}
*data = g_variant_new_string((*model->trigger_sources)[state->trigger_source]);
ret = SR_OK;
break;
+ case SR_CONF_TRIGGER_SLOPE:
+ *data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
+ ret = SR_OK;
+ break;
+ case SR_CONF_HORIZ_TRIGGERPOS:
+ *data = g_variant_new_double(state->horiz_triggerpos);
+ ret = SR_OK;
+ break;
case SR_CONF_COUPLING:
if (pg_type == PG_NONE) {
- sr_err("No probe group specified.");
- return SR_ERR_PROBE_GROUP;
+ sr_err("No channel group specified.");
+ return SR_ERR_CHANNEL_GROUP;
} else if (pg_type == PG_ANALOG) {
for (i = 0; i < model->analog_channels; ++i) {
- if (probe_group != &devc->analog_groups[i])
+ if (cg != &devc->analog_groups[i])
continue;
*data = g_variant_new_string((*model->coupling_options)[state->analog_channels[i].coupling]);
ret = SR_OK;
}
static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
int ret, pg_type;
unsigned int i, j;
if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG;
- if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+ if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
return SR_ERR;
model = devc->model_config;
break;
case SR_CONF_VDIV:
if (pg_type == PG_NONE) {
- sr_err("No probe group specified.");
- return SR_ERR_PROBE_GROUP;
+ sr_err("No channel group specified.");
+ return SR_ERR_CHANNEL_GROUP;
}
g_variant_get(data, "(tt)", &p, &q);
q != (*model->vdivs)[i][1])
continue;
for (j = 1; j <= model->analog_channels; ++j) {
- if (probe_group != &devc->analog_groups[j - 1])
+ if (cg != &devc->analog_groups[j - 1])
continue;
state->analog_channels[j - 1].vdiv = i;
g_ascii_formatd(float_str, sizeof(float_str), "%E", (float) p / q);
break;
case SR_CONF_COUPLING:
if (pg_type == PG_NONE) {
- sr_err("No probe group specified.");
- return SR_ERR_PROBE_GROUP;
+ sr_err("No channel group specified.");
+ return SR_ERR_CHANNEL_GROUP;
}
tmp = g_variant_get_string(data, NULL);
if (strcmp(tmp, (*model->coupling_options)[i]) != 0)
continue;
for (j = 1; j <= model->analog_channels; ++j) {
- if (probe_group != &devc->analog_groups[j - 1])
+ if (cg != &devc->analog_groups[j - 1])
continue;
state->analog_channels[j-1].coupling = i;
}
static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group)
+ const struct sr_channel_group *cg)
{
int pg_type;
struct dev_context *devc;
if (!sdi || !(devc = sdi->priv))
return SR_ERR_ARG;
- if ((pg_type = check_probe_group(devc, probe_group)) == PG_INVALID)
+ if ((pg_type = check_channel_group(devc, cg)) == PG_INVALID)
return SR_ERR;
model = devc->model_config;
break;
case SR_CONF_COUPLING:
if (pg_type == PG_NONE)
- return SR_ERR_PROBE_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
*data = g_variant_new_strv(*model->coupling_options,
g_strv_length((char **)*model->coupling_options));
break;
break;
case SR_CONF_VDIV:
if (pg_type == PG_NONE)
- return SR_ERR_PROBE_GROUP;
+ return SR_ERR_CHANNEL_GROUP;
*data = build_tuples(model->vdivs, model->num_vdivs);
break;
default:
SR_PRIV int hmo_request_data(const struct sr_dev_inst *sdi)
{
char command[MAX_COMMAND_SIZE];
- struct sr_probe *probe;
+ struct sr_channel *ch;
struct dev_context *devc;
struct scope_config *model;
devc = sdi->priv;
model = devc->model_config;
- probe = devc->current_probe->data;
+ ch = devc->current_channel->data;
- switch (probe->type) {
+ switch (ch->type) {
case SR_PROBE_ANALOG:
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_GET_ANALOG_DATA],
- probe->index + 1);
+ ch->index + 1);
break;
case SR_PROBE_LOGIC:
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_GET_DIG_DATA],
- probe->index < 8 ? 1 : 2);
+ ch->index < 8 ? 1 : 2);
break;
default:
- sr_err("Invalid probe type.");
+ sr_err("Invalid channel type.");
break;
}
return sr_scpi_send(sdi->conn, command);
}
-static int hmo_check_probes(GSList *probes)
+static int hmo_check_channels(GSList *channels)
{
GSList *l;
- struct sr_probe *probe;
+ struct sr_channel *ch;
gboolean enabled_pod1, enabled_pod2, enabled_chan3, enabled_chan4;
enabled_pod1 = enabled_pod2 = enabled_chan3 = enabled_chan4 = FALSE;
- for (l = probes; l; l = l->next) {
- probe = l->data;
- switch (probe->type) {
+ for (l = channels; l; l = l->next) {
+ ch = l->data;
+ switch (ch->type) {
case SR_PROBE_ANALOG:
- if (probe->index == 2)
+ if (ch->index == 2)
enabled_chan3 = TRUE;
- else if (probe->index == 3)
+ else if (ch->index == 3)
enabled_chan4 = TRUE;
break;
case SR_PROBE_LOGIC:
- if (probe->index < 8)
+ if (ch->index < 8)
enabled_pod1 = TRUE;
else
enabled_pod2 = TRUE;
return SR_OK;
}
-static int hmo_setup_probes(const struct sr_dev_inst *sdi)
+static int hmo_setup_channels(const struct sr_dev_inst *sdi)
{
GSList *l;
unsigned int i;
char command[MAX_COMMAND_SIZE];
struct scope_state *state;
struct scope_config *model;
- struct sr_probe *probe;
+ struct sr_channel *ch;
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
pod_enabled = g_try_malloc0(sizeof(gboolean) * model->digital_pods);
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- switch (probe->type) {
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ switch (ch->type) {
case SR_PROBE_ANALOG:
- if (probe->enabled == state->analog_channels[probe->index].state)
+ if (ch->enabled == state->analog_channels[ch->index].state)
break;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_ANALOG_CHAN_STATE],
- probe->index + 1, probe->enabled);
+ ch->index + 1, ch->enabled);
if (sr_scpi_send(scpi, command) != SR_OK)
return SR_ERR;
- state->analog_channels[probe->index].state = probe->enabled;
+ state->analog_channels[ch->index].state = ch->enabled;
setup_changed = TRUE;
break;
case SR_PROBE_LOGIC:
/*
* A digital POD needs to be enabled for every group of
- * 8 probes.
+ * 8 channels.
*/
- if (probe->enabled)
- pod_enabled[probe->index < 8 ? 0 : 1] = TRUE;
+ if (ch->enabled)
+ pod_enabled[ch->index < 8 ? 0 : 1] = TRUE;
- if (probe->enabled == state->digital_channels[probe->index])
+ if (ch->enabled == state->digital_channels[ch->index])
break;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_CHAN_STATE],
- probe->index, probe->enabled);
+ ch->index, ch->enabled);
if (sr_scpi_send(scpi, command) != SR_OK)
return SR_ERR;
- state->digital_channels[probe->index] = probe->enabled;
+ state->digital_channels[ch->index] = ch->enabled;
setup_changed = TRUE;
break;
default:
{
GSList *l;
gboolean digital_added;
- struct sr_probe *probe;
+ struct sr_channel *ch;
struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
devc = sdi->priv;
digital_added = FALSE;
- for (l = sdi->probes; l; l = l->next) {
- probe = l->data;
- if (!probe->enabled)
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (!ch->enabled)
continue;
- /* Only add a single digital probe. */
- if (probe->type != SR_PROBE_LOGIC || !digital_added) {
- devc->enabled_probes = g_slist_append(
- devc->enabled_probes, probe);
- if (probe->type == SR_PROBE_LOGIC)
+ /* Only add a single digital channel. */
+ if (ch->type != SR_PROBE_LOGIC || !digital_added) {
+ devc->enabled_channels = g_slist_append(
+ devc->enabled_channels, ch);
+ if (ch->type == SR_PROBE_LOGIC)
digital_added = TRUE;
}
}
- if (!devc->enabled_probes)
+ if (!devc->enabled_channels)
return SR_ERR;
- if (hmo_check_probes(devc->enabled_probes) != SR_OK) {
- sr_err("Invalid probe configuration specified!");
+ if (hmo_check_channels(devc->enabled_channels) != SR_OK) {
+ sr_err("Invalid channel configuration specified!");
return SR_ERR_NA;
}
- if (hmo_setup_probes(sdi) != SR_OK) {
- sr_err("Failed to setup probe configuration!");
+ if (hmo_setup_channels(sdi) != SR_OK) {
+ sr_err("Failed to setup channel configuration!");
return SR_ERR;
}
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, LOG_PREFIX);
- devc->current_probe = devc->enabled_probes;
+ devc->current_channel = devc->enabled_channels;
return hmo_request_data(sdi);
}
devc = sdi->priv;
devc->num_frames = 0;
- g_slist_free(devc->enabled_probes);
- devc->enabled_probes = NULL;
+ g_slist_free(devc->enabled_channels);
+ devc->enabled_channels = NULL;
scpi = sdi->conn;
sr_scpi_source_remove(scpi);
projects / libsigrok.git / blobdiff