X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=51ad9c48c6e900c86c3a673e36004be8310d9be6;hb=4c0e310ca305ba776aa70d8062f467ac246c910b;hp=e419b34d75f504bce0c4a181fae03b19f8bd79c1;hpb=40830061eb3a1327c1a8c76758e84b252e1950a8;p=libsigrok.git diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h index e419b34d..51ad9c48 100644 --- a/hardware/serial-dmm/protocol.h +++ b/hardware/serial-dmm/protocol.h @@ -42,10 +42,12 @@ enum { PCE_PCE_DM32, RADIOSHACK_22_168, RADIOSHACK_22_812, - VOLTCRAFT_VC820, + VOLTCRAFT_VC820_SER, + VOLTCRAFT_VC840_SER, + UNI_T_UT61E_SER, }; -#define DMM_COUNT 12 +#define DMM_COUNT 14 struct dmm_info { char *vendor; @@ -71,12 +73,17 @@ struct dev_context { /** The current sampling limit (in number of samples). */ uint64_t limit_samples; + /** The time limit (in milliseconds). */ + uint64_t limit_msec; + /** Opaque pointer passed in by the frontend. */ void *cb_data; /** The current number of already received samples. */ uint64_t num_samples; + int64_t starttime; + struct sr_serial_dev_inst *serial; uint8_t buf[DMM_BUFSIZE]; @@ -95,7 +102,9 @@ SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data); SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data); SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data); SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data); -SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data); SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info); SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info);