X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fserial-dmm%2Fprotocol.h;h=20c5ae7126034416a857d96c5d72ab12d4bea6cf;hb=5d03743096a1e850c6ccbb1eb902705a62604e80;hp=7b170e66869d2ca2f121a2f79b1357287148db04;hpb=2b83d7fee11dddba7603e180c3528b14ff8aba0e;p=libsigrok.git diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h index 7b170e66..20c5ae71 100644 --- a/hardware/serial-dmm/protocol.h +++ b/hardware/serial-dmm/protocol.h @@ -38,6 +38,7 @@ enum { MASTECH_MAS345, VA_VA18B, METEX_M3640D, + METEX_M4650CR, PEAKTECH_4370, PCE_PCE_DM32, RADIOSHACK_22_168, @@ -56,20 +57,31 @@ enum { ISO_TECH_IDM103N, }; -#define DMM_COUNT 23 +#define DMM_COUNT 24 struct dmm_info { + /** Manufacturer/brand */ char *vendor; + /** Model */ char *device; + /** serialconn string */ char *conn; + /** Baud rate */ uint32_t baudrate; + /** Packet size [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 *); }; @@ -105,6 +117,7 @@ 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);