]> sigrok.org Git - libsigrok.git/commitdiff
serial-dmm: alpha-sort check for devices with multiple displays
authorGerhard Sittig <redacted>
Sun, 9 Jun 2019 07:55:39 +0000 (09:55 +0200)
committerGerhard Sittig <redacted>
Thu, 13 Jun 2019 16:33:23 +0000 (18:33 +0200)
src/hardware/serial-dmm/api.c

index e8960dc3e104211a2d19e5aacafdac8b540bb42c..98bf7fb20526a1f5210730552ecccf5a363f694a 100644 (file)
@@ -133,12 +133,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->conn = serial;
        sdi->priv = devc;
        dmm->channel_count = 1;
-       if (dmm->packet_parse == sr_metex14_4packets_parse)
-               dmm->channel_count = 4;
        if (dmm->packet_parse == sr_eev121gw_3displays_parse) {
                dmm->channel_count = EEV121GW_DISPLAY_COUNT;
                dmm->channel_formats = eev121gw_channel_formats;
        }
+       if (dmm->packet_parse == sr_metex14_4packets_parse)
+               dmm->channel_count = 4;
        if (dmm->packet_parse == sr_ms2115b_parse) {
                dmm->channel_count = MS2115B_DISPLAY_COUNT;
                dmm->channel_formats = ms2115b_channel_formats;