scpi-dmm: move OPC availability check to after IDN device identification

[libsigrok.git] / src / hardware / scpi-dmm / protocol.h

diff --git a/src/hardware/scpi-dmm/protocol.h b/src/hardware/scpi-dmm/protocol.h
index 0206e77edb1064537ac5df9b3745ba4bda62ae97..6af9496940aab6d62b53d33741fa2080b79b878e 100644 (file)
--- a/src/hardware/scpi-dmm/protocol.h
+++ b/src/hardware/scpi-dmm/protocol.h
@@ -40,6 +40,7 @@ enum scpi_dmm_cmdcode {
        DMM_CMD_STOP_ACQ,
        DMM_CMD_QUERY_VALUE,
        DMM_CMD_QUERY_PREC,
+       DMM_CMD_SETUP_LOCAL,
 };
 
 struct mqopt_item {
@@ -63,6 +64,8 @@ struct scpi_dmm_model {
        const uint32_t *devopts;
        size_t devopts_size;
        unsigned int read_timeout_us; /* If zero, use default from src/scpi/scpi.c. */
+       float infinity_limit; /* If zero, use default from protocol.c */
+       gboolean check_opc;
 };
 
 struct dev_context {
@@ -83,6 +86,7 @@ struct dev_context {
                struct sr_analog_meaning meaning[SCPI_DMM_MAX_CHANNELS];
                struct sr_analog_spec spec[SCPI_DMM_MAX_CHANNELS];
        } run_acq_info;
+       gchar *precision;
 };
 
 SR_PRIV void scpi_dmm_cmd_delay(struct sr_scpi_dev_inst *scpi);
@@ -96,6 +100,7 @@ SR_PRIV int scpi_dmm_get_mq(const struct sr_dev_inst *sdi,
 SR_PRIV int scpi_dmm_set_mq(const struct sr_dev_inst *sdi,
        enum sr_mq mq, enum sr_mqflag flag);
 SR_PRIV int scpi_dmm_get_meas_agilent(const struct sr_dev_inst *sdi, size_t ch);
+SR_PRIV int scpi_dmm_get_meas_gwinstek(const struct sr_dev_inst *sdi, size_t ch);
 SR_PRIV int scpi_dmm_receive_data(int fd, int revents, void *cb_data);
 
 #endif