From a087e260b1b5a88e537adfa24c96641ce363b28a Mon Sep 17 00:00:00 2001
From: Brooks Campbell <brooksrcampbell@gmail.com>
Date: Fri, 29 Jul 2016 12:26:40 -0700
Subject: [PATCH 1/3] Fix gpib addressing to remove redundent ::INSTR.

---
 gpib_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gpib_server.py b/gpib_server.py
index 23fbe377..a40c097a 100644
--- a/gpib_server.py
+++ b/gpib_server.py
@@ -112,7 +112,7 @@ def refreshDevices(self):
                     elif addr.startswith('TCPIP'):
                         instName = addr
                     elif addr.startswith('USB'):
-                        instName = addr + '::INSTR'
+                        instName = addr
                     else:
                         continue
                     instr = rm.get_instrument(instName)

From 3f44493580f02cf8b7f13a23dc6ebfc87dbe9c98 Mon Sep 17 00:00:00 2001
From: Brooks Campbell <brooksrcampbell@gmail.com>
Date: Fri, 29 Jul 2016 13:58:15 -0700
Subject: [PATCH 2/3] Collapse logic in selecting device addresses.

---
 gpib_server.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/gpib_server.py b/gpib_server.py
index a40c097a..c89ec866 100644
--- a/gpib_server.py
+++ b/gpib_server.py
@@ -62,6 +62,7 @@
 ### END NODE INFO
 """
 
+KNOWN_DEVICE_TYPES = ('GPIB', 'TCPIP', 'USB')
 
 class GPIBBusServer(LabradServer):
     """Provides direct access to GPIB-enabled devices."""
@@ -107,15 +108,9 @@ def refreshDevices(self):
             deletions = set(self.devices.keys()) - set(addresses)
             for addr in additions:
                 try:
-                    if addr.startswith('GPIB'):
-                        instName = addr
-                    elif addr.startswith('TCPIP'):
-                        instName = addr
-                    elif addr.startswith('USB'):
-                        instName = addr
-                    else:
+                    if not addr.startswith(KNOWN_DEVICE_TYPES):
                         continue
-                    instr = rm.get_instrument(instName)
+                    instr = rm.get_instrument(addr)
                     instr.write_termination = ''
                     instr.clear()
                     if addr.endswith('SOCKET'):

From 787fd7b0d58b4ef076c2d10c02c53c5ca8038a64 Mon Sep 17 00:00:00 2001
From: Brooks Campbell <brooksrcampbell@gmail.com>
Date: Fri, 29 Jul 2016 14:13:32 -0700
Subject: [PATCH 3/3] Fix whitespace (2 lines around top lvl defs).

---
 gpib_server.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gpib_server.py b/gpib_server.py
index c89ec866..062d9290 100644
--- a/gpib_server.py
+++ b/gpib_server.py
@@ -62,8 +62,10 @@
 ### END NODE INFO
 """
 
+
 KNOWN_DEVICE_TYPES = ('GPIB', 'TCPIP', 'USB')
 
+
 class GPIBBusServer(LabradServer):
     """Provides direct access to GPIB-enabled devices."""
     name = '%LABRADNODE% GPIB Bus'