scpi-pps: Seperate existing HP 66xxA and 66xxB profiles.

[libsigrok.git] / src / hardware / serial-dmm / api.c

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 88e3b88aef6b8974208a473313b558d8cc5b53e5..3c501ade1e2654945227f42a3c3736534266a045 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -136,10 +136,18 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        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;
+       }
        for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
                size_t ch_num;
+               const char *fmt;
+               fmt = "P%zu";
+               if (dmm->channel_formats && dmm->channel_formats[ch_idx])
+                       fmt = dmm->channel_formats[ch_idx];
                ch_num = ch_idx + 1;
-               snprintf(ch_name, sizeof(ch_name), "P%zu", ch_num);
+               snprintf(ch_name, sizeof(ch_name), fmt, ch_num);
                sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name);
        }
        devices = g_slist_append(devices, sdi);
@@ -207,7 +215,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                        .context = NULL, \
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
-               REQUEST, 1, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
+               REQUEST, 1, NULL, VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
        }).di
 
 SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
@@ -253,6 +261,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_dtm0660_packet_valid, sr_dtm0660_parse, NULL
        ),
        /* }}} */
+       /* eev121gw based meters {{{ */
+       DMM(
+               "eevblog-121gw", eev121gw, "EEVblog", "121GW",
+               "115200/8n1", 115200, EEV121GW_PACKET_SIZE, 0, 0, NULL,
+               sr_eev121gw_packet_valid, sr_eev121gw_3displays_parse, NULL
+       ),
+       /* }}} */
        /* es519xx based meters {{{ */
        DMM(
                "iso-tech-idm103n", es519xx,
@@ -410,6 +425,12 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                2400, FS9922_PACKET_SIZE, 0, 0, NULL,
                sr_fs9922_packet_valid, sr_fs9922_parse, NULL
        ),
+       DMM(
+               "victor-dmm-ser", fs9922,
+               "Victor", "Victor DMMs (Mini-USB cable)", "2400/8n1",
+               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