]> sigrok.org Git - libsigrok.git/commitdiff
agilent-dmm: add support for Keysight branded meters
authorAurelien Jacobs <redacted>
Sat, 11 Jun 2016 23:48:15 +0000 (01:48 +0200)
committerAurelien Jacobs <redacted>
Sun, 26 Jun 2016 18:32:56 +0000 (20:32 +0200)
src/hardware/agilent-dmm/api.c

index 27da6b93d118267c8ed4a1aad710f7d3b0a5b4a3..27e84292b37da361b4b796e641a8ef58a99d3ed1 100644 (file)
@@ -117,14 +117,15 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                return NULL;
 
        tokens = g_strsplit(buf, ",", 4);
-       if (!strcmp("Agilent Technologies", tokens[0])
+       if ((!strcmp("Agilent Technologies", tokens[0]) ||
+            !strcmp("Keysight Technologies", tokens[0]))
                        && tokens[1] && tokens[2] && tokens[3]) {
                for (i = 0; supported_agdmm[i].model; i++) {
                        if (strcmp(supported_agdmm[i].modelname, tokens[1]))
                                continue;
                        sdi = g_malloc0(sizeof(struct sr_dev_inst));
                        sdi->status = SR_ST_INACTIVE;
-                       sdi->vendor = g_strdup("Agilent");
+                       sdi->vendor = g_strdup(tokens[0][0] == 'A' ? "Agilent" : "Keysight");
                        sdi->model = g_strdup(tokens[1]);
                        sdi->version = g_strdup(tokens[3]);
                        devc = g_malloc0(sizeof(struct dev_context));