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

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 8de5b13c..925b6db8 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -17,22 +17,38 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include "protocol.h"
 
 #define CH_IDX(x) (1 << x)
 
-enum vendors {
-	RIGOL,
+const char *pps_vendors[][2] = {
+	{ "RIGOL TECHNOLOGIES", "Rigol" },
+	{ "HEWLETT-PACKARD", "HP" },
 };
 
+const char *get_vendor(const char *raw_vendor)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(pps_vendors); i++) {
+		if (!strcasecmp(raw_vendor, pps_vendors[i][0]))
+			return pps_vendors[i][1];
+	}
+
+	return raw_vendor;
+}
+
+static const uint32_t devopts_none[] = { };
+
 /* Rigol DP800 series */
-static const int32_t devopts_rigol_dp800[] = {
+static const uint32_t rigol_dp800_devopts[] = {
 	SR_CONF_POWER_SUPPLY,
 	SR_CONF_CONTINUOUS,
 	SR_CONF_OVER_TEMPERATURE_PROTECTION,
 };
 
-static const int32_t devopts_cg_rigol_dp800[] = {
+static const uint32_t rigol_dp800_devopts_cg[] = {
 	SR_CONF_OUTPUT_REGULATION,
 	SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED,
 	SR_CONF_OVER_VOLTAGE_PROTECTION_ACTIVE,
@@ -47,19 +63,25 @@ static const int32_t devopts_cg_rigol_dp800[] = {
 	SR_CONF_OUTPUT_ENABLED,
 };
 
-struct channel_spec ch_rigol_dp800[] = {
-	{ "1", { 0, 30, 0.010 }, { 0, 3, 0.010 } },
-	{ "2", { 0, 30, 0.010 }, { 0, 3, 0.010 } },
-	{ "3", { 0, 5, 0.010 }, { 0, 3, 0.010 } },
+struct channel_spec rigol_dp831_ch[] = {
+	{ "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 } },
+	{ "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 } },
+	{ "3", { 0, -30, 0.001 }, { 0, 2, 0.0001 } },
 };
 
-struct channel_group_spec cg_rigol_dp800[] = {
+struct channel_spec rigol_dp832_ch[] = {
+	{ "1", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
+	{ "2", { 0, 30, 0.001 }, { 0, 3, 0.001 } },
+	{ "3", { 0, 5, 0.001 }, { 0, 3, 0.001 } },
+};
+
+struct channel_group_spec rigol_dp800_cg[] = {
 	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
 	{ "2", CH_IDX(1), PPS_OVP | PPS_OCP },
 	{ "3", CH_IDX(2), PPS_OVP | PPS_OCP },
 };
 
-struct scpi_command cmd_rigol_dp800[] = {
+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" },
@@ -85,14 +107,61 @@ struct scpi_command cmd_rigol_dp800[] = {
 	{ SCPI_CMD_SET_OVER_CURRENT_PROTECTION_THRESHOLD, ":OUTP:OCP:VAL CH%s,%.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,
+};
+
+struct channel_spec hp_6632b_ch[] = {
+	{ "1", { 0, 20.475, 0.005 }, { 0, 5.1188, 0.00132 } },
+};
+
+struct channel_group_spec hp_6632b_cg[] = {
+	{ "1", CH_IDX(0), 0 },
+};
+
+struct scpi_command hp_6632b_cmd[] = {
+	{ SCPI_CMD_GET_OUTPUT_ENABLED, "OUTP:STAT?" },
+	{ SCPI_CMD_SET_OUTPUT_ENABLED, "OUTP:STAT %s" },
+	{ 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" },
+};
+
+
 SR_PRIV const struct scpi_pps pps_profiles[] = {
+	/* HP 6632B */
+	{ "HP", "6632B", 0,
+		ARRAY_AND_SIZE(hp_6632b_devopts),
+		ARRAY_AND_SIZE(devopts_none),
+		ARRAY_AND_SIZE(hp_6632b_ch),
+		ARRAY_AND_SIZE(hp_6632b_cg),
+		ARRAY_AND_SIZE(hp_6632b_cmd),
+	},
+
 	/* Rigol DP800 series */
-	{ RIGOL, "Rigol", "RIGOL TECHNOLOGIES", "DP832", PPS_OTP,
-		ARRAY_AND_SIZE(devopts_rigol_dp800),
-		ARRAY_AND_SIZE(devopts_cg_rigol_dp800),
-		ARRAY_AND_SIZE(ch_rigol_dp800),
-		ARRAY_AND_SIZE(cg_rigol_dp800),
-		ARRAY_AND_SIZE(cmd_rigol_dp800),
+	{ "Rigol", "^DP831A$", PPS_OTP,
+		ARRAY_AND_SIZE(rigol_dp800_devopts),
+		ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
+		ARRAY_AND_SIZE(rigol_dp831_ch),
+		ARRAY_AND_SIZE(rigol_dp800_cg),
+		ARRAY_AND_SIZE(rigol_dp800_cmd),
+	},
+	{ "Rigol", "^(DP832|DP832A)$", PPS_OTP,
+		ARRAY_AND_SIZE(rigol_dp800_devopts),
+		ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
+		ARRAY_AND_SIZE(rigol_dp832_ch),
+		ARRAY_AND_SIZE(rigol_dp800_cg),
+		ARRAY_AND_SIZE(rigol_dp800_cmd),
 	},
 };
 SR_PRIV unsigned int num_pps_profiles = ARRAY_SIZE(pps_profiles);