[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_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?",
"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},
.vdivs = &vdivs,
.num_vdivs = ARRAY_SIZE(vdivs),
- .num_xdivs = 12,
.num_ydivs = 8,
.scpi_dialect = &hameg_scpi_dialect,
.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,
.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,
.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,
- .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,
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)
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);
}