X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=eea5666c555c1442693911daae6c09be3eadf9bd;hb=ee2860ee110367d137559e0aaf91b2859e045968;hp=925b6db84599666261b326f4802c9458c9826b05;hpb=584560f142e1b17b9f4ef9069bd3724f2f77e750;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 925b6db8..eea5666c 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -45,22 +45,22 @@ static const uint32_t devopts_none[] = { };
 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 uint32_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,
+	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_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
+	SR_CONF_OUTPUT_CURRENT_LIMIT | 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[] = {
@@ -82,40 +82,49 @@ struct channel_group_spec rigol_dp800_cg[] = {
 };
 
 struct scpi_command rigol_dp800_cmd[] = {
-	{ SCPI_CMD_KEY_UNLOCK, "SYST:KLOCK OFF" },
-	{ SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT? CH%s" },
-	{ SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR? CH%s" },
-	{ SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE? CH%s" },
-	{ SCPI_CMD_GET_VOLTAGE_MAX, ":SOUR%s:VOLT?" },
-	{ SCPI_CMD_SET_VOLTAGE_MAX, ":SOUR%s:VOLT %.6f" },
-	{ SCPI_CMD_GET_CURRENT_MAX, ":SOUR%s:CURR?" },
-	{ SCPI_CMD_SET_CURRENT_MAX, ":SOUR%s:CURR %.6f" },
-	{ SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP? CH%s" },
-	{ SCPI_CMD_SET_OUTPUT_ENABLED, ":OUTP CH%s,%s" },
-	{ SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE? CH%s" },
+	{ SCPI_CMD_REMOTE, "SYST:REMOTE" },
+	{ SCPI_CMD_LOCAL, "SYST:LOCAL" },
+	{ SCPI_CMD_BEEPER, "SYST:BEEP:STAT?" },
+	{ SCPI_CMD_BEEPER_ENABLE, "SYST:BEEP:STAT ON" },
+	{ SCPI_CMD_BEEPER_DISABLE, "SYST:BEEP:STAT OFF" },
+	{ SCPI_CMD_SELECT_CHANNEL, ":INST:NSEL %s" },
+	{ SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
+	{ SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
+	{ SCPI_CMD_GET_MEAS_POWER, ":MEAS:POWE?" },
+	{ SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" },
+	{ SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" },
+	{ SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" },
+	{ SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" },
+	{ SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" },
+	{ SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" },
+	{ SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" },
+	{ SCPI_CMD_GET_OUTPUT_REGULATION, ":OUTP:MODE?" },
 	{ SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION, ":SYST:OTP?" },
-	{ SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION, ":SYST:OTP %s" },
-	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP? CH%s" },
-	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP CH%s,%s" },
-	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES? CH%s" },
-	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL? CH%s" },
-	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL CH%s,%.6f" },
-	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP? CH%s" },
-	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP CH%s,%s" },
-	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES? CH%s" },
-	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL? CH%s" },
-	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL CH%s,%.6f" },
+	{ SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_ENABLE, ":SYST:OTP ON" },
+	{ SCPI_CMD_SET_OVER_TEMPERATURE_PROTECTION_DISABLE, ":SYST:OTP OFF" },
+	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED, ":OUTP:OVP?" },
+	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_ENABLE, ":OUTP:OVP ON" },
+	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_DISABLE, ":OUTP:OVP OFF" },
+	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ACTIVE, ":OUTP:OVP:QUES?" },
+	{ SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL?" },
+	{ SCPI_CMD_SET_OVER_VOLTAGE_PROTECTION_THRESHOLD, ":OUTP:OVP:VAL %.6f" },
+	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ENABLED, ":OUTP:OCP?" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_ENABLE, ":OUTP:OCP:STAT ON" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_DISABLE, ":OUTP:OCP:STAT OFF" },
+	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_ACTIVE, ":OUTP:OCP:QUES?" },
+	{ SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL?" },
+	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL %.6f" },
 };
 
 /* 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_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_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+	SR_CONF_OUTPUT_CURRENT_LIMIT | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
 struct channel_spec hp_6632b_ch[] = {
@@ -128,13 +137,14 @@ struct channel_group_spec hp_6632b_cg[] = {
 
 struct scpi_command hp_6632b_cmd[] = {
 	{ SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
-	{ SCPI_CMD_SET_OUTPUT_ENABLED, "OUTP:STAT %s" },
+	{ SCPI_CMD_SET_OUTPUT_ENABLE, "OUTP:STAT ON" },
+	{ SCPI_CMD_SET_OUTPUT_DISABLE, "OUTP:STAT OFF" },
 	{ SCPI_CMD_GET_MEAS_VOLTAGE, ":MEAS:VOLT?" },
 	{ SCPI_CMD_GET_MEAS_CURRENT, ":MEAS:CURR?" },
-	{ SCPI_CMD_GET_VOLTAGE_MAX, ":SOUR:VOLT?" },
-	{ SCPI_CMD_SET_VOLTAGE_MAX, ":SOUR:VOLT %.6f" },
-	{ SCPI_CMD_GET_CURRENT_MAX, ":SOUR:CURR?" },
-	{ SCPI_CMD_SET_CURRENT_MAX, ":SOUR:CURR %.6f" },
+	{ SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT?" },
+	{ SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT %.6f" },
+	{ SCPI_CMD_GET_CURRENT_LIMIT, ":SOUR:CURR?" },
+	{ SCPI_CMD_SET_CURRENT_LIMIT, ":SOUR:CURR %.6f" },
 };