X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprofiles.c;h=5735234e47c19b658d79408cc1c342991bbc1d8d;hb=cfcdf576775a6e53f25dec50ec710bfc89723147;hp=bd23cb94b66cabbf685caf10941f39d7b0d947b6;hpb=a258204e00715c44b0d013ee3141ce890c8ea71c;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index bd23cb94..5735234e 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -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,
 };
 
@@ -62,6 +63,11 @@ static const uint32_t rigol_dp800_devopts_cg[] = {
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
+struct channel_spec rigol_dp821a_ch[] = {
+	{ "1", { 0, 60, 0.001 }, { 0, 1, 0.0001 } },
+	{ "2", { 0, 8, 0.001 }, { 0, 10, 0.001 } },
+};
+
 struct channel_spec rigol_dp831_ch[] = {
 	{ "1", { 0, 8, 0.001 }, { 0, 5, 0.0003 } },
 	{ "2", { 0, 30, 0.001 }, { 0, 2, 0.0001 } },
@@ -74,7 +80,12 @@ struct channel_spec rigol_dp832_ch[] = {
 	{ "3", { 0, 5, 0.001 }, { 0, 3, 0.001 } },
 };
 
-struct channel_group_spec rigol_dp800_cg[] = {
+struct channel_group_spec rigol_dp820_cg[] = {
+	{ "1", CH_IDX(0), PPS_OVP | PPS_OCP },
+	{ "2", CH_IDX(1), PPS_OVP | PPS_OCP },
+};
+
+struct channel_group_spec rigol_dp830_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 },
@@ -117,6 +128,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 +157,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,
@@ -299,11 +315,19 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 	},
 
 	/* Rigol DP800 series */
+	{ "Rigol", "^DP821A$", PPS_OTP,
+		ARRAY_AND_SIZE(rigol_dp800_devopts),
+		ARRAY_AND_SIZE(rigol_dp800_devopts_cg),
+		ARRAY_AND_SIZE(rigol_dp821a_ch),
+		ARRAY_AND_SIZE(rigol_dp820_cg),
+		ARRAY_AND_SIZE(rigol_dp800_cmd),
+		.probe_channels = NULL,
+	},
 	{ "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_dp830_cg),
 		ARRAY_AND_SIZE(rigol_dp800_cmd),
 		.probe_channels = NULL,
 	},
@@ -311,14 +335,14 @@ SR_PRIV const struct scpi_pps pps_profiles[] = {
 		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_dp830_cg),
 		ARRAY_AND_SIZE(rigol_dp800_cmd),
 		.probe_channels = NULL,
 	},
 
 	/* 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,