X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-dmm%2Fprotocol.h;h=fe6138d4c1de3e3b63a023ffb86997565dc41aa4;hb=24a953382c4c07f4071a36897bf17c93db9ce1e7;hp=531ca474ad5d5354ad78ef465a42403d61d85815;hpb=08f3b427b620a7a0308b0ee2e61f443a00f3d49c;p=libsigrok.git diff --git a/src/hardware/scpi-dmm/protocol.h b/src/hardware/scpi-dmm/protocol.h index 531ca474..fe6138d4 100644 --- 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 { @@ -62,6 +63,7 @@ struct scpi_dmm_model { int (*get_measurement)(const struct sr_dev_inst *sdi, size_t ch); const uint32_t *devopts; size_t devopts_size; + unsigned int read_timeout_us; /* If zero, use default from src/scpi/scpi.c. */ }; struct dev_context { @@ -82,6 +84,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); @@ -95,6 +98,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