static const uint32_t drvopts[] = {
SR_CONF_OSCILLOSCOPE,
+ SR_CONF_LOGIC_ANALYZER,
};
enum {
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- int cg_type, idx;
+ int cg_type, idx, i;
struct dev_context *devc;
const struct scope_config *model;
struct scope_state *state;
case SR_CONF_TRIGGER_SLOPE:
*data = g_variant_new_string((*model->trigger_slopes)[state->trigger_slope]);
break;
+ case SR_CONF_TRIGGER_PATTERN:
+ *data = g_variant_new_string(state->trigger_pattern);
+ break;
case SR_CONF_HORIZ_TRIGGERPOS:
*data = g_variant_new_double(state->horiz_triggerpos);
break;
return SR_ERR_ARG;
if ((idx = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0)
return SR_ERR_ARG;
- if (strcmp("USER2", (*model->logic_threshold)[state->digital_pods[idx].threshold]))
- return SR_ERR_NA;
+ /* Check if the oscilloscope is currently in custom threshold mode. */
+ for (i = 0; i < model->num_logic_threshold; i++) {
+ if (!strcmp("USER2", (*model->logic_threshold)[i]))
+ if (strcmp("USER2", (*model->logic_threshold)[state->digital_pods[idx].threshold]))
+ return SR_ERR_NA;
+ if (!strcmp("USER", (*model->logic_threshold)[i]))
+ if (strcmp("USER", (*model->logic_threshold)[state->digital_pods[idx].threshold]))
+ return SR_ERR_NA;
+ if (!strcmp("MAN", (*model->logic_threshold)[i]))
+ if (strcmp("MAN", (*model->logic_threshold)[state->digital_pods[idx].threshold]))
+ return SR_ERR_NA;
+ }
*data = g_variant_new_double(state->digital_pods[idx].user_threshold);
break;
default:
static int config_set(uint32_t key, GVariant *data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
- int ret, cg_type, idx, j;
- char command[MAX_COMMAND_SIZE], float_str[30];
+ int ret, cg_type, idx, i, j;
+ char command[MAX_COMMAND_SIZE], command2[MAX_COMMAND_SIZE];
+ char float_str[30], *tmp_str;
struct dev_context *devc;
const struct scope_config *model;
struct scope_state *state;
- double tmp_d;
+ double tmp_d, tmp_d2;
gboolean update_sample_rate;
if (!sdi)
case SR_CONF_TRIGGER_SOURCE:
if ((idx = std_str_idx(data, *model->trigger_sources, model->num_trigger_sources)) < 0)
return SR_ERR_ARG;
- state->trigger_source = idx;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SOURCE],
(*model->trigger_sources)[idx]);
- ret = sr_scpi_send(sdi->conn, command);
+ if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ state->trigger_source = idx;
+ ret = SR_OK;
break;
case SR_CONF_VDIV:
if (!cg)
return SR_ERR_ARG;
if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
return SR_ERR_ARG;
- state->analog_channels[j].vdiv = idx;
g_ascii_formatd(float_str, sizeof(float_str), "%E",
(float) (*model->vdivs)[idx][0] / (*model->vdivs)[idx][1]);
g_snprintf(command, sizeof(command),
- (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_DIV],
+ (*model->scpi_dialect)[SCPI_CMD_SET_VERTICAL_SCALE],
j + 1, float_str);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
+ state->analog_channels[j].vdiv = idx;
ret = SR_OK;
break;
case SR_CONF_TIMEBASE:
if ((idx = std_u64_tuple_idx(data, *model->timebases, model->num_timebases)) < 0)
return SR_ERR_ARG;
- state->timebase = idx;
g_ascii_formatd(float_str, sizeof(float_str), "%E",
(float) (*model->timebases)[idx][0] / (*model->timebases)[idx][1]);
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TIMEBASE],
float_str);
- ret = sr_scpi_send(sdi->conn, command);
+ if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ state->timebase = idx;
+ ret = SR_OK;
update_sample_rate = TRUE;
break;
case SR_CONF_HORIZ_TRIGGERPOS:
tmp_d = g_variant_get_double(data);
if (tmp_d < 0.0 || tmp_d > 1.0)
return SR_ERR;
- state->horiz_triggerpos = tmp_d;
- tmp_d = -(tmp_d - 0.5) *
+ tmp_d2 = -(tmp_d - 0.5) *
((double) (*model->timebases)[state->timebase][0] /
(*model->timebases)[state->timebase][1])
* model->num_xdivs;
- g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d);
+ g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d2);
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_HORIZ_TRIGGERPOS],
float_str);
- ret = sr_scpi_send(sdi->conn, command);
+ if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ state->horiz_triggerpos = tmp_d;
+ ret = SR_OK;
break;
case SR_CONF_TRIGGER_SLOPE:
if ((idx = std_str_idx(data, *model->trigger_slopes, model->num_trigger_slopes)) < 0)
return SR_ERR_ARG;
- state->trigger_slope = idx;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_SLOPE],
(*model->trigger_slopes)[idx]);
- ret = sr_scpi_send(sdi->conn, command);
+ if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ state->trigger_slope = idx;
+ ret = SR_OK;
+ break;
+ case SR_CONF_TRIGGER_PATTERN:
+ tmp_str = (char *)g_variant_get_string(data, 0);
+ idx = strlen(tmp_str);
+ if (idx == 0 || idx > model->analog_channels + model->digital_channels)
+ return SR_ERR_ARG;
+ g_snprintf(command, sizeof(command),
+ (*model->scpi_dialect)[SCPI_CMD_SET_TRIGGER_PATTERN],
+ tmp_str);
+ if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ sr_scpi_get_opc(sdi->conn) != SR_OK)
+ return SR_ERR;
+ strncpy(state->trigger_pattern,
+ tmp_str,
+ MAX_ANALOG_CHANNEL_COUNT + MAX_DIGITAL_CHANNEL_COUNT);
+ ret = SR_OK;
break;
case SR_CONF_COUPLING:
if (!cg)
return SR_ERR_ARG;
if ((j = std_cg_idx(cg, devc->analog_groups, model->analog_channels)) < 0)
return SR_ERR_ARG;
- state->analog_channels[j].coupling = idx;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_COUPLING],
j + 1, (*model->coupling_options)[idx]);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
+ state->analog_channels[j].coupling = idx;
ret = SR_OK;
break;
case SR_CONF_LOGIC_THRESHOLD:
return SR_ERR_ARG;
if ((j = std_cg_idx(cg, devc->digital_groups, model->digital_pods)) < 0)
return SR_ERR_ARG;
+ /* Check if the threshold command is based on the POD or digital channel index. */
+ if (model->logic_threshold_for_pod)
+ i = j + 1;
+ else
+ i = j * 8;
g_snprintf(command, sizeof(command),
(*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD],
- j + 1, (*model->logic_threshold)[idx]);
+ i, (*model->logic_threshold)[idx]);
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
if (tmp_d < -2.0 || tmp_d > 8.0)
return SR_ERR;
g_ascii_formatd(float_str, sizeof(float_str), "%E", tmp_d);
- g_snprintf(command, sizeof(command),
- (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD],
- j + 1, 2, float_str); // USER2 for custom logic_threshold setting
+ /* Check if the threshold command is based on the POD or digital channel index. */
+ if (model->logic_threshold_for_pod)
+ idx = j + 1;
+ else
+ idx = j * 8;
+ /* Try to support different dialects exhaustively. */
+ for (i = 0; i < model->num_logic_threshold; i++) {
+ if (!strcmp("USER2", (*model->logic_threshold)[i])) {
+ g_snprintf(command, sizeof(command),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD],
+ idx, 2, float_str); /* USER2 */
+ g_snprintf(command2, sizeof(command2),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD],
+ idx, "USER2");
+ break;
+ }
+ if (!strcmp("USER", (*model->logic_threshold)[i])) {
+ g_snprintf(command, sizeof(command),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD],
+ idx, float_str);
+ g_snprintf(command2, sizeof(command2),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD],
+ idx, "USER");
+ break;
+ }
+ if (!strcmp("MAN", (*model->logic_threshold)[i])) {
+ g_snprintf(command, sizeof(command),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_USER_THRESHOLD],
+ idx, float_str);
+ g_snprintf(command2, sizeof(command2),
+ (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD],
+ idx, "MAN");
+ break;
+ }
+ }
if (sr_scpi_send(sdi->conn, command) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
- g_snprintf(command, sizeof(command),
- (*model->scpi_dialect)[SCPI_CMD_SET_DIG_POD_THRESHOLD],
- j + 1, "USER2");
- if (sr_scpi_send(sdi->conn, command) != SR_OK ||
+ if (sr_scpi_send(sdi->conn, command2) != SR_OK ||
sr_scpi_get_opc(sdi->conn) != SR_OK)
return SR_ERR;
state->digital_pods[j].user_threshold = tmp_d;
break;
}
- if (ret == SR_OK)
- ret = sr_scpi_get_opc(sdi->conn);
-
if (ret == SR_OK && update_sample_rate)
ret = hmo_update_sample_rate(sdi);
projects / libsigrok.git / blobdiff