X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=efd871931b1682ffa88e4a2277de27f168af9131;hb=5305266a28c1af09267f43f8941b6012be3d954f;hp=b05602a4f60b3718edf6130c7dc602b01d21cbe0;hpb=bc4a2a46edf4149df702ef7111e08b50d53ad12c;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index b05602a4..efd87193 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -39,26 +39,28 @@ const char *get_vendor(const char *raw_vendor)
 	return raw_vendor;
 }
 
+static const uint32_t devopts_none[] = { };
+
 /* Rigol DP800 series */
-static const int32_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_OVER_TEMPERATURE_PROTECTION | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const int32_t rigol_dp800_devopts_cg[] = {
-	SR_CONF_OUTPUT_REGULATION,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD,
-	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
-	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
-	SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD,
-	SR_CONF_OUTPUT_VOLTAGE,
-	SR_CONF_OUTPUT_VOLTAGE_MAX,
-	SR_CONF_OUTPUT_CURRENT,
-	SR_CONF_OUTPUT_CURRENT_MAX,
-	SR_CONF_OUTPUT_ENABLED,
+static const uint32_t rigol_dp800_devopts_cg[] = {
+	SR_CONF_OUTPUT_REGULATION | SR_CONF_GET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE | SR_CONF_GET,
+	SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+	SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+	SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 struct channel_spec rigol_dp831_ch[] = {
@@ -105,28 +107,15 @@ struct scpi_command rigol_dp800_cmd[] = {
 	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL CH%s,%.6f" },
 };
 
-/* HP 663x series */
-static const int32_t hp_6632b_devopts[] = {
+/* HP 663xx series */
+static const uint32_t hp_6632b_devopts[] = {
 	SR_CONF_POWER_SUPPLY,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_OUTPUT_ENABLED,
-	SR_CONF_OUTPUT_VOLTAGE,
-	SR_CONF_OUTPUT_CURRENT,
-	SR_CONF_OUTPUT_VOLTAGE_MAX,
-	SR_CONF_OUTPUT_CURRENT_MAX,
-//	SR_CONF_OVER_TEMPERATURE_PROTECTION,
-};
-
-static const int32_t hp_6632b_devopts_cg[] = {
-/*
-	SR_CONF_OVER_CURRENT_PROTECTION_ENABLED,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_THRESHOLD,
-	SR_CONF_OUTPUT_REGULATION,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
-	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
-	SR_CONF_OVER_CURRENT_PROTECTION_ACTIVE,
-	SR_CONF_OVER_CURRENT_PROTECTION_THRESHOLD,
-*/
+	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_OUTPUT_VOLTAGE | SR_CONF_GET,
+	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+	SR_CONF_OUTPUT_VOLTAGE_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT_MAX | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 struct channel_spec hp_6632b_ch[] = {
@@ -153,7 +142,7 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 	/* HP 6632B */
 	{ "HP", "6632B", 0,
 		ARRAY_AND_SIZE(hp_6632b_devopts),
-		ARRAY_AND_SIZE(hp_6632b_devopts_cg),
+		ARRAY_AND_SIZE(devopts_none),
 		ARRAY_AND_SIZE(hp_6632b_ch),
 		ARRAY_AND_SIZE(hp_6632b_cg),
 		ARRAY_AND_SIZE(hp_6632b_cmd),