From aa6a789afdf5339bc220e5c1427df1779e4487d9 Mon Sep 17 00:00:00 2001 From: David Kebler Date: Sun, 15 Mar 2020 16:10:23 -0700 Subject: [PATCH] 0.3.0 bump version for 3-2020 deployment of light code use this.getSocket to get attached observer name --- .travis.yml | 12 ------------ nodemon.json.sav | 4 ---- package.json | 6 +++--- src/device.js | 2 +- 4 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 .travis.yml delete mode 100644 nodemon.json.sav diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5b0b93e..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: node_js - -node_js: - - '7.10' - - 'node' - -sudo: false - -script: npm test - -after_success: - - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports" diff --git a/nodemon.json.sav b/nodemon.json.sav deleted file mode 100644 index 46168ff..0000000 --- a/nodemon.json.sav +++ /dev/null @@ -1,4 +0,0 @@ -{ - "ignoreRoot": [".git"], - "watch": ["node_modules/@uci/*/src","node_modules/@uci-utils/*/src","src","examples"] -} diff --git a/package.json b/package.json index c750a50..c8f1201 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@uci/i2c-device", - "version": "0.1.28", + "version": "0.3.0", "description": "Device Classes for I2C Interfacing", "main": "src/device", "scripts": { @@ -26,14 +26,14 @@ }, "homepage": "https://github.com/uCOMmandIt/i2c#readme", "dependencies": { - "@uci/base": "^0.1.43", + "@uci/base": "^0.5.0", "@uci-utils/logger": "^0.0.16" }, "devDependencies": { "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "esm": "^3.2.25", - "mocha": "^7.0.1", + "mocha": "^7.1.0", "nodemon": "^2.0.2" } } diff --git a/src/device.js b/src/device.js index bb3f4a4..f287fcd 100644 --- a/src/device.js +++ b/src/device.js @@ -32,7 +32,7 @@ class I2CDevice extends Base { this._s.ack = async (packet) => { return Object.assign(packet,await this.bus.ack()) } // give socket access to bus.ack this.ready.addObserver(`${opts.i2cbus.name}:process`) // will emit on received :process ready packet - let busobs = this.ready.combineObservers(`${opts.i2cbus.name}`,[`${opts.i2cbus.name}:consumer`,`${opts.i2cbus.name}:process`]) + let busobs = this.ready.combineObservers(`${opts.i2cbus.name}`,[this.getSocket(opts.i2cbus.name).obsName,`${opts.i2cbus.name}:process`]) // make device ack by extending bus observer this.ready.addObserver('i2c:device:ack',busobs .pipe(