SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
-static const uint32_t analog_devopts[] = {
+static const uint32_t devopts_cg_analog[] = {
SR_CONF_NUM_VDIV | SR_CONF_GET,
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 *compact2_trigger_sources[] = {
- "CH1",
- "CH2",
- "LINE",
- "EXT",
- "PATT",
- "BUS1",
- "BUS2",
- "D0",
- "D1",
- "D2",
- "D3",
- "D4",
- "D5",
- "D6",
- "D7",
+ "CH1", "CH2",
+ "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",
+ "CH1", "CH2", "CH3", "CH4",
+ "LINE", "EXT", "PATT", "BUS1", "BUS2",
+ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
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",
+ "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 *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[] = {
.devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts),
- .analog_devopts = &analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(analog_devopts),
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options,
.trigger_sources = &compact2_trigger_sources,
.devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts),
- .analog_devopts = &analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(analog_devopts),
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options,
.trigger_sources = &compact4_trigger_sources,
.devopts = &devopts,
.num_devopts = ARRAY_SIZE(devopts),
- .analog_devopts = &analog_devopts,
- .num_analog_devopts = ARRAY_SIZE(analog_devopts),
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
.coupling_options = &coupling_options,
.trigger_sources = &compact4_dig16_trigger_sources,
if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
return SR_ERR;
- if (array_float_get(tmp_str, vdivs, ARRAY_SIZE(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;
&tmp_str) != SR_OK)
return SR_ERR;
- if (array_float_get(tmp_str, timebases, ARRAY_SIZE(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;