X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=e39480e95eba1420c908ac12a665618776ca0ebe;hb=ad466f86cc0497f6a5ba0e2540e399c32c0b96ba;hp=5a2f13f104d9cd69ed6d557441158bc39879eba9;hpb=82458e50b1d711fcc5b179900691cdfb77cb86e1;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 5a2f13f1..e39480e9 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -232,6 +232,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, * Fold marks {{{ }}} with matching braces were added, to further * speed up navigation in the long list. */ + /* asycii based meters {{{ */ + DMM( + "metrix-mx56c", asycii, "Metrix", "MX56C", + "2400/8n1", 2400, ASYCII_PACKET_SIZE, 0, 0, NULL, + sr_asycii_packet_valid, sr_asycii_parse, NULL + ), + /* }}} */ /* bm25x based meters {{{ */ DMM( "brymen-bm25x", bm25x, @@ -244,7 +251,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, /* dtm0660 based meters {{{ */ DMM( "peaktech-3415", dtm0660, - "Peaktech", "3415", "2400/8n1/rts=0/dtr=1", + "PeakTech", "3415", "2400/8n1/rts=0/dtr=1", 2400, DTM0660_PACKET_SIZE, 0, 0, NULL, sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL ), @@ -318,7 +325,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "peaktech-3330", fs9721, - "Peaktech", "3330", "2400/8n1/dtr=1", 2400, + "PeakTech", "3330", "2400/8n1/dtr=1", 2400, FS9721_PACKET_SIZE, 0, 0, NULL, sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_01_10_temp_f_c @@ -419,14 +426,16 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, &sr_fs9922_z1_diode ), /* }}} */ - /* metex14 based meters {{{ */ + /* m2110 based meters {{{ */ DMM( - "bbcgm-2010", metex14, + "bbcgm-2010", m2110, "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, BBCGM_M2110_PACKET_SIZE, 0, 0, NULL, sr_m2110_packet_valid, sr_m2110_parse, NULL ), + /* }}} */ + /* metex14 based meters {{{ */ DMM( "mastech-mas345", metex14, "MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600, @@ -457,7 +466,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "peaktech-3410", metex14, - "Peaktech", "3410", "600/7n2/rts=0/dtr=1", 600, + "PeakTech", "3410", "600/7n2/rts=0/dtr=1", 600, METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request, sr_metex14_packet_valid, sr_metex14_parse, NULL