X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi.h;h=634c2727110b88334dbabdc34074a8d7565f733a;hb=084d6b927163fb0881941ad13014e07a6a5e7a77;hp=e551ba6b5aad17e1d70dfd9ea777674533c2f120;hpb=4fa4db2c7983235fff5891127f5f4648a3762172;p=libsigrok.git diff --git a/src/scpi.h b/src/scpi.h index e551ba6b..634c2727 100644 --- a/src/scpi.h +++ b/src/scpi.h @@ -17,10 +17,6 @@ * along with this program. If not, see . */ -/** @file - * @internal - */ - #ifndef LIBSIGROK_SCPI_H #define LIBSIGROK_SCPI_H @@ -35,14 +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_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_TRIGGER_SOURCE, - SCPI_CMD_SET_TRIGGER_SOURCE, + 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, @@ -57,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, @@ -113,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,