X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=634c2727110b88334dbabdc34074a8d7565f733a;hb=2622b4297fd4cc4bed5c06bb6ae0aaa8b40e0ece;hp=bd79d7840d190382506c0897c01cea3d30c16010;hpb=a9f3fa0548a58686bd4b21dca2bac5a594de8878;p=libsigrok.git

diff --git a/src/scpi.h b/src/scpi.h
index bd79d784..634c2727 100644
--- a/src/scpi.h
+++ b/src/scpi.h
@@ -17,10 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file
-  * @internal
-  */
-
 #ifndef LIBSIGROK_SCPI_H
 #define LIBSIGROK_SCPI_H
 
@@ -35,12 +31,19 @@
 enum {
 	SCPI_CMD_GET_TIMEBASE = 1,
 	SCPI_CMD_SET_TIMEBASE,
-	SCPI_CMD_GET_VERTICAL_DIV,
-	SCPI_CMD_SET_VERTICAL_DIV,
-	SCPI_CMD_GET_TRIGGER_SLOPE,
-	SCPI_CMD_SET_TRIGGER_SLOPE,
+	SCPI_CMD_GET_HORIZONTAL_DIV,
+	SCPI_CMD_GET_VERTICAL_SCALE,
+	SCPI_CMD_SET_VERTICAL_SCALE,
 	SCPI_CMD_GET_TRIGGER_SOURCE,
 	SCPI_CMD_SET_TRIGGER_SOURCE,
+	SCPI_CMD_GET_TRIGGER_SLOPE,
+	SCPI_CMD_SET_TRIGGER_SLOPE,
+	SCPI_CMD_GET_TRIGGER_PATTERN,
+	SCPI_CMD_SET_TRIGGER_PATTERN,
+	SCPI_CMD_GET_HIGH_RESOLUTION,
+	SCPI_CMD_SET_HIGH_RESOLUTION,
+	SCPI_CMD_GET_PEAK_DETECTION,
+	SCPI_CMD_SET_PEAK_DETECTION,
 	SCPI_CMD_GET_COUPLING,
 	SCPI_CMD_SET_COUPLING,
 	SCPI_CMD_GET_HORIZ_TRIGGERPOS,
@@ -55,7 +58,6 @@ enum {
 	SCPI_CMD_GET_ANALOG_DATA,
 	SCPI_CMD_GET_DIG_DATA,
 	SCPI_CMD_GET_SAMPLE_RATE,
-	SCPI_CMD_GET_SAMPLE_RATE_LIVE,
 	SCPI_CMD_GET_PROBE_UNIT,
 	SCPI_CMD_GET_DIG_POD_THRESHOLD,
 	SCPI_CMD_SET_DIG_POD_THRESHOLD,
@@ -111,6 +113,7 @@ struct sr_scpi_dev_inst {
 	uint64_t firmware_version;
 	GMutex scpi_mutex;
 	char *actual_channel_name;
+	gboolean no_opc_command;
 };
 
 SR_PRIV GSList *sr_scpi_scan(struct drv_context *drvc, GSList *options,