[SCPI_CMD_GET_DIG_DATA] = ":FORM UINT,8;:POD%d:DATA?",
[SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?",
[SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s",
+ [SCPI_CMD_GET_HORIZONTAL_DIV] = ":TIM:DIV?",
[SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?",
[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?",
- [SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?",
- [SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %s",
+ [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?",
[SCPI_CMD_SET_DIG_POD_STATE] = ":POD%d:STAT %d",
[SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?",
[SCPI_CMD_GET_TRIGGER_PATTERN] = ":TRIG:A:PATT:SOUR?",
[SCPI_CMD_SET_TRIGGER_PATTERN] = ":TRIG:A:TYPE LOGIC;" \
":TRIG:A:PATT:FUNC AND;" \
- ":TRIG:A:PATT:COND TRUE;" \
+ ":TRIG:A:PATT:COND \"TRUE\";" \
":TRIG:A:PATT:MODE OFF;" \
":TRIG:A:PATT:SOUR \"%s\"",
[SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?",
[SCPI_CMD_GET_DIG_DATA] = ":FORM UINT,8;:LOG%d:DATA?",
[SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?",
[SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s",
+ [SCPI_CMD_GET_HORIZONTAL_DIV] = ":TIM:DIV?",
[SCPI_CMD_GET_COUPLING] = ":CHAN%d:COUP?",
[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?",
- [SCPI_CMD_GET_VERTICAL_DIV] = ":CHAN%d:SCAL?",
- [SCPI_CMD_SET_VERTICAL_DIV] = ":CHAN%d:SCAL %s",
+ [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?",
[SCPI_CMD_SET_DIG_POD_STATE] = ":LOG%d:STAT %d",
[SCPI_CMD_GET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP?",
[SCPI_CMD_GET_TRIGGER_PATTERN] = ":TRIG:A:PATT:SOUR?",
[SCPI_CMD_SET_TRIGGER_PATTERN] = ":TRIG:A:TYPE LOGIC;" \
":TRIG:A:PATT:FUNC AND;" \
- ":TRIG:A:PATT:COND TRUE;" \
+ ":TRIG:A:PATT:COND \"TRUE\";" \
":TRIG:A:PATT:MODE OFF;" \
":TRIG:A:PATT:SOUR \"%s\"",
[SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?",
"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
-/* RTB2004 and RTM3004 */
+/* RTB2004, RTM3004 and RTA4004 */
static const char *an4_dig16_sbus_trigger_sources[] = {
"CH1", "CH2", "CH3", "CH4",
"LINE", "EXT", "PATT", "SBUS1", "SBUS2",
};
static const uint64_t timebases[][2] = {
+ /* nanoseconds */
+ { 1, 1000000000 },
+ { 2, 1000000000 },
+ { 5, 1000000000 },
+ { 10, 1000000000 },
+ { 20, 1000000000 },
+ { 50, 1000000000 },
+ { 100, 1000000000 },
+ { 200, 1000000000 },
+ { 500, 1000000000 },
+ /* microseconds */
+ { 1, 1000000 },
+ { 2, 1000000 },
+ { 5, 1000000 },
+ { 10, 1000000 },
+ { 20, 1000000 },
+ { 50, 1000000 },
+ { 100, 1000000 },
+ { 200, 1000000 },
+ { 500, 1000000 },
+ /* milliseconds */
+ { 1, 1000 },
+ { 2, 1000 },
+ { 5, 1000 },
+ { 10, 1000 },
+ { 20, 1000 },
+ { 50, 1000 },
+ { 100, 1000 },
+ { 200, 1000 },
+ { 500, 1000 },
+ /* seconds */
+ { 1, 1 },
+ { 2, 1 },
+ { 5, 1 },
+ { 10, 1 },
+ { 20, 1 },
+ { 50, 1 },
+};
+
+/* HMO Compact series (HMO722/724/1022/1024/1522/1524/2022/2024) do
+ * not support 1 ns timebase setting.
+ */
+static const uint64_t timebases_hmo_compact[][2] = {
/* nanoseconds */
{ 2, 1000000000 },
{ 5, 1000000000 },
"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
-static const struct scope_config scope_models[] = {
+static struct scope_config scope_models[] = {
+ {
+ /* HMO Compact2: HMO722/1022/1522/2022 support only 8 digital channels. */
+ .name = {"HMO722", "HMO1022", "HMO1522", "HMO2022", NULL},
+ .analog_channels = 2,
+ .digital_channels = 8,
+
+ .analog_names = &scope_analog_channel_names,
+ .digital_names = &scope_digital_channel_names,
+
+ .devopts = &devopts,
+ .num_devopts = ARRAY_SIZE(devopts),
+
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
+
+ .devopts_cg_digital = &devopts_cg_digital,
+ .num_devopts_cg_digital = ARRAY_SIZE(devopts_cg_digital),
+
+ .coupling_options = &coupling_options,
+ .num_coupling_options = ARRAY_SIZE(coupling_options),
+
+ .logic_threshold = &logic_threshold,
+ .num_logic_threshold = ARRAY_SIZE(logic_threshold),
+ .logic_threshold_for_pod = TRUE,
+
+ .trigger_sources = &an2_dig8_trigger_sources,
+ .num_trigger_sources = ARRAY_SIZE(an2_dig8_trigger_sources),
+
+ .trigger_slopes = &scope_trigger_slopes,
+ .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
+
+ .timebases = &timebases_hmo_compact,
+ .num_timebases = ARRAY_SIZE(timebases_hmo_compact),
+
+ .vdivs = &vdivs,
+ .num_vdivs = ARRAY_SIZE(vdivs),
+
+ .num_ydivs = 8,
+
+ .scpi_dialect = &hameg_scpi_dialect,
+ },
{
- /* RTC1002 and HMO722/1002/1022/1202/1522/2022 support only 8 digital channels. */
- .name = {"RTC1002", "HMO722", "HMO1002", "HMO1022", "HMO1202", "HMO1522", "HMO2022", NULL},
+ /* RTC1002 and HMO1002/HMO1202 support only 8 digital channels. */
+ .name = {"RTC1002", "HMO1002", "HMO1202", NULL},
.analog_channels = 2,
.digital_channels = 8,
- .digital_pods = 1,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
.name = {"HMO3032", "HMO3042", "HMO3052", "HMO3522", NULL},
.analog_channels = 2,
.digital_channels = 16,
- .digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
},
{
+ /* HMO Compact4: HMO724/1024/1524/2024 support only 8 digital channels. */
.name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL},
.analog_channels = 4,
.digital_channels = 8,
- .digital_pods = 1,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.trigger_slopes = &scope_trigger_slopes,
.num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
- .timebases = &timebases,
- .num_timebases = ARRAY_SIZE(timebases),
+ .timebases = &timebases_hmo_compact,
+ .num_timebases = ARRAY_SIZE(timebases_hmo_compact),
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
.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,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
.name = {"RTB2002", NULL},
.analog_channels = 2,
.digital_channels = 16,
- .digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,
.name = {"RTB2004", NULL},
.analog_channels = 4,
.digital_channels = 16,
- .digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,
.name = {"RTM3002", NULL},
.analog_channels = 2,
.digital_channels = 16,
- .digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,
.name = {"RTM3004", NULL},
.analog_channels = 4,
.digital_channels = 16,
- .digital_pods = 2,
.analog_names = &scope_analog_channel_names,
.digital_names = &scope_digital_channel_names,
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
+ .num_ydivs = 8,
+
+ .scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,
+ },
+ {
+ .name = {"RTA4004", NULL},
+ .analog_channels = 4,
+ .digital_channels = 16,
+
+ .analog_names = &scope_analog_channel_names,
+ .digital_names = &scope_digital_channel_names,
+
+ .devopts = &devopts,
+ .num_devopts = ARRAY_SIZE(devopts),
+
+ .devopts_cg_analog = &devopts_cg_analog,
+ .num_devopts_cg_analog = ARRAY_SIZE(devopts_cg_analog),
+
+ .devopts_cg_digital = &devopts_cg_digital,
+ .num_devopts_cg_digital = ARRAY_SIZE(devopts_cg_digital),
+
+ .coupling_options = &coupling_options_rtm300x,
+ .num_coupling_options = ARRAY_SIZE(coupling_options_rtm300x),
+
+ .logic_threshold = &logic_threshold_rtb200x_rtm300x,
+ .num_logic_threshold = ARRAY_SIZE(logic_threshold_rtb200x_rtm300x),
+ .logic_threshold_for_pod = FALSE,
+
+ .trigger_sources = &an4_dig16_sbus_trigger_sources,
+ .num_trigger_sources = ARRAY_SIZE(an4_dig16_sbus_trigger_sources),
+
+ .trigger_slopes = &scope_trigger_slopes,
+ .num_trigger_slopes = ARRAY_SIZE(scope_trigger_slopes),
+
+ .timebases = &timebases,
+ .num_timebases = ARRAY_SIZE(timebases),
+
+ .vdivs = &vdivs,
+ .num_vdivs = ARRAY_SIZE(vdivs),
+
.num_ydivs = 8,
.scpi_dialect = &rohde_schwarz_log_not_pod_scpi_dialect,
ch->enabled = state->analog_channels[i].state;
g_snprintf(command, sizeof(command),
- (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_DIV],
+ (*config->scpi_dialect)[SCPI_CMD_GET_VERTICAL_SCALE],
i + 1);
if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
if (config->logic_threshold_for_pod)
idx = i + 1;
else
- idx = i * 8;
+ idx = i * DIGITAL_CHANNELS_PER_POD;
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_THRESHOLD],
if (digital_channel_state_get(sdi, config, state) != SR_OK)
return SR_ERR;
- if (sr_scpi_get_float(sdi->conn,
- (*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
- &tmp_float) != SR_OK)
- return SR_ERR;
-
if (sr_scpi_get_string(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_TIMEBASE],
&tmp_str) != SR_OK)
state->timebase = i;
+ /* Determine the number of horizontal (x) divisions. */
+ if (sr_scpi_get_int(sdi->conn,
+ (*config->scpi_dialect)[SCPI_CMD_GET_HORIZONTAL_DIV],
+ (int *)&config->num_xdivs) != SR_OK)
+ return SR_ERR;
+
if (sr_scpi_get_float(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_HORIZ_TRIGGERPOS],
&tmp_float) != SR_OK)
if (sr_scpi_get_string(sdi->conn,
(*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_PATTERN],
- &state->trigger_pattern) != SR_OK)
+ &tmp_str) != SR_OK)
return SR_ERR;
+ strncpy(state->trigger_pattern,
+ sr_scpi_unquote_string(tmp_str),
+ MAX_ANALOG_CHANNEL_COUNT + MAX_DIGITAL_CHANNEL_COUNT);
+ g_free(tmp_str);
if (hmo_update_sample_rate(sdi) != SR_OK)
return SR_ERR;
return SR_ERR_NA;
}
+ /* Configure the number of PODs given the number of digital channels. */
+ scope_models[model_index].digital_pods = scope_models[model_index].digital_channels / DIGITAL_CHANNELS_PER_POD;
+
devc->analog_groups = g_malloc0(sizeof(struct sr_channel_group*) *
scope_models[model_index].analog_channels);
devc->digital_groups = g_malloc0(sizeof(struct sr_channel_group*) *
ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
(*scope_models[model_index].digital_names)[i]);
- group = i / 8;
+ group = i / DIGITAL_CHANNELS_PER_POD;
devc->digital_groups[group]->channels = g_slist_append(
devc->digital_groups[group]->channels, ch);
}
packet.payload = &logic;
sr_session_send(sdi, &packet);
} else {
- group = ch->index / 8;
+ group = ch->index / DIGITAL_CHANNELS_PER_POD;
hmo_queue_logic_data(devc, group, data);
}
projects / libsigrok.git / blobdiff