X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=8bb0ac0ce4450bc70ab45a84f74d064674cfee83;hb=bf48ccebeed885652312188770ec893f7425cb43;hp=9ca71d3d01872f4d5103ac512e44cc3908273511;hpb=01b0257aefc10874012e9bc066802a2c3a308801;p=libsigrok.git diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c index 9ca71d3d..8bb0ac0c 100644 --- a/src/hardware/scpi-pps/api.c +++ b/src/hardware/scpi-pps/api.c @@ -25,7 +25,7 @@ static struct sr_dev_driver *di = &scpi_pps_driver_info; extern unsigned int num_pps_profiles; extern const struct scpi_pps pps_profiles[]; -static const int32_t scanopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, SR_CONF_SERIALCOMM, }; @@ -56,7 +56,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) GMatchInfo *model_mi; GSList *l; uint64_t mask; - unsigned int ch_num, ch_idx, old_idx, i, j; + unsigned int ch_num, ch_idx, i, j; const char *vendor; char ch_name[16]; @@ -83,7 +83,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) return NULL; } - sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, vendor, hw_info->model, + sdi = sr_dev_inst_new(SR_ST_ACTIVE, vendor, hw_info->model, hw_info->firmware_version); sdi->conn = scpi; sdi->driver = di; @@ -95,7 +95,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) ch_idx = 0; for (ch_num = 0; ch_num < device->num_channels; ch_num++) { /* Create one channel per measurable output unit. */ - old_idx = ch_idx; for (i = 0; i < ARRAY_SIZE(pci); i++) { if (!scpi_cmd_get(sdi, pci[i].command)) continue; @@ -109,14 +108,6 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) ch->priv = pch; sdi->channels = g_slist_append(sdi->channels, ch); } - if (ch_idx == old_idx) { - /* - * Didn't create any channels for this hardware output. - * This can happen if the device has no measurement capability. - */ - g_free(pch); - continue; - } } for (i = 0; i < device->num_channel_groups; i++) { @@ -139,8 +130,7 @@ static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi) 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; @@ -174,6 +164,8 @@ static int dev_open(struct sr_dev_inst *sdi) sdi->status = SR_ST_ACTIVE; + scpi_cmd(sdi, SCPI_CMD_REMOTE); + return SR_OK; } @@ -186,7 +178,7 @@ static int dev_close(struct sr_dev_inst *sdi) scpi = sdi->conn; if (scpi) { - scpi_cmd(sdi, SCPI_CMD_KEY_UNLOCK); + scpi_cmd(sdi, SCPI_CMD_LOCAL); sr_scpi_close(scpi); sdi->status = SR_ST_INACTIVE; } @@ -196,26 +188,22 @@ static int dev_close(struct sr_dev_inst *sdi) static int cleanup(void) { - return SR_OK; + return std_dev_clear(di, NULL); } -static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, +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) { /* @@ -235,9 +223,6 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, break; } } - - ch = cg->channels->data; - pch = ch->priv; } gvtype = NULL; @@ -251,17 +236,17 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, 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; @@ -291,30 +276,32 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, 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; @@ -322,91 +309,72 @@ static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi, return ret; } -static int config_set(int key, GVariant *data, const struct sr_dev_inst *sdi, +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. */ - if (!sdi) - return SR_ERR_ARG; - if (g_slist_length(cg->channels) > 1) - return SR_ERR_NA; - 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; } -static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, +static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -419,8 +387,8 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, /* Always available, even without sdi. */ if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(int32_t)); + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, + scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); return SR_OK; } @@ -433,9 +401,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, /* No channel group: global options. */ switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devc->device->devopts, devc->device->num_devopts, - sizeof(int32_t)); + sizeof(uint32_t)); break; case SR_CONF_OUTPUT_CHANNEL_CONFIG: /* Not used. */ @@ -470,11 +438,11 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, devc->device->devopts_cg, devc->device->num_devopts_cg, - sizeof(int32_t)); + 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. */ @@ -484,7 +452,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, } *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++) { @@ -526,7 +494,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, /* 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) @@ -542,6 +510,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, 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; @@ -560,6 +529,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) 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; }