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

serial-dmm: sort the list of device drivers (part 4, group fs9721) 

This commit puts 'fs9721' meters into one group. Item order is kept to
reduce the diff size and simplify verification.
This commit is contained in:
Gerhard Sittig 2016-11-05 17:12:43 +01:00 committed by Uwe Hermann
parent 7532f61d1b
commit 289e1f4e7b
1 changed files with 87 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,14 +288,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
NULL NULL
), ),
/* }}} */ /* }}} */
/* meters based on other chips (to get sorted) */ /* fs9721 based meters {{{ */
DMM(
"bbcgm-2010", metex14,
"BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
BBCGM_M2110_PACKET_SIZE, 0, 0, NULL,
sr_m2110_packet_valid, sr_m2110_parse,
NULL
),
DMM( DMM(
"digitek-dt4000zc", fs9721, "digitek-dt4000zc", fs9721,
"Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400, "Digitek", "DT4000ZC", "2400/8n1/dtr=1", 2400,
@ -310,27 +303,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_10_temp_c sr_fs9721_10_temp_c
), ),
DMM(
"metex-me31", metex14,
"Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
DMM(
"peaktech-3410", metex14,
"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
),
DMM(
"mastech-mas345", metex14,
"MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
DMM( DMM(
"mastech-ms8250b", fs9721, "mastech-ms8250b", fs9721,
"MASTECH", "MS8250B", "2400/8n1/rts=0/dtr=1", "MASTECH", "MS8250B", "2400/8n1/rts=0/dtr=1",
@ -352,6 +324,92 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_fs9721_packet_valid, sr_fs9721_parse, sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_max_c_min sr_fs9721_max_c_min
), ),
DMM(
"pce-pce-dm32", fs9721,
"PCE", "PCE-DM32", "2400/8n1", 2400,
FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_01_10_temp_f_c
),
DMM(
"tecpel-dmm-8061-ser", fs9721,
"Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM(
"voltcraft-vc820-ser", fs9721,
"Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL
),
DMM(
"voltcraft-vc840-ser", fs9721,
"Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM(
"uni-t-ut60a-ser", fs9721,
"UNI-T", "UT60A (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL
),
DMM(
"uni-t-ut60e-ser", fs9721,
"UNI-T", "UT60E (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM(
"tenma-72-7745-ser", fs9721,
"Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM(
"peaktech-3330", fs9721,
"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
),
/* }}} */
/* meters based on other chips (to get sorted) */
DMM(
"bbcgm-2010", metex14,
"BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200,
BBCGM_M2110_PACKET_SIZE, 0, 0, NULL,
sr_m2110_packet_valid, sr_m2110_parse,
NULL
),
DMM(
"metex-me31", metex14,
"Metex", "ME-31", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
DMM(
"peaktech-3410", metex14,
"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
),
DMM(
"mastech-mas345", metex14,
"MASTECH", "MAS345", "600/7n2/rts=0/dtr=1", 600,
METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
sr_metex14_packet_valid, sr_metex14_parse,
NULL
),
DMM( DMM(
"metex-m3640d", metex14, "metex-m3640d", metex14,
"Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200, "Metex", "M-3640D", "1200/7n2/rts=0/dtr=1", 1200,
@ -373,13 +431,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_metex14_packet_valid, sr_metex14_parse, sr_metex14_packet_valid, sr_metex14_parse,
NULL NULL
), ),
DMM(
"pce-pce-dm32", fs9721,
"PCE", "PCE-DM32", "2400/8n1", 2400,
FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_01_10_temp_f_c
),
DMM( DMM(
"radioshack-22-168", metex14, "radioshack-22-168", metex14,
"RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200, "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,
@ -401,13 +452,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_rs9lcd_packet_valid, sr_rs9lcd_parse, sr_rs9lcd_packet_valid, sr_rs9lcd_parse,
NULL NULL
), ),
DMM(
"tecpel-dmm-8061-ser", fs9721,
"Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM( DMM(
"voltcraft-m3650cr", metex14, "voltcraft-m3650cr", metex14,
"Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200, "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200,
@ -436,13 +480,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_metex14_packet_valid, sr_metex14_parse, sr_metex14_packet_valid, sr_metex14_parse,
NULL NULL
), ),
DMM(
"voltcraft-vc820-ser", fs9721,
"Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL
),
DMM( DMM(
/* /*
* Note: The VC830 doesn't set the 'volt' and 'diode' bits of * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
@ -455,13 +492,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
sr_fs9922_packet_valid, sr_fs9922_parse, sr_fs9922_packet_valid, sr_fs9922_parse,
&sr_fs9922_z1_diode &sr_fs9922_z1_diode
), ),
DMM(
"voltcraft-vc840-ser", fs9721,
"Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM( DMM(
"voltcraft-vc870-ser", vc870, "voltcraft-vc870-ser", vc870,
"Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1", "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1",
@ -486,20 +516,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
2400, UT71X_PACKET_SIZE, 0, 0, NULL, 2400, UT71X_PACKET_SIZE, 0, 0, NULL,
sr_ut71x_packet_valid, sr_ut71x_parse, NULL sr_ut71x_packet_valid, sr_ut71x_parse, NULL
), ),
DMM(
"uni-t-ut60a-ser", fs9721,
"UNI-T", "UT60A (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL
),
DMM(
"uni-t-ut60e-ser", fs9721,
"UNI-T", "UT60E (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM( DMM(
"uni-t-ut61b-ser", fs9922, "uni-t-ut61b-ser", fs9922,
"UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1", "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
@ -566,18 +582,4 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
2400, UT71X_PACKET_SIZE, 0, 0, NULL, 2400, UT71X_PACKET_SIZE, 0, 0, NULL,
sr_ut71x_packet_valid, sr_ut71x_parse, NULL sr_ut71x_packet_valid, sr_ut71x_parse, NULL
), ),
DMM(
"tenma-72-7745-ser", fs9721,
"Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, 0, 0, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c
),
DMM(
"peaktech-3330", fs9721,
"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
),
); );