X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=a9f9cff81fcac132c498d1112317c27a7e052eae;hb=d5b1b76d65c446bed0dbabdccd66e51d8cdc8298;hp=05a7d0cb395fc6e60500bc7518eaaace1358f70e;hpb=6c6e5e47f0c405e8d5a1eb3684152a99d358ff0e;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 05a7d0cb..a9f9cff8 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -263,16 +263,20 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, NULL ), + /* + * Note: ES51922 and ES51986 baudrate is actually 19230. This is + * "out" by .15%, and so is well within the typical 1% margin + * that is considered acceptable in UART communication, and thus + * should not cause an issue. + */ DMM( "tenma-72-7750-ser", es519xx, - /* Note: ES51986 baudrate is actually 19230! */ "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse, NULL ), DMM( - /* Note: ES51986 baudrate is actually 19230! */ "uni-t-ut60g-ser", es519xx, "UNI-T", "UT60G (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", 19200, ES519XX_11B_PACKET_SIZE, 0, 0, NULL, @@ -281,7 +285,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, ), DMM( "uni-t-ut61e-ser", es519xx, - /* Note: ES51922 baudrate is actually 19230! */ "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", 19200, ES519XX_14B_PACKET_SIZE, 0, 0, NULL, sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, @@ -517,20 +520,20 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, /* }}} */ /* ut71x based meters {{{ */ DMM( - "voltcraft-vc920-ser", ut71x, - "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "tenma-72-7730-ser", ut71x, + "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "voltcraft-vc940-ser", ut71x, - "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "tenma-72-7732-ser", ut71x, + "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "voltcraft-vc960-ser", ut71x, - "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "tenma-72-9380a-ser", ut71x, + "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), @@ -565,29 +568,33 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "tenma-72-7730-ser", ut71x, - "Tenma", "72-7730 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "voltcraft-vc920-ser", ut71x, + "Voltcraft", "VC-920 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "tenma-72-7732-ser", ut71x, - "Tenma", "72-7732 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "voltcraft-vc940-ser", ut71x, + "Voltcraft", "VC-940 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), DMM( - "tenma-72-9380a-ser", ut71x, - "Tenma", "72-9380A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", + "voltcraft-vc960-ser", ut71x, + "Voltcraft", "VC-960 (UT-D02 cable)", "2400/7o1/rts=0/dtr=1", 2400, UT71X_PACKET_SIZE, 0, 0, NULL, sr_ut71x_packet_valid, sr_ut71x_parse, NULL ), /* }}} */ - /* meters based on other chips (to get sorted) */ + /* vc870 based meters {{{ */ DMM( "voltcraft-vc870-ser", vc870, "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1", 9600, VC870_PACKET_SIZE, 0, 0, NULL, sr_vc870_packet_valid, sr_vc870_parse, NULL ), + /* }}} */ + /* + * The list is sorted. Add new items in the respective chip's group. + */ );