X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fapi.c;h=ed9fbd9db20661a0c7b472e2741c39a89f17f560;hb=5433907ed99c40e948b8350f55845dd88a5cbbe6;hp=3d02b2cb040b00f2454471e5a01729447b3741d4;hpb=b89e6db910e4a38779fa033aa04040cb020d3fd2;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 3d02b2cb..ed9fbd9d 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -333,6 +333,7 @@ static int config_get(uint32_t key, GVariant **data,
 	int cmd, ret;
 	const char *s;
 	int reg;
+	gboolean is_hmp_sqii;
 
 	if (!sdi)
 		return SR_ERR_ARG;
@@ -391,6 +392,11 @@ static int config_get(uint32_t key, GVariant **data,
 		cmd = SCPI_CMD_GET_CURRENT_LIMIT;
 		break;
 	case SR_CONF_OVER_VOLTAGE_PROTECTION_ENABLED:
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* OVP is always enabled. */
+			*data = g_variant_new_boolean(TRUE);
+			return 0;
+		}
 		gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_VOLTAGE_PROTECTION_ENABLED;
 		break;
@@ -423,12 +429,18 @@ static int config_get(uint32_t key, GVariant **data,
 		cmd = SCPI_CMD_GET_OVER_CURRENT_PROTECTION_THRESHOLD;
 		break;
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION:
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* OTP is always enabled. */
+			*data = g_variant_new_boolean(TRUE);
+			return 0;
+		}
 		gvtype = G_VARIANT_TYPE_BOOLEAN;
 		cmd = SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION;
 		break;
 	case SR_CONF_OVER_TEMPERATURE_PROTECTION_ACTIVE:
 		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
-			devc->device->dialect == SCPI_DIALECT_HP_COMP)
+			devc->device->dialect == SCPI_DIALECT_HP_COMP ||
+			devc->device->dialect == SCPI_DIALECT_HMP)
 			gvtype = G_VARIANT_TYPE_STRING;
 		else
 			gvtype = G_VARIANT_TYPE_BOOLEAN;
@@ -451,8 +463,22 @@ static int config_get(uint32_t key, GVariant **data,
 		channel_group_name = g_strdup(cg->name);
 	}
 
-	ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
-		channel_group_cmd, channel_group_name, data, gvtype, cmd);
+	is_hmp_sqii = FALSE;
+	is_hmp_sqii |= cmd == SCPI_CMD_GET_OUTPUT_REGULATION;
+	is_hmp_sqii |= cmd == SCPI_CMD_GET_OVER_TEMPERATURE_PROTECTION_ACTIVE;
+	is_hmp_sqii &= devc->device->dialect == SCPI_DIALECT_HMP;
+	if (is_hmp_sqii) {
+		if (!cg) {
+			/* STAT:QUES:INST:ISUMx query requires channel spec. */
+			sr_err("Need a channel group for regulation or OTP-active query.");
+			return SR_ERR_NA;
+		}
+		ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+			0, NULL, data, gvtype, cmd, channel_group_name);
+	} else {
+		ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
+			channel_group_cmd, channel_group_name, data, gvtype, cmd);
+	}
 	g_free(channel_group_name);
 
 	/*
@@ -504,6 +530,18 @@ static int config_get(uint32_t key, GVariant **data,
 			else
 				*data = g_variant_new_string("UR");
 		}
+		if (devc->device->dialect == SCPI_DIALECT_HMP) {
+			/* Evaluate Condition Status Register from a HMP series device. */
+			s = g_variant_get_string(*data, NULL);
+			sr_atoi(s, &reg);
+			g_variant_unref(*data);
+			if (reg & (1 << 0))
+				*data = g_variant_new_string("CC");
+			else if (reg & (1 << 1))
+				*data = g_variant_new_string("CV");
+			else
+				*data = g_variant_new_string("UR");
+		}
 
 		s = g_variant_get_string(*data, NULL);
 		if (g_strcmp0(s, "CV") && g_strcmp0(s, "CC") && g_strcmp0(s, "CC-") &&
@@ -556,7 +594,8 @@ static int config_get(uint32_t key, GVariant **data,
 			g_variant_unref(*data);
 			*data = g_variant_new_boolean(reg & (1 << 4));
 		}
-		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB) {
+		if (devc->device->dialect == SCPI_DIALECT_HP_66XXB ||
+		    devc->device->dialect == SCPI_DIALECT_HMP) {
 			/* Evaluate Questionable Status Register bit 4 from a HP 66xxB. */
 			s = g_variant_get_string(*data, NULL);
 			sr_atoi(s, &reg);
@@ -674,6 +713,7 @@ static int config_list(uint32_t key, GVariant **data,
 {
 	struct dev_context *devc;
 	struct sr_channel *ch;
+	struct pps_channel *pch;
 	const struct channel_spec *ch_spec;
 	int i;
 	const char *s[16];
@@ -721,9 +761,10 @@ static int config_list(uint32_t key, GVariant **data,
 		 * specification for use in series or parallel mode.
 		 */
 		ch = cg->channels->data;
+		pch = ch->priv;
 		if (!devc || !devc->device)
 			return SR_ERR_ARG;
-		ch_spec = &(devc->device->channels[ch->index]);
+		ch_spec = &(devc->device->channels[pch->hw_output_idx]);
 
 		switch (key) {
 		case SR_CONF_DEVICE_OPTIONS: