BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial-dmm: Use a custom dummy struct for m2110. 

This DMM/parser is not related to metex14, don't use that struct.
This commit is contained in:
Uwe Hermann 2017-05-24 19:04:17 +02:00
parent decc199654
commit 9d12555fba
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hardware/serial-dmm/api.c
View File

@ -426,14 +426,16 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
&sr_fs9922_z1_diode &sr_fs9922_z1_diode
), ),
/* }}} */ /* }}} */
/* metex14 based meters {{{ */ /* m2110 based meters {{{ */
DMM( DMM(
"bbcgm-2010", metex14, "bbcgm-2010", m2110,
"BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
BBCGM_M2110_PACKET_SIZE, 0, 0, NULL, BBCGM_M2110_PACKET_SIZE, 0, 0, NULL,
sr_m2110_packet_valid, sr_m2110_parse, sr_m2110_packet_valid, sr_m2110_parse,
NULL NULL
), ),
/* }}} */
/* metex14 based meters {{{ */
DMM( DMM(
"mastech-mas345", metex14, "mastech-mas345", metex14,
"MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,

3
src/libsigrok-internal.h
View File

@ -1210,6 +1210,9 @@ SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval,
#define BBCGM_M2110_PACKET_SIZE 9 #define BBCGM_M2110_PACKET_SIZE 9
/* Dummy info struct. The parser does not use it. */
struct m2110_info { int dummy; };
SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf); SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf);
SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval, SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval,
struct sr_datafeed_analog *analog, void *info); struct sr_datafeed_analog *analog, void *info);