Newer versions of Victor DMMs (at least for 86) contain a direct

[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 5c0e63051dc6a03bfb75e9efa54dbbfe72ae84a4..bcff1913f5ee4d1e6db73e80acca88169dad6f75 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -34,8 +34,11 @@ static const uint32_t scanopts[] = {
        SR_CONF_SERIALCOMM,
 };
 
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
        SR_CONF_MULTIMETER,
+};
+
+static const uint32_t devopts[] = {
        SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
@@ -53,6 +56,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        int dropped, ret;
        size_t len;
        uint8_t buf[128];
+       size_t ch_idx;
+       char ch_name[12];
 
        dmm = (struct dmm_info *)di;
 
@@ -128,7 +133,19 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sdi->inst_type = SR_INST_SERIAL;
        sdi->conn = serial;
        sdi->priv = devc;
-       sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
+       dmm->channel_count = 1;
+       if (dmm->packet_parse == sr_metex14_4packets_parse)
+               dmm->channel_count = 4;
+       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), fmt, ch_num);
+               sr_channel_new(sdi, ch_idx, SR_CHANNEL_ANALOG, TRUE, ch_name);
+       }
        devices = g_slist_append(devices, sdi);
 
 scan_cleanup:
@@ -137,8 +154,8 @@ scan_cleanup:
        return std_scan_complete(di, devices);
 }
 
-static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_set(uint32_t key, GVariant *data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
 
@@ -149,10 +166,10 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
-static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
-               const struct sr_channel_group *cg)
+static int config_list(uint32_t key, GVariant **data,
+       const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, devopts);
+       return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts);
 }
 
 static int dev_acquisition_start(const struct sr_dev_inst *sdi)
@@ -165,7 +182,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi);
 
-       /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
        serial_source_add(sdi->session, serial, G_IO_IN, 50,
                      receive_data, (void *)sdi);
@@ -195,7 +211,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
                        .context = NULL, \
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \
-               REQUEST, 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,
@@ -398,6 +414,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
@@ -420,6 +442,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                NULL
        ),
        /* }}} */
+       /* ms8250d based meters {{{ */
+       DMM(
+               "mastech-ms8250d", ms8250d,
+               "MASTECH", "MS8250D", "2400/8n1/rts=0/dtr=1",
+               2400, MS8250D_PACKET_SIZE, 0, 0, NULL,
+               sr_ms8250d_packet_valid, sr_ms8250d_parse,
+               NULL
+       ),
+       /* }}} */
        /* metex14 based meters {{{ */
        DMM(
                "mastech-mas345", metex14,
@@ -435,6 +466,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
+       DMM(
+               "metex-m3860m", metex14,
+               "Metex", "M-3860M", "9600/7n2/rts=0/dtr=1", 9600,
+               4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
+               sr_metex14_4packets_valid, sr_metex14_4packets_parse,
+               NULL
+       ),
        DMM(
                "metex-m4650cr", metex14,
                "Metex", "M-4650CR", "1200/7n2/rts=0/dtr=1", 1200,
@@ -463,6 +501,13 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_metex14_packet_valid, sr_metex14_parse,
                NULL
        ),
+       DMM(
+               "peaktech-4390a", metex14,
+               "PeakTech", "4390A", "9600/7n2/rts=0/dtr=1", 9600,
+               4 * METEX14_PACKET_SIZE, 0, 0, sr_metex14_packet_request,
+               sr_metex14_4packets_valid, sr_metex14_4packets_parse,
+               NULL
+       ),
        DMM(
                "radioshack-22-168", metex14,
                "RadioShack", "22-168", "1200/7n2/rts=0/dtr=1", 1200,
@@ -591,6 +636,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers,
                sr_vc870_packet_valid, sr_vc870_parse, NULL
        ),
        /* }}} */
+       /* vc96 based meters {{{ */
+       DMM(
+               "voltcraft-vc96", vc96,
+               "Voltcraft", "VC-96", "1200/8n2", 1200,
+               VC96_PACKET_SIZE, 0, 0, NULL,
+               sr_vc96_packet_valid, sr_vc96_parse,
+               NULL
+       ),
+       /* }}} */
        /*
         * The list is sorted. Add new items in the respective chip's group.
         */