]> sigrok.org Git - libsigrok.git/commitdiff
serial-dmm: sort the list of device drivers (part 6, fs9922)
authorGerhard Sittig <redacted>
Sat, 5 Nov 2016 15:52:27 +0000 (16:52 +0100)
committerUwe Hermann <redacted>
Sun, 6 Nov 2016 13:43:37 +0000 (14:43 +0100)
This commit puts 'fs9922' meters into one group.

src/hardware/serial-dmm/api.c

index 19bc6431454ed1713d25a42c5a4034fae6aa110a..1f19c7d09fcf35fa856a3f18b3289d185d8f7cb5 100644 (file)
@@ -381,6 +381,38 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_fs9721_00_temp_c
        ),
        /* }}} */
+       /* fs9922 based meters {{{ */
+       DMM(
+               "uni-t-ut61b-ser", fs9922,
+               "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut61c-ser", fs9922,
+               "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               "uni-t-ut61d-ser", fs9922,
+               "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
+       ),
+       DMM(
+               /*
+                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
+                * the FS9922 protocol. Instead, it only sets the user-defined
+                * bit "z1" to indicate "diode mode" and "voltage".
+                */
+               "voltcraft-vc830-ser", fs9922,
+               "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               &sr_fs9922_z1_diode
+       ),
+       /* }}} */
        /* meters based on other chips (to get sorted) */
        DMM(
                "bbcgm-2010", metex14,
@@ -480,18 +512,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
-       DMM(
-               /*
-                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
-                * the FS9922 protocol. Instead, it only sets the user-defined
-                * bit "z1" to indicate "diode mode" and "voltage".
-                */
-               "voltcraft-vc830-ser", fs9922,
-               "Voltcraft", "VC-830 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse,
-               &sr_fs9922_z1_diode
-       ),
        DMM(
                "voltcraft-vc870-ser", vc870,
                "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1",
@@ -516,24 +536,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                2400, UT71X_PACKET_SIZE, 0, 0, NULL,
                sr_ut71x_packet_valid, sr_ut71x_parse, NULL
        ),
-       DMM(
-               "uni-t-ut61b-ser", fs9922,
-               "UNI-T", "UT61B (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
-       DMM(
-               "uni-t-ut61c-ser", fs9922,
-               "UNI-T", "UT61C (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
-       DMM(
-               "uni-t-ut61d-ser", fs9922,
-               "UNI-T", "UT61D (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
-               2400, FS9922_PACKET_SIZE, 0, 0, NULL,
-               sr_fs9922_packet_valid, sr_fs9922_parse, NULL
-       ),
        DMM(
                "uni-t-ut71a-ser", ut71x,
                "UNI-T", "UT71A (UT-D02 cable)", "2400/7o1/rts=0/dtr=1",