BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scpi-pps: Publish driver options.

This commit is contained in:
Bert Vermeulen 2014-10-27 00:37:04 +01:00
parent 390795c099
commit a258204e00
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hardware/scpi-pps/api.c
View File

@ -30,6 +30,11 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM, SR_CONF_SERIALCOMM,
}; };
static const uint32_t devopts_driver[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
};
static struct pps_channel_instance pci[] = { static struct pps_channel_instance pci[] = {
{ SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" }, { SR_MQ_VOLTAGE, SCPI_CMD_GET_MEAS_VOLTAGE, "V" },
{ SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" }, { SR_MQ_CURRENT, SCPI_CMD_GET_MEAS_CURRENT, "I" },
@ -424,6 +429,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK; return SR_OK;
} else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devopts_driver, ARRAY_SIZE(devopts_driver), sizeof(uint32_t));
return SR_OK;
} }
if (!sdi) if (!sdi)

11
src/hardware/scpi-pps/profiles.c
View File

@ -44,8 +44,6 @@ static const uint32_t devopts_none[] = { };
/* Rigol DP800 series */ /* Rigol DP800 series */
static const uint32_t rigol_dp800_devopts[] = { static const uint32_t rigol_dp800_devopts[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET, SR_CONF_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
}; };
@ -119,8 +117,6 @@ struct scpi_command rigol_dp800_cmd[] = {
/* HP 663xx series */ /* HP 663xx series */
static const uint32_t hp_6632b_devopts[] = { static const uint32_t hp_6632b_devopts[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
@ -149,11 +145,6 @@ struct scpi_command hp_6632b_cmd[] = {
}; };
/* Philips/Fluke PM2800 series */ /* Philips/Fluke PM2800 series */
static const uint32_t philips_pm2800_devopts[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
};
static const uint32_t philips_pm2800_devopts_cg[] = { static const uint32_t philips_pm2800_devopts_cg[] = {
SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
@ -327,7 +318,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
/* Philips/Fluke PM2800 series */ /* Philips/Fluke PM2800 series */
{ "Philips", "^PM28[13][123]/[01234]{1,2}$", 0, { "Philips", "^PM28[13][123]/[01234]{1,2}$", 0,
ARRAY_AND_SIZE(philips_pm2800_devopts), ARRAY_AND_SIZE(devopts_none),
ARRAY_AND_SIZE(philips_pm2800_devopts_cg), ARRAY_AND_SIZE(philips_pm2800_devopts_cg),
NULL, 0, NULL, 0,
NULL, 0, NULL, 0,