[SCPI_CMD_SET_DIG_CHAN_STATE] = ":LOG%d:STAT %d",
[SCPI_CMD_GET_VERTICAL_OFFSET] = ":CHAN%d:POS?",
[SCPI_CMD_GET_HORIZ_TRIGGERPOS] = ":TIM:POS?",
- [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %E",
+ [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s",
[SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?",
[SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d",
};
SR_CONF_TRIGGER_SLOPE,
SR_CONF_HORIZ_TRIGGERPOS,
SR_CONF_SAMPLERATE,
+ SR_CONF_LIMIT_FRAMES,
};
static const int32_t hmo_analog_caps[] = {
sr_info("Current samplerate: %s", tmp);
g_free(tmp);
- sr_info("Current trigger: %s (source), %s (slope) %2.2e (offset)",
+ sr_info("Current trigger: %s (source), %s (slope) %.2f (offset)",
(*config->trigger_sources)[state->trigger_source],
(*config->trigger_slopes)[state->trigger_slope],
state->horiz_triggerpos);
/* No channel is active, ask the instrument for the sample rate
* in single shot mode */
if (!channel_found) {
- g_snprintf(tmp_str, sizeof(tmp_str),
- (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE]);
-
- if (sr_scpi_get_float(sdi->conn, tmp_str, &tmp_float) != SR_OK)
+ if (sr_scpi_get_float(sdi->conn,
+ (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE],
+ &tmp_float) != SR_OK)
return SR_ERR;
+
state->sample_rate = tmp_float;
} else {
if (sr_scpi_get_int(sdi->conn, tmp_str, &tmp) != SR_OK)
if (sr_scpi_get_float(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
- &state->horiz_triggerpos) != SR_OK)
+ &tmp_float) != SR_OK)
return SR_ERR;
+ state->horiz_triggerpos = tmp_float /
+ (((double) (*config->timebases)[state->timebase][0] /
+ (*config->timebases)[state->timebase][1]) * config->num_xdivs);
+ state->horiz_triggerpos -= 0.5;
+ state->horiz_triggerpos *= -1;
if (scope_state_get_array_option(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SOURCE],
return SR_ERR_NA;
}
- if (!(devc->analog_groups = g_try_malloc0(sizeof(struct sr_probe_group) *
+ if (!(devc->analog_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
scope_models[model_index].analog_channels)))
return SR_ERR_MALLOC;
- if (!(devc->digital_groups = g_try_malloc0(sizeof(struct sr_probe_group) *
+ if (!(devc->digital_groups = g_try_malloc0(sizeof(struct sr_channel_group) *
scope_models[model_index].digital_pods)))
return SR_ERR_MALLOC;
devc->analog_groups[i].name =
(char *)(*scope_models[model_index].analog_names)[i];
- devc->analog_groups[i].probes = g_slist_append(NULL, probe);
+ devc->analog_groups[i].channels = g_slist_append(NULL, probe);
- sdi->probe_groups = g_slist_append(sdi->probe_groups,
+ sdi->channel_groups = g_slist_append(sdi->channel_groups,
&devc->analog_groups[i]);
}
- /* Add digital probe groups. */
+ /* Add digital channel groups. */
for (i = 0; i < scope_models[model_index].digital_pods; ++i) {
g_snprintf(tmp, 25, "POD%d", i);
devc->digital_groups[i].name = g_strdup(tmp);
- sdi->probe_groups = g_slist_append(sdi->probe_groups,
+ sdi->channel_groups = g_slist_append(sdi->channel_groups,
&devc->digital_groups[i < 8 ? 0 : 1]);
}
return SR_ERR_MALLOC;
sdi->probes = g_slist_append(sdi->probes, probe);
- devc->digital_groups[i < 8 ? 0 : 1].probes = g_slist_append(
- devc->digital_groups[i < 8 ? 0 : 1].probes, probe);
+ devc->digital_groups[i < 8 ? 0 : 1].channels = g_slist_append(
+ devc->digital_groups[i < 8 ? 0 : 1].channels, probe);
}
devc->model_config = &scope_models[model_index];