[SCPI_CMD_GET_PROBE_UNIT] = ":PROB%d:SET:ATT:UNIT?",
};
-static const uint32_t hmo_devopts[] = {
+static const uint32_t devopts[] = {
SR_CONF_OSCILLOSCOPE,
SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_NUM_HDIV | SR_CONF_GET,
- SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_SAMPLERATE | SR_CONF_GET,
+ SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static const uint32_t hmo_analog_devopts[] = {
+static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET,
- SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static const char *hmo_coupling_options[] = {
+static const char *coupling_options[] = {
"AC", // AC with 50 Ohm termination (152x, 202x, 30xx, 1202)
"ACL", // AC with 1 MOhm termination
"DC", // DC with 50 Ohm termination
"DCL", // DC with 1 MOhm termination
"GND",
- NULL,
};
static const char *scope_trigger_slopes[] = {
"POS",
"NEG",
"EITH",
- NULL,
};
-static const char *hmo_compact2_trigger_sources[] = {
- "CH1",
- "CH2",
- "LINE",
- "EXT",
- "PATT",
- "BUS1",
- "BUS2",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- NULL,
+static const char *compact2_trigger_sources[] = {
+ "CH1", "CH2",
+ "LINE", "EXT", "PATT", "BUS1", "BUS2",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
-static const char *hmo_compact4_trigger_sources[] = {
- "CH1",
- "CH2",
- "CH3",
- "CH4",
- "LINE",
- "EXT",
- "PATT",
- "BUS1",
- "BUS2",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- NULL,
+static const char *compact4_trigger_sources[] = {
+ "CH1", "CH2", "CH3", "CH4",
+ "LINE", "EXT", "PATT", "BUS1", "BUS2",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
-static const char *hmo_compact4_dig16_trigger_sources[] = {
- "CH1",
- "CH2",
- "CH3",
- "CH4",
- "LINE",
- "EXT",
- "PATT",
- "BUS1",
- "BUS2",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- "D8",
- "D9",
- "D10",
- "D11",
- "D12",
- "D13",
- "D14",
- "D15",
- NULL,
+static const char *compact4_dig16_trigger_sources[] = {
+ "CH1", "CH2", "CH3", "CH4",
+ "LINE", "EXT", "PATT", "BUS1", "BUS2",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+ "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
-static const uint64_t hmo_timebases[][2] = {
+static const uint64_t timebases[][2] = {
/* nanoseconds */
{ 2, 1000000000 },
{ 5, 1000000000 },
{ 50, 1 },
};
-static const uint64_t hmo_vdivs[][2] = {
+static const uint64_t vdivs[][2] = {
/* millivolts */
{ 1, 1000 },
{ 2, 1000 },
};
static const char *scope_analog_channel_names[] = {
- "CH1",
- "CH2",
- "CH3",
- "CH4",
+ "CH1", "CH2", "CH3", "CH4",
};
static const char *scope_digital_channel_names[] = {
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
- "D8",
- "D9",
- "D10",
- "D11",
- "D12",
- "D13",
- "D14",
- "D15",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+ "D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
static const struct scope_config scope_models[] = {
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
- .devopts = &hmo_devopts,
- .num_devopts = ARRAY_SIZE(hmo_devopts),
+ .devopts = &devopts,
+ .num_devopts = ARRAY_SIZE(devopts),
+
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
- .analog_devopts = &hmo_analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
+ .coupling_options = &coupling_options,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &compact2_trigger_sources,
+ .num_trigger_sources = ARRAY_SIZE(compact2_trigger_sources),
- .coupling_options = &hmo_coupling_options,
- .trigger_sources = &hmo_compact2_trigger_sources,
.trigger_slopes = &scope_trigger_slopes,
+ .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
- .timebases = &hmo_timebases,
- .num_timebases = ARRAY_SIZE(hmo_timebases),
+ .timebases = &timebases,
+ .num_timebases = ARRAY_SIZE(timebases),
- .vdivs = &hmo_vdivs,
- .num_vdivs = ARRAY_SIZE(hmo_vdivs),
+ .vdivs = &vdivs,
+ .num_vdivs = ARRAY_SIZE(vdivs),
.num_xdivs = 12,
.num_ydivs = 8,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
- .devopts = &hmo_devopts,
- .num_devopts = ARRAY_SIZE(hmo_devopts),
+ .devopts = &devopts,
+ .num_devopts = ARRAY_SIZE(devopts),
+
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
+
+ .coupling_options = &coupling_options,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
- .analog_devopts = &hmo_analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
+ .trigger_sources = &compact4_trigger_sources,
+ .num_trigger_sources = ARRAY_SIZE(compact4_trigger_sources),
- .coupling_options = &hmo_coupling_options,
- .trigger_sources = &hmo_compact4_trigger_sources,
.trigger_slopes = &scope_trigger_slopes,
+ .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
- .timebases = &hmo_timebases,
- .num_timebases = ARRAY_SIZE(hmo_timebases),
+ .timebases = &timebases,
+ .num_timebases = ARRAY_SIZE(timebases),
- .vdivs = &hmo_vdivs,
- .num_vdivs = ARRAY_SIZE(hmo_vdivs),
+ .vdivs = &vdivs,
+ .num_vdivs = ARRAY_SIZE(vdivs),
.num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
},
{
- .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", NULL},
+ .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", "HMO3524", NULL},
.analog_channels = 4,
.digital_channels = 16,
.digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
- .devopts = &hmo_devopts,
- .num_devopts = ARRAY_SIZE(hmo_devopts),
+ .devopts = &devopts,
+ .num_devopts = ARRAY_SIZE(devopts),
- .analog_devopts = &hmo_analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
+
+ .coupling_options = &coupling_options,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .trigger_sources = &compact4_dig16_trigger_sources,
+ .num_trigger_sources = ARRAY_SIZE(compact4_dig16_trigger_sources),
- .coupling_options = &hmo_coupling_options,
- .trigger_sources = &hmo_compact4_dig16_trigger_sources,
.trigger_slopes = &scope_trigger_slopes,
+ .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
- .timebases = &hmo_timebases,
- .num_timebases = ARRAY_SIZE(hmo_timebases),
+ .timebases = &timebases,
+ .num_timebases = ARRAY_SIZE(timebases),
- .vdivs = &hmo_vdivs,
- .num_vdivs = ARRAY_SIZE(hmo_vdivs),
+ .vdivs = &vdivs,
+ .num_vdivs = ARRAY_SIZE(vdivs),
.num_xdivs = 12,
.num_ydivs = 8,
state->digital_pods[i] ? "On" : "Off");
}
- /* FIXME: this is wrong for TB > 1 second */
- tmp = sr_period_string((*config->timebases)[state->timebase][1] /
- (*config->timebases)[state->timebase][0]);
+ tmp = sr_period_string((*config->timebases)[state->timebase][0],
+ (*config->timebases)[state->timebase][1]);
sr_info("Current timebase: %s", tmp);
g_free(tmp);
}
static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
- const char *command, const char *(*array)[], int *result)
+ const char *command, const char *(*array)[], unsigned int n, int *result)
{
char *tmp;
- unsigned int i;
+ int idx;
if (sr_scpi_get_string(scpi, command, &tmp) != SR_OK) {
g_free(tmp);
return SR_ERR;
}
- for (i = 0; (*array)[i]; i++) {
- if (!g_strcmp0(tmp, (*array)[i])) {
- *result = i;
- g_free(tmp);
- tmp = NULL;
- break;
- }
- }
-
- if (tmp) {
+ if ((idx = std_str_idx_s(tmp, *array, n)) < 0) {
g_free(tmp);
- return SR_ERR;
+ return SR_ERR_ARG;
}
+ *result = idx;
+
+ g_free(tmp);
+
return SR_OK;
}
if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
return SR_ERR;
- if (array_float_get(tmp_str, hmo_vdivs, ARRAY_SIZE(hmo_vdivs),
- &j) != SR_OK) {
+ if (array_float_get(tmp_str, ARRAY_AND_SIZE(vdivs), &j) != SR_OK) {
g_free(tmp_str);
sr_err("Could not determine array index for vertical div scale.");
return SR_ERR;
i + 1);
if (scope_state_get_array_option(scpi, command, config->coupling_options,
+ config->num_coupling_options,
&state->analog_channels[i].coupling) != SR_OK)
return SR_ERR;
&tmp_str) != SR_OK)
return SR_ERR;
- if (array_float_get(tmp_str, hmo_timebases, ARRAY_SIZE(hmo_timebases),
- &i) != SR_OK) {
+ if (array_float_get(tmp_str, ARRAY_AND_SIZE(timebases), &i) != SR_OK) {
g_free(tmp_str);
sr_err("Could not determine array index for time base.");
return SR_ERR;
if (scope_state_get_array_option(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SOURCE],
- config->trigger_sources, &state->trigger_source) != SR_OK)
+ config->trigger_sources, config->num_trigger_sources,
+ &state->trigger_source) != SR_OK)
return SR_ERR;
if (scope_state_get_array_option(sdi->conn,
- (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SLOPE],
- config->trigger_slopes, &state->trigger_slope) != SR_OK)
+ (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_SLOPE],
+ config->trigger_slopes, config->num_trigger_slopes,
+ &state->trigger_slope) != SR_OK)
return SR_ERR;
if (hmo_update_sample_rate(sdi) != SR_OK)
* the first enabled channel.
*/
if (++devc->num_frames == devc->frame_limit) {
- sdi->driver->dev_acquisition_stop(sdi);
+ sr_dev_acquisition_stop(sdi);
hmo_cleanup_logic_data(devc);
} else {
devc->current_channel = devc->enabled_channels;
projects / libsigrok.git / blobdiff