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

scpi-pps: Fix driver options.

This commit is contained in:
Bert Vermeulen 2014-11-18 16:38:37 +01:00
parent 2ff11e50a5
commit 9d9cf1c4b9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,9 +30,8 @@ static const uint32_t scanopts[] = {
SR_CONF_SERIALCOMM,
};
static const uint32_t devopts_driver[] = {
static const uint32_t drvopts[] = {
SR_CONF_POWER_SUPPLY,
SR_CONF_CONTINUOUS,
};
static struct pps_channel_instance pci[] = {
@ -434,7 +433,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
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));
drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
return SR_OK;
}

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

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