X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=bd23cb94b66cabbf685caf10941f39d7b0d947b6;hp=5be14127b9020e62ffeaace7b96b9e4e6435045f;hb=a258204e00715c44b0d013ee3141ce890c8ea71c;hpb=390795c0999ae3a41b97f9a8e2c154c81e6d064e diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c index 5be14127..bd23cb94 100644 --- a/src/hardware/scpi-pps/profiles.c +++ b/src/hardware/scpi-pps/profiles.c @@ -44,8 +44,6 @@ static const uint32_t devopts_none[] = { }; /* Rigol DP800 series */ 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, }; @@ -119,8 +117,6 @@ struct scpi_command rigol_dp800_cmd[] = { /* HP 663xx series */ 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_VOLTAGE | SR_CONF_GET, SR_CONF_OUTPUT_CURRENT | SR_CONF_GET, @@ -149,11 +145,6 @@ struct scpi_command hp_6632b_cmd[] = { }; /* 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[] = { SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET, SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET, @@ -327,7 +318,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = { /* Philips/Fluke PM2800 series */ { "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), NULL, 0, NULL, 0,