sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
}
- /* SCPI devices commonly lock the panel keys when accessed remotely. */
- scpi_cmd(sdi, SCPI_CMD_KEY_UNLOCK);
+ scpi_cmd(sdi, SCPI_CMD_LOCAL);
sr_scpi_close(scpi);
return sdi;
static int dev_open(struct sr_dev_inst *sdi)
{
+ struct dev_context *devc;
struct sr_scpi_dev_inst *scpi;
+ GVariant *beeper;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR;
sdi->status = SR_ST_ACTIVE;
+ scpi_cmd(sdi, SCPI_CMD_REMOTE);
+ devc = sdi->priv;
+ devc->beeper_was_set = FALSE;
+ if (scpi_cmd_resp(sdi, &beeper, G_VARIANT_TYPE_BOOLEAN, SCPI_CMD_BEEPER) == SR_OK) {
+ if (g_variant_get_boolean(beeper)) {
+ devc->beeper_was_set = TRUE;
+ scpi_cmd(sdi, SCPI_CMD_BEEPER_DISABLE);
+ }
+ g_variant_unref(beeper);
+ }
+
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
struct sr_scpi_dev_inst *scpi;
+ struct dev_context *devc;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
+ devc = sdi->priv;
scpi = sdi->conn;
if (scpi) {
- scpi_cmd(sdi, SCPI_CMD_KEY_UNLOCK);
+ if (devc->beeper_was_set)
+ scpi_cmd(sdi, SCPI_CMD_BEEPER_ENABLE);
+ scpi_cmd(sdi, SCPI_CMD_LOCAL);
sr_scpi_close(scpi);
sdi->status = SR_ST_INACTIVE;
}
static int cleanup(void)
{
- return SR_OK;
+ return std_dev_clear(di, NULL);
}
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
struct dev_context *devc;
- struct sr_scpi_dev_inst *scpi;
- struct sr_channel *ch;
- struct pps_channel *pch;
const GVariantType *gvtype;
unsigned int i;
int cmd, ret;
- char *s;
+ const char *s;
if (!sdi)
return SR_ERR_ARG;
devc = sdi->priv;
- scpi = sdi->conn;
if (cg) {
/*
break;
}
}
-
- ch = cg->channels->data;
- pch = ch->priv;
}
gvtype = NULL;
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
gvtype = G_VARIANT_TYPE_DOUBLE;
- cmd = SCPI_CMD_GET_VOLTAGE_MAX;
+ cmd = SCPI_CMD_GET_VOLTAGE_TARGET;
break;
case SR_CONF_OUTPUT_CURRENT:
gvtype = G_VARIANT_TYPE_DOUBLE;
cmd = SCPI_CMD_GET_MEAS_CURRENT;
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
gvtype = G_VARIANT_TYPE_DOUBLE;
- cmd = SCPI_CMD_GET_CURRENT_MAX;
+ cmd = SCPI_CMD_GET_CURRENT_LIMIT;
break;
case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
gvtype = G_VARIANT_TYPE_BOOLEAN;
gvtype = G_VARIANT_TYPE_BOOLEAN;
cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION;
break;
+ case SR_CONF_OUTPUT_REGULATION:
+ gvtype = G_VARIANT_TYPE_STRING;
+ cmd = SCPI_CMD_GET_OUTPUT_REGULATION;
}
if (gvtype) {
if (cg)
- ret = scpi_cmd_resp(sdi, data, gvtype, cmd, pch->hwname);
- else
- ret = scpi_cmd_resp(sdi, data, gvtype, cmd);
- } else if (cg) {
- switch (key) {
- case SR_CONF_OUTPUT_REGULATION:
- ret = SR_ERR;
- if (scpi_cmd(sdi, SCPI_CMD_GET_OUTPUT_REGULATION, pch->hwname) == SR_OK) {
- if (sr_scpi_get_string(scpi, NULL, &s) == SR_OK) {
- if (strcmp(s, "CC") && strcmp(s, "CV") && strcmp(s, "UR")) {
- sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
- } else {
- *data = g_variant_new_string(s);
- g_free(s);
- ret = SR_OK;
- }
+ select_channel(sdi, cg->channels->data);
+ ret = scpi_cmd_resp(sdi, data, gvtype, cmd);
+
+ if (gvtype == G_VARIANT_TYPE_STRING && ret == SR_OK) {
+ /* Non-standard data type responses. */
+ switch (key) {
+ case SCPI_CMD_GET_OUTPUT_REGULATION:
+ /*
+ * This is specific to the Rigol DP800 series.
+ * We return the same string for now until more
+ * models with this key are supported. Do a check
+ * just for the hell of it.
+ */
+ s = g_variant_get_string(*data, NULL);
+ if (strcmp(s, "CC") && strcmp(s, "CV") && strcmp(s, "UR")) {
+ sr_dbg("Unknown response to SCPI_CMD_GET_OUTPUT_REGULATION: %s", s);
+ ret = SR_ERR_DATA;
}
+ break;
}
- break;
- default:
- ret = SR_ERR_NA;
}
} else
ret = SR_ERR_NA;
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
- struct sr_channel *ch;
- struct pps_channel *pch;
double d;
int ret;
- const char *s;
if (!sdi)
return SR_ERR_ARG;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- ret = SR_OK;
- if (!cg) {
- switch (key) {
- /* No channel group: global options. */
- case SR_CONF_OUTPUT_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, s);
- break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, d);
- break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, d);
- break;
- case SR_CONF_OVER_TEMPERATURE_PROTECTION:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION, s);
- break;
- default:
- ret = SR_ERR_NA;
- }
- } else {
+ if (cg)
/* Channel group specified. */
- ch = cg->channels->data;
- pch = ch->priv;
- switch (key) {
- case SR_CONF_OUTPUT_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLED, pch->hwname, s);
- break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_MAX, pch->hwname, d);
- break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_MAX, pch->hwname, d);
- break;
- case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED,
- pch->hwname, s);
- break;
- case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD,
- pch->hwname, d);
- break;
- case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
- s = g_variant_get_boolean(data) ? "ON" : "OFF";
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED,
- pch->hwname, s);
- break;
- case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
- d = g_variant_get_double(data);
- ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD,
- pch->hwname, d);
- break;
- default:
- ret = SR_ERR_NA;
- }
+ select_channel(sdi, cg->channels->data);
+
+ ret = SR_OK;
+ switch (key) {
+ case SR_CONF_OUTPUT_ENABLED:
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OUTPUT_DISABLE);
+ break;
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
+ d = g_variant_get_double(data);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_VOLTAGE_TARGET, d);
+ break;
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
+ d = g_variant_get_double(data);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_CURRENT_LIMIT, d);
+ break;
+ case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE);
+ break;
+ case SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD:
+ d = g_variant_get_double(data);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, d);
+ break;
+ case SR_CONF_OVER_CURRENT_PROTECTION_ENABLED:
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE);
+ break;
+ case SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD:
+ d = g_variant_get_double(data);
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, d);
+ break;
+ case SR_CONF_OVER_TEMPERATURE_PROTECTION:
+ if (g_variant_get_boolean(data))
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE);
+ else
+ ret = scpi_cmd(sdi, SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE);
+ break;
+ default:
+ ret = SR_ERR_NA;
}
return ret;
devc->device->devopts_cg, devc->device->num_devopts_cg,
sizeof(uint32_t));
break;
- case SR_CONF_OUTPUT_VOLTAGE_MAX:
+ case SR_CONF_OUTPUT_VOLTAGE_TARGET:
ch_spec = &(devc->device->channels[ch->index]);
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, write resolution. */
}
*data = g_variant_builder_end(&gvb);
break;
- case SR_CONF_OUTPUT_CURRENT_MAX:
+ case SR_CONF_OUTPUT_CURRENT_LIMIT:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
/* Min, max, step. */
for (i = 0; i < 3; i++) {
/* Prime the pipe with the first channel's fetch. */
ch = sdi->channels->data;
pch = ch->priv;
- devc->cur_channel = ch;
+ select_channel(sdi, ch);
if (pch->mq == SR_MQ_VOLTAGE)
cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
else if (pch->mq == SR_MQ_CURRENT)
static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
+ struct sr_datafeed_packet packet;
struct sr_scpi_dev_inst *scpi;
float f;
sr_scpi_get_float(scpi, NULL, &f);
sr_scpi_source_remove(sdi->session, scpi);
+ packet.type = SR_DF_END;
+ sr_session_send(sdi, &packet);
+
return SR_OK;
}