X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=22264573da0b742e1bece4658782a49d12edb6c5;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=6848143548dfb0947edc502380d79f95be107a3e;hpb=5887c9cc1af1d4798d61b338d66b573b1273f9c4;p=libsigrok.git diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h index 68481435..22264573 100644 --- a/hardware/serial-dmm/protocol.h +++ b/hardware/serial-dmm/protocol.h @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2012 Alexandru Gagniuc * @@ -20,37 +20,66 @@ #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "serial-dmm: " -#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) -#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) -#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) -#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) -#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) -#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) +#define LOG_PREFIX "serial-dmm" +/* Note: When adding entries here, don't forget to update DMM_COUNT. */ enum { + BBCGM_M2110, DIGITEK_DT4000ZC, TEKPOWER_TP4000ZC, METEX_ME31, PEAKTECH_3410, MASTECH_MAS345, + VA_VA18B, + METEX_M3640D, + METEX_M4650CR, + PEAKTECH_4370, + PCE_PCE_DM32, + RADIOSHACK_22_168, + RADIOSHACK_22_805, + RADIOSHACK_22_812, + TECPEL_DMM_8061_SER, + VOLTCRAFT_M3650D, + VOLTCRAFT_M4650CR, + VOLTCRAFT_VC820_SER, + VOLTCRAFT_VC830_SER, + VOLTCRAFT_VC840_SER, + UNI_T_UT60A_SER, + UNI_T_UT60E_SER, + UNI_T_UT61D_SER, + UNI_T_UT61E_SER, + ISO_TECH_IDM103N, }; +#define DMM_COUNT 25 + struct dmm_info { + /** Manufacturer/brand. */ char *vendor; + /** Model. */ char *device; + /** serialconn string. */ char *conn; + /** Baud rate. */ uint32_t baudrate; + /** Packet size in bytes. */ int packet_size; + /** Packet request function. */ int (*packet_request)(struct sr_serial_dev_inst *); + /** Packet validation function. */ gboolean (*packet_valid)(const uint8_t *); + /** Packet parsing function. */ int (*packet_parse)(const uint8_t *, float *, struct sr_datafeed_analog *, void *); + /** */ void (*dmm_details)(struct sr_datafeed_analog *, void *); + /** libsigrok driver info struct. */ + struct sr_dev_driver *di; + /** Data reception function. */ + int (*receive_data)(int, int, void *); }; -SR_PRIV struct dmm_info dmms[5]; +extern SR_PRIV struct dmm_info dmms[DMM_COUNT]; #define DMM_BUFSIZE 256 @@ -59,26 +88,51 @@ 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; - struct sr_serial_dev_inst *serial; + int64_t starttime; uint8_t buf[DMM_BUFSIZE]; int bufoffset; int buflen; }; -SR_PRIV int digitek_dt4000zc_receive_data(int fd, int revents, void *cb_data); -SR_PRIV int tekpower_tp4000zc_receive_data(int fd, int revents, void *cb_data); -SR_PRIV int metex_me31_receive_data(int fd, int revents, void *cb_data); -SR_PRIV int peaktech_3410_receive_data(int fd, int revents, void *cb_data); -SR_PRIV int mastech_mas345_receive_data(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_BBCGM_M2110(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_DIGITEK_DT4000ZC(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_TEKPOWER_TP4000ZC(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_METEX_ME31(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_PEAKTECH_3410(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_MASTECH_MAS345(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VA_VA18B(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_METEX_M3640D(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_METEX_M4650CR(int fd, int revents, void *cb_data); +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_805(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_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_VOLTCRAFT_M4650CR(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_VC830_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_UT60A_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_UNI_T_UT60E_SER(int fd, int revents, void *cb_data); +SR_PRIV int receive_data_UNI_T_UT61D_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 int receive_data_ISO_TECH_IDM103N(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); +SR_PRIV void dmm_details_va18b(struct sr_datafeed_analog *analog, void *info); +SR_PRIV void dmm_details_pce_dm32(struct sr_datafeed_analog *analog, void *info); #endif