From: Alexandru Gagniuc <redacted>
Date: Thu, 30 Apr 2015 00:33:03 +0000 (-0700)
Subject: spci-pps/profiles: Support frequency control in Chroma 61604
X-Git-Tag: libsigrok-0.4.0~509
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=6c0c9dd257353c5942d51024270dc82d7099a6de;p=libsigrok.git

spci-pps/profiles: Support frequency control in Chroma 61604
---

diff --git a/src/hardware/scpi-pps/profiles.c b/src/hardware/scpi-pps/profiles.c
index 7d1da16e..a532e792 100644
--- a/src/hardware/scpi-pps/profiles.c
+++ b/src/hardware/scpi-pps/profiles.c
@@ -57,12 +57,14 @@ static const uint32_t chroma_61604_devopts_cg[] = {
 	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_FREQUENCY | SR_CONF_GET,
+	SR_CONF_OUTPUT_FREQUENCY_TARGET | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_OUTPUT_CURRENT | SR_CONF_GET,
 	SR_CONF_OUTPUT_ENABLED | SR_CONF_GET | SR_CONF_SET,
 };
 
 const struct channel_spec chroma_61604_ch[] = {
-	{ "1", { 0, 300, 0.1 }, { 0, 16, 0.1 }, FREQ_DC_ONLY },
+	{ "1", { 0, 300, 0.1 }, { 0, 16, 0.1 }, { 1.0, 1000.0, 0.01 } },
 };
 
 const struct channel_group_spec chroma_61604_cg[] = {
@@ -73,10 +75,13 @@ const struct scpi_command chroma_61604_cmd[] = {
 	{ SCPI_CMD_REMOTE, "SYST:REM" },
 	{ SCPI_CMD_LOCAL, "SYST:LOC" },
 	{ SCPI_CMD_GET_MEAS_VOLTAGE, ":FETC:VOLT:ACDC?" },
+	{ SCPI_CMD_GET_MEAS_FREQUENCY, ":FETC:FREQ?" },
 	{ SCPI_CMD_GET_MEAS_CURRENT, ":FETC:CURR:AC?" },
 	{ SCPI_CMD_GET_MEAS_POWER, ":FETC:POW:AC?" },
 	{ SCPI_CMD_GET_VOLTAGE_TARGET, ":SOUR:VOLT:AC?" },
 	{ SCPI_CMD_SET_VOLTAGE_TARGET, ":SOUR:VOLT:AC %.1f" },
+	{ SCPI_CMD_GET_FREQUENCY_TARGET, ":SOUR:FREQ?" },
+	{ SCPI_CMD_SET_FREQUENCY_TARGET, ":SOUR:FREQ %.2f" },
 	{ SCPI_CMD_GET_OUTPUT_ENABLED, ":OUTP?" },
 	{ SCPI_CMD_SET_OUTPUT_ENABLE, ":OUTP ON" },
 	{ SCPI_CMD_SET_OUTPUT_DISABLE, ":OUTP OFF" },