X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=a97bbbf679453de1a00df3dffaf8231c2419dcf7;hp=1b9a810b4a91378951540ec2eeb8e5168861400c;hb=3fa436bb48e96a811f0770279eb61ebabeed326c;hpb=0931639a12e388aa5206c64d4d937f070d7453b2 diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 1b9a810b..a97bbbf6 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -127,7 +127,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) * happen to provide them. (This is a compromise to do it here, * and not extend the DMM_CONN() et al set of macros.) */ - if (dmm->packet_parse == sr_brymen_bm52x_parse) { + if (strcmp(dmm->di.name, "brymen-bm52x") == 0) { + /* Applicable to BM520s but not to BM820s. */ dmm->dmm_state_init = brymen_bm52x_state_init; dmm->dmm_state_free = brymen_bm52x_state_free; dmm->config_get = brymen_bm52x_config_get; @@ -379,6 +380,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_brymen_bm52x_packet_valid, sr_brymen_bm52x_parse, NULL ), + DMM_CONN( + "brymen-bm82x", brymen_bm52x, "Brymen", "BM82x", + "hid/bu86x", NULL, BRYMEN_BM52X_PACKET_SIZE, 4000, 500, + sr_brymen_bm82x_packet_request, + sr_brymen_bm82x_packet_valid, sr_brymen_bm52x_parse, + NULL + ), /* }}} */ /* bm85x based meters {{{ */ DMM_LEN( @@ -611,24 +619,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, NULL ), /* }}} */ - /* ms2115b based meters {{{ */ - DMM( - "mastech-ms2115b", ms2115b, - "MASTECH", "MS2115B", "1200/8n1", - MS2115B_PACKET_SIZE, 0, 0, NULL, - sr_ms2115b_packet_valid, sr_ms2115b_parse, - NULL - ), - /* }}} */ - /* ms8250d based meters {{{ */ - DMM( - "mastech-ms8250d", ms8250d, - "MASTECH", "MS8250D", "2400/8n1/rts=0/dtr=1", - MS8250D_PACKET_SIZE, 0, 0, NULL, - sr_ms8250d_packet_valid, sr_ms8250d_parse, - NULL - ), - /* }}} */ /* metex14 based meters {{{ */ DMM( "mastech-mas345", metex14, @@ -736,6 +726,24 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, NULL ), /* }}} */ + /* ms2115b based meters {{{ */ + DMM( + "mastech-ms2115b", ms2115b, + "MASTECH", "MS2115B", "1200/8n1", + MS2115B_PACKET_SIZE, 0, 0, NULL, + sr_ms2115b_packet_valid, sr_ms2115b_parse, + NULL + ), + /* }}} */ + /* ms8250d based meters {{{ */ + DMM( + "mastech-ms8250d", ms8250d, + "MASTECH", "MS8250D", "2400/8n1/rts=0/dtr=1", + MS8250D_PACKET_SIZE, 0, 0, NULL, + sr_ms8250d_packet_valid, sr_ms8250d_parse, + NULL + ), + /* }}} */ /* rs9lcd based meters {{{ */ DMM( "radioshack-22-812", rs9lcd,