[SCPI_CMD_GET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT?",
[SCPI_CMD_SET_ANALOG_CHAN_STATE] = ":CHAN%d:STAT %d",
[SCPI_CMD_GET_PROBE_UNIT] = ":PROB%d:SET:ATT:UNIT?",
+ [SCPI_CMD_GET_BYTE_ORDER] = ":FORM:BORD?",
};
static const uint32_t hmo_devopts[] = {
NULL,
};
+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 uint64_t hmo_timebases[][2] = {
/* nanoseconds */
{ 2, 1000000000 },
.scpi_dialect = &hameg_scpi_dialect,
},
{
- /* HMO2524/3034/3044/3054 support 16 digital channels but they're not supported yet. */
- .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", "HMO2524",
- "HMO3034", "HMO3044", "HMO3054", NULL},
+ .name = {"HMO724", "HMO1024", "HMO1524", "HMO2024", NULL},
.analog_channels = 4,
.digital_channels = 8,
.digital_pods = 1,
.num_xdivs = 12,
.num_ydivs = 8,
+ .scpi_dialect = &hameg_scpi_dialect,
+ },
+ {
+ .name = {"HMO2524", "HMO3034", "HMO3044", "HMO3054", 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),
+
+ .analog_devopts = &hmo_analog_devopts,
+ .num_analog_devopts = ARRAY_SIZE(hmo_analog_devopts),
+
+ .coupling_options = &hmo_coupling_options,
+ .trigger_sources = &hmo_compact4_dig16_trigger_sources,
+ .trigger_slopes = &scope_trigger_slopes,
+
+ .timebases = &hmo_timebases,
+ .num_timebases = ARRAY_SIZE(hmo_timebases),
+
+ .vdivs = &hmo_vdivs,
+ .num_vdivs = ARRAY_SIZE(hmo_vdivs),
+
+ .num_xdivs = 12,
+ .num_ydivs = 8,
+
.scpi_dialect = &hameg_scpi_dialect,
},
};
for (i = 0; i < config->analog_channels; i++) {
tmp = sr_voltage_string((*config->vdivs)[state->analog_channels[i].vdiv][0],
(*config->vdivs)[state->analog_channels[i].vdiv][1]);
- sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)",
+ sr_info("State of analog channel %d -> %s : %s (coupling) %s (vdiv) %2.2e (offset)",
i + 1, state->analog_channels[i].state ? "On" : "Off",
(*config->coupling_options)[state->analog_channels[i].coupling],
tmp, state->analog_channels[i].vertical_offset);
g_free(tmp_str);
}
+ /*
+ * Determine the byte order which will be used for data blocks.
+ * A ":FORM:BORD?" request will yield either an "MSBF" or "LSBF"
+ * response.
+ */
+ state->byteorder = '?';
+ if (sr_scpi_get_string(scpi,
+ (*config->scpi_dialect)[SCPI_CMD_GET_BYTE_ORDER],
+ &tmp_str) != SR_OK)
+ return SR_ERR;
+ if (tmp_str[0] == 'M')
+ state->byteorder = 'b';
+ else if (tmp_str[0] == 'L')
+ state->byteorder = 'l';
+ g_free(tmp_str);
+
return SR_OK;
}
sr_err("Could not determine array index for time base.");
return SR_ERR;
}
+ g_free(tmp_str);
state->timebase = i;
{
char tmp[25];
int model_index;
- unsigned int i, j;
+ unsigned int i, j, group;
struct sr_channel *ch;
struct dev_context *devc;
devc->digital_groups[i]->name = g_strdup(tmp);
sdi->channel_groups = g_slist_append(sdi->channel_groups,
- devc->digital_groups[i < 8 ? 0 : 1]);
+ devc->digital_groups[i]);
}
/* Add digital channels. */
ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
(*scope_models[model_index].digital_names)[i]);
- devc->digital_groups[i < 8 ? 0 : 1]->channels = g_slist_append(
- devc->digital_groups[i < 8 ? 0 : 1]->channels, ch);
+ group = i / 8;
+ devc->digital_groups[group]->channels = g_slist_append(
+ devc->digital_groups[group]->channels, ch);
}
devc->model_config = &scope_models[model_index];
encoding.unitsize = sizeof(float);
encoding.is_signed = TRUE;
encoding.is_float = TRUE;
- encoding.is_bigendian = FALSE;
- encoding.digits = 0;
+ /* Assume LE format when unknown for backwards compat. */
+ encoding.is_bigendian = (state->byteorder == 'b') ? TRUE : FALSE;
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ encoding.digits = 2;
encoding.is_digits_decimal = FALSE;
encoding.scale.p = 1;
encoding.scale.q = 1;
}
meaning.mqflags = 0;
meaning.channels = g_slist_append(NULL, ch);
- spec.spec_digits = 0;
+ /* TODO: Use proper 'digits' value for this device (and its modes). */
+ spec.spec_digits = 2;
packet.payload = &analog;
sr_session_send(sdi, &packet);
g_slist_free(meaning.channels);