* This file is part of the libsigrok project.
*
* Copyright (C) 2013 poljar (Damir Jelić) <poljarinho@gmail.com>
+ * Copyright (C) 2018 Guido Trentalancia <guido@trentalancia.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
SR_PRIV void hmo_cleanup_logic_data(struct dev_context *devc);
static const char *hameg_scpi_dialect[] = {
- [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_COUPLING] = ":CHAN%d:COUP?",
- [SCPI_CMD_SET_COUPLING] = ":CHAN%d:COUP %s",
- [SCPI_CMD_GET_SAMPLE_RATE] = ":ACQ:SRAT?",
- [SCPI_CMD_GET_SAMPLE_RATE_LIVE] = ":%s:DATA:POINTS?",
- [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_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_SET_TRIGGER_SLOPE] = ":TRIG:A:EDGE:SLOP %s",
- [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?",
- [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s",
- [SCPI_CMD_GET_DIG_CHAN_STATE] = ":LOG%d:STAT?",
- [SCPI_CMD_SET_DIG_CHAN_STATE] = ":LOG%d:STAT %d",
- [SCPI_CMD_GET_VERTICAL_OFFSET] = ":CHAN%d:POS?",
- [SCPI_CMD_GET_HORIZ_TRIGGERPOS] = ":TIM:POS?",
- [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s",
- [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_DIG_DATA] = ":FORM UINT,8;:POD%d:DATA?",
+ [SCPI_CMD_GET_TIMEBASE] = ":TIM:SCAL?",
+ [SCPI_CMD_SET_TIMEBASE] = ":TIM:SCAL %s",
+ [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_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_SET_TRIGGER_SLOPE] = ":TRIG:A:TYPE EDGE;:TRIG:A:EDGE:SLOP %s",
+ [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:MODE OFF;" \
+ ":TRIG:A:PATT:SOUR \"%s\"",
+ [SCPI_CMD_GET_TRIGGER_SOURCE] = ":TRIG:A:SOUR?",
+ [SCPI_CMD_SET_TRIGGER_SOURCE] = ":TRIG:A:SOUR %s",
+ [SCPI_CMD_GET_DIG_CHAN_STATE] = ":LOG%d:STAT?",
+ [SCPI_CMD_SET_DIG_CHAN_STATE] = ":LOG%d:STAT %d",
+ [SCPI_CMD_GET_VERTICAL_OFFSET] = ":CHAN%d:POS?",
+ [SCPI_CMD_GET_HORIZ_TRIGGERPOS] = ":TIM:POS?",
+ [SCPI_CMD_SET_HORIZ_TRIGGERPOS] = ":TIM:POS %s",
+ [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_DIG_POD_THRESHOLD] = ":POD%d:THR?",
+ [SCPI_CMD_SET_DIG_POD_THRESHOLD] = ":POD%d:THR %s",
+ [SCPI_CMD_GET_DIG_POD_USER_THRESHOLD] = ":POD%d:THR:UDL%d?",
+ [SCPI_CMD_SET_DIG_POD_USER_THRESHOLD] = ":POD%d:THR:UDL%d %s",
};
static const uint32_t devopts[] = {
SR_CONF_OSCILLOSCOPE,
- SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
+ SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
+ SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
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_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
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,
+ SR_CONF_TRIGGER_PATTERN | SR_CONF_GET | SR_CONF_SET,
};
static const uint32_t devopts_cg_analog[] = {
SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
+static const uint32_t devopts_cg_digital[] = {
+ SR_CONF_LOGIC_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_LOGIC_THRESHOLD_CUSTOM | SR_CONF_GET | SR_CONF_SET,
+};
+
static const char *coupling_options[] = {
"AC", // AC with 50 Ohm termination (152x, 202x, 30xx, 1202)
"ACL", // AC with 1 MOhm termination
"EITH",
};
-/* HMO compact2 */
+/* Predefined logic thresholds. */
+static const char *logic_threshold[] = {
+ "TTL",
+ "ECL",
+ "CMOS",
+ "USER1",
+ "USER2", // overwritten by logic_threshold_custom, use USER1 for permanent setting
+};
+
+/* RTC1002, HMO Compact2 and HMO1002/HMO1202 */
static const char *an2_dig8_trigger_sources[] = {
"CH1", "CH2",
"LINE", "EXT", "PATT", "BUS1", "BUS2",
"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
-/* HMO xxx2 */
+/* HMO3xx2 */
static const char *an2_dig16_trigger_sources[] = {
"CH1", "CH2",
"LINE", "EXT", "PATT", "BUS1", "BUS2",
"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
};
-/* HMO compact4 */
+/* HMO Compact4 */
static const char *an4_dig8_trigger_sources[] = {
"CH1", "CH2", "CH3", "CH4",
"LINE", "EXT", "PATT", "BUS1", "BUS2",
"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
};
-/* HMO xxx4 */
+/* HMO3xx4 and HMO2524 */
static const char *an4_dig16_trigger_sources[] = {
"CH1", "CH2", "CH3", "CH4",
"LINE", "EXT", "PATT", "BUS1", "BUS2",
{ 2, 1 },
{ 5, 1 },
{ 10, 1 },
- { 20, 1 },
- { 50, 1 },
};
static const char *scope_analog_channel_names[] = {
static const struct scope_config scope_models[] = {
{
- /* HMO722/1002/1022/1522/2022 support only 8 digital channels. */
- .name = {"HMO722", "HMO1002", "HMO1022", "HMO1522", "HMO2022", NULL},
+ /* RTC1002 and HMO722/1002/1022/1202/1522/2022 support only 8 digital channels. */
+ .name = {"RTC1002", "HMO722", "HMO1002", "HMO1022", "HMO1202", "HMO1522", "HMO2022", NULL},
.analog_channels = 2,
.digital_channels = 8,
.digital_pods = 1,
.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),
+
.trigger_sources = &an2_dig8_trigger_sources,
.num_trigger_sources = ARRAY_SIZE(an2_dig8_trigger_sources),
.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),
+
.trigger_sources = &an2_dig16_trigger_sources,
.num_trigger_sources = ARRAY_SIZE(an2_dig16_trigger_sources),
.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),
+
.trigger_sources = &an4_dig8_trigger_sources,
.num_trigger_sources = ARRAY_SIZE(an4_dig8_trigger_sources),
.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),
+
.trigger_sources = &an4_dig16_trigger_sources,
.num_trigger_sources = ARRAY_SIZE(an4_dig16_trigger_sources),
}
for (i = 0; i < config->digital_pods; i++) {
- sr_info("State of digital POD %d -> %s", i,
- state->digital_pods[i] ? "On" : "Off");
+ if (strncmp("USER", (*config->logic_threshold)[state->digital_pods[i].threshold], 4))
+ sr_info("State of digital POD %d -> %s : %s (threshold)", i + 1,
+ state->digital_pods[i].state ? "On" : "Off",
+ (*config->logic_threshold)[state->digital_pods[i].threshold]);
+ else // user-defined or custom logic threshold
+ sr_info("State of digital POD %d -> %s : %E (threshold)", i + 1,
+ state->digital_pods[i].state ? "On" : "Off",
+ state->digital_pods[i].user_threshold);
}
tmp = sr_period_string((*config->timebases)[state->timebase][0],
sr_info("Current samplerate: %s", tmp);
g_free(tmp);
- sr_info("Current trigger: %s (source), %s (slope) %.2f (offset)",
- (*config->trigger_sources)[state->trigger_source],
- (*config->trigger_slopes)[state->trigger_slope],
- state->horiz_triggerpos);
+ if (!strcmp("PATT", (*config->trigger_sources)[state->trigger_source]))
+ sr_info("Current trigger: %s (pattern), %.2f (offset)",
+ state->trigger_pattern,
+ state->horiz_triggerpos);
+ else // Edge (slope) trigger
+ sr_info("Current trigger: %s (source), %s (slope) %.2f (offset)",
+ (*config->trigger_sources)[state->trigger_source],
+ (*config->trigger_slopes)[state->trigger_slope],
+ state->horiz_triggerpos);
}
static int scope_state_get_array_option(struct sr_scpi_dev_inst *scpi,
char *tmp;
int idx;
- if (sr_scpi_get_string(scpi, command, &tmp) != SR_OK) {
- g_free(tmp);
+ if (sr_scpi_get_string(scpi, command, &tmp) != SR_OK)
return SR_ERR;
- }
if ((idx = std_str_idx_s(tmp, *array, n)) < 0) {
g_free(tmp);
struct scope_state *state)
{
unsigned int i;
+ int result = SR_ERR;
+ static char *logic_threshold_short[] = {};
char command[MAX_COMMAND_SIZE];
struct sr_channel *ch;
struct sr_scpi_dev_inst *scpi = sdi->conn;
ch->enabled = state->digital_channels[i];
}
+ /* According to the SCPI standard, the response to the command
+ * SCPI_CMD_GET_DIG_POD_THRESHOLD might return "USER" instead of
+ * "USER1".
+ *
+ * This makes more difficult to validate the response when the logic
+ * threshold is set to "USER1" and therefore we need to prevent device
+ * opening failures in such configuration case...
+ */
+ for (i = 0; i < config->num_logic_threshold; i++) {
+ logic_threshold_short[i] = g_strdup((*config->logic_threshold)[i]);
+ if (!strcmp("USER1", (*config->logic_threshold)[i]))
+ g_strlcpy(logic_threshold_short[i],
+ (*config->logic_threshold)[i], strlen((*config->logic_threshold)[i]));
+ }
+
for (i = 0; i < config->digital_pods; i++) {
g_snprintf(command, sizeof(command),
(*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_STATE],
i + 1);
if (sr_scpi_get_bool(scpi, command,
- &state->digital_pods[i]) != SR_OK)
- return SR_ERR;
+ &state->digital_pods[i].state) != SR_OK)
+ goto exit;
+
+ g_snprintf(command, sizeof(command),
+ (*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_THRESHOLD],
+ i + 1);
+
+ /* Check for both standard and shortened responses. */
+ if (scope_state_get_array_option(scpi, command, config->logic_threshold,
+ config->num_logic_threshold,
+ &state->digital_pods[i].threshold) != SR_OK)
+ if (scope_state_get_array_option(scpi, command, (const char * (*)[]) &logic_threshold_short,
+ config->num_logic_threshold,
+ &state->digital_pods[i].threshold) != SR_OK)
+ goto exit;
+
+ if (!strcmp("USER1", (*config->logic_threshold)[state->digital_pods[i].threshold]))
+ g_snprintf(command, sizeof(command),
+ (*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_USER_THRESHOLD],
+ i + 1, 1); // USER1 logic threshold setting
+
+ if (!strcmp("USER2", (*config->logic_threshold)[state->digital_pods[i].threshold]))
+ g_snprintf(command, sizeof(command),
+ (*config->scpi_dialect)[SCPI_CMD_GET_DIG_POD_USER_THRESHOLD],
+ i + 1, 2); // USER2 for custom logic_threshold setting
+
+ if (!strcmp("USER1", (*config->logic_threshold)[state->digital_pods[i].threshold]) ||
+ !strcmp("USER2", (*config->logic_threshold)[state->digital_pods[i].threshold]))
+ if (sr_scpi_get_float(scpi, command,
+ &state->digital_pods[i].user_threshold) != SR_OK)
+ goto exit;
}
- return SR_OK;
+ result = SR_OK;
+
+exit:
+ for (i = 0; i < config->num_logic_threshold; i++)
+ g_free(logic_threshold_short[i]);
+
+ return result;
}
SR_PRIV int hmo_update_sample_rate(const struct sr_dev_inst *sdi)
struct dev_context *devc;
struct scope_state *state;
const struct scope_config *config;
- int tmp;
- unsigned int i;
float tmp_float;
- gboolean channel_found;
- char tmp_str[MAX_COMMAND_SIZE];
- char chan_name[20];
devc = sdi->priv;
config = devc->model_config;
state = devc->model_state;
- channel_found = FALSE;
- for (i = 0; i < config->analog_channels; i++) {
- if (!state->analog_channels[i].state)
- continue;
- g_snprintf(chan_name, sizeof(chan_name), "CHAN%d", i + 1);
- g_snprintf(tmp_str, sizeof(tmp_str),
- (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE_LIVE],
- chan_name);
- channel_found = TRUE;
- break;
- }
-
- if (!channel_found) {
- for (i = 0; i < config->digital_pods; i++) {
- if (!state->digital_pods[i])
- continue;
- g_snprintf(chan_name, sizeof(chan_name), "POD%d", i);
- g_snprintf(tmp_str, sizeof(tmp_str),
- (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE_LIVE],
- chan_name);
- channel_found = TRUE;
- break;
- }
- }
+ if (sr_scpi_get_float(sdi->conn,
+ (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE],
+ &tmp_float) != SR_OK)
+ return SR_ERR;
- /* No channel is active, ask the instrument for the sample rate
- * in single shot mode */
- if (!channel_found) {
- if (sr_scpi_get_float(sdi->conn,
- (*config->scpi_dialect)[SCPI_CMD_GET_SAMPLE_RATE],
- &tmp_float) != SR_OK)
- return SR_ERR;
-
- state->sample_rate = tmp_float;
- } else {
- if (sr_scpi_get_int(sdi->conn, tmp_str, &tmp) != SR_OK)
- return SR_ERR;
- state->sample_rate = tmp / (((float) (*config->timebases)[state->timebase][0] /
- (*config->timebases)[state->timebase][1]) *
- config->num_xdivs);
- }
+ state->sample_rate = tmp_float;
return SR_OK;
}
&state->trigger_slope) != SR_OK)
return SR_ERR;
+ if (sr_scpi_get_string(sdi->conn,
+ (*config->scpi_dialect)[SCPI_CMD_GET_TRIGGER_PATTERN],
+ &state->trigger_pattern) != SR_OK)
+ return SR_ERR;
+
if (hmo_update_sample_rate(sdi) != SR_OK)
return SR_ERR;
state->digital_channels = g_malloc0_n(
config->digital_channels, sizeof(gboolean));
state->digital_pods = g_malloc0_n(config->digital_pods,
- sizeof(gboolean));
+ sizeof(struct digital_pod_state));
return state;
}
}
if (model_index == -1) {
- sr_dbg("Unsupported HMO device.");
+ sr_dbg("Unsupported device.");
return SR_ERR_NA;
}
ret = SR_ERR_MALLOC;
break;
}
- devc->digital_groups[i]->name = g_strdup_printf("POD%d", i);
+ devc->digital_groups[i]->name = g_strdup_printf("POD%d", i + 1);
sdi->channel_groups = g_slist_append(sdi->channel_groups,
devc->digital_groups[i]);
}
projects / libsigrok.git / blobdiff