X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fapi.c;h=8047b09a3f79f3d01721a32fc4add020dbba50ec;hb=53e875ab165f420d02d7132da07dd6f4ba509e98;hp=4451b8ecb126287cf4b0842575c2909ab92976ff;hpb=b35d0023a88b4871be3d4de542b8b170f122ed9e;p=libsigrok.git diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 4451b8ec..8047b09a 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -506,7 +506,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, NULL ), /* }}} */ - /* meters based on other chips (to get sorted) */ + /* rs9lcd based meters {{{ */ DMM( "radioshack-22-812", rs9lcd, "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, @@ -514,27 +514,23 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_rs9lcd_packet_valid, sr_rs9lcd_parse, NULL ), + /* }}} */ + /* ut71x 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 - ), - 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 ), @@ -569,21 +565,29 @@ 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) */ + 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 + ), );