From 6011e3e37a2a19434247f59f8369df366c2bc689 Mon Sep 17 00:00:00 2001
From: David Kebler <d@kebler.net>
Date: Mon, 4 Nov 2019 10:42:13 -0800
Subject: [PATCH] 0.1.21 allow path and port to come via ndevice and tdevice
 option props

---
 package.json  | 6 +++---
 src/device.js | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 1048918..e0eb1dd 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@uci/i2c-device",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "Device Classes for I2C Interfacing",
   "main": "src/device",
   "scripts": {
     "example": "node -r esm examples/example --preserve-symlinks || true",
-    "example:dev": "UCI_ENV=dev ./node_modules/.bin/nodemon  -r esm examples/example --preserve-symlinks || true" ,
+    "example:dev": "UCI_ENV=dev ./node_modules/.bin/nodemon  -r esm examples/example --preserve-symlinks || true",
     "testw": "./node_modules/.bin/mocha  --reporter list --recursive --watch",
     "test": "istanbul cover ./node_modules/.bin/_mocha test/ --report lcovonly -- -R spec --recursive && codecov || true"
   },
@@ -27,7 +27,7 @@
   "homepage": "https://github.com/uCOMmandIt/i2c#readme",
   "dependencies": {
     "@uci/base": "^0.1.30",
-    "@uci-utils/logger": "0.0.15"
+    "@uci-utils/logger": "^0.0.15"
   },
   "devDependencies": {
     "chai": "^4.2.0",
diff --git a/src/device.js b/src/device.js
index ea47a1f..587d073 100644
--- a/src/device.js
+++ b/src/device.js
@@ -7,15 +7,15 @@ class I2CDevice extends Base {
   constructor(opts) {
     opts.ndevice = opts.ndevice || {}
     opts.tdevice = opts.tdevice || {}
-    opts.ndevice.path = opts.path || 'i2c-device'
-    opts.tdevice.port = opts.port || 1777
+    opts.ndevice.path = opts.ndevice.path || opts.path || 'i2c-device'
+    opts.tdevice.port = opts.tdevice.port || opts.port || 1777
     opts.bus = opts.bus || {}
     if (opts.bus.host) opts.bus.port = opts.bus.port || 1776
     else opts.bus.path = opts.bus.path || 'i2c-bus'
     super(opts)
     this.addSocket('bus','c',opts.bus.host ? 't':'n',opts.bus)
-    this.addSocket('device:tcp','s','t',opts.tdevice)
-    this.addSocket('device:np','s','n',opts.ndevice)
+    this.addSocket(opts.tdevice.name ||'device:tcp','s','t',opts.tdevice)
+    this.addSocket(opts.ndevice.name ||'device:np','s','n',opts.ndevice)
 
     log = logger({
       file: 'src/device-packet.js',