diff --git a/examples/17-test.mjs b/examples/17-test.js similarity index 100% rename from examples/17-test.mjs rename to examples/17-test.js diff --git a/examples/mcp-switch-relay.mjs b/examples/mcp-switch-relay.js similarity index 100% rename from examples/mcp-switch-relay.mjs rename to examples/mcp-switch-relay.js diff --git a/examples/mcp17.mjs b/examples/mcp17.js similarity index 100% rename from examples/mcp17.mjs rename to examples/mcp17.js diff --git a/package.json b/package.json index 87c4646..7e1a62d 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "@uci/mcp", "main": "src", - "version": "0.1.2", + "version": "0.1.3", "description": "Classes and Helper Functions for using the MCP chip on I2C Bus", "scripts": { - "relays": "node --require @std/esm examples/relays", - "swr": "node --require @std/esm examples/mcp-switch-relay", + "relays": "node -r esm examples/relays", + "swr": "node -r esm examples/mcp-switch-relay", "test": "./node_modules/.bin/mocha --reporter list --timeout 30000", "testw": "./node_modules/.bin/mocha --reporter list -- watch --timeout 30000", "testibc": "istanbul cover ./node_modules/.bin/_mocha test/ --report lcovonly -- -R spec --recursive && codecov || true", "sample": "node demo/sample.js", - "inter": "sudo node -r @std/esm examples/interrupt" + "inter": "sudo node -r esm examples/interrupt" }, "author": "David Kebler", "license": "MIT", @@ -28,18 +28,17 @@ }, "homepage": "https://github.com/uCOMmandIt/uci-mcp#readme", "dependencies": { - "@uci/i2c-device": "^0.1.1", - "@uci/interrupt": "^0.1.1", - "@uci/logger": "0.0.1", - "@uci/mqtt": "0.0.1", + "@uci/i2c-device": "^0.1.3", + "@uci/interrupt": "^0.1.4", + "@uci/logger": "^0.0.2", + "@uci/mqtt": "^0.0.3", "@uci/utils": "^0.1.1" }, - "@std/esm": "cjs", "devDependencies": { - "@std/esm": "^0.22.0", "chai": "^4.1.2", "codecov": "^3.0.0", "debug": "^3.1.0", + "esm": "^3.0.22", "istanbul": "^0.4.5", "mocha": "^5.0.1", "nodemon": "^1.15.1" diff --git a/src/commands.mjs b/src/commands.js similarity index 100% rename from src/commands.mjs rename to src/commands.js diff --git a/src/config.mjs b/src/config.js similarity index 100% rename from src/config.mjs rename to src/config.js diff --git a/src/index.js b/src/index.js new file mode 100644 index 0000000..6219d47 --- /dev/null +++ b/src/index.js @@ -0,0 +1,7 @@ +import MCP230XX from './mcp230xx' +import MCP230XXi from './mcp230xxi' + +export { MCP230XX as MCP230XX } +export { MCP230XXi as MCP230XXi } + +export default MCP230XX diff --git a/src/index.mjs b/src/index.mjs deleted file mode 100644 index 8fcc756..0000000 --- a/src/index.mjs +++ /dev/null @@ -1,15 +0,0 @@ -import MCP230XX from './mcp230xx' -import MCP230XXi from './mcp230xxi' -// import Relays from './relays' -// import RelayBanks from './relay-banks' -// import Switches from './switches' -// import SwitchBanks from './switch-banks' - -export { MCP230XX as MCP230XX } -export { MCP230XXi as MCP230XXi } -// export { Interrupt as Interrupt } -// export { Relays as Relays } -// export { RelayBanks as RelayBanks } -// export { Switches as Switches } -// export { SwitchBanks as SwitchBanks } -export default MCP230XX diff --git a/src/mcp230xx.mjs b/src/mcp230xx.js similarity index 65% rename from src/mcp230xx.mjs rename to src/mcp230xx.js index 29b69e1..c3641e2 100644 --- a/src/mcp230xx.mjs +++ b/src/mcp230xx.js @@ -2,23 +2,13 @@ import Device from '@uci/i2c-device' // import Device from '../../uci-i2c-device/src/device-packet' import { pin, chip } from './commands' -// import logger from '../../uci-logger/src/logger' import logger from '@uci/logger' let log = {} -const LOG_OPTS = (id) => { - return { - repo:'uci-mcp', - npm:'@uci/mcp', - file:'src/mcp230xx.mjs', - class:'MCP230XX', - id:id, - instance_created:new Date().getTime() - }} export default class MCP230XX extends Device { constructor(opts) { super(opts) - log = logger.child(LOG_OPTS(this.id)) + log = logger({file:'src/mcp230xx.js',class:'MCP230XX',name:'mcp',id:this.id}) this.chip17 = opts.chip17 this.pin = this.bindFuncs(pin) this.chip = this.bindFuncs(chip) @@ -26,9 +16,7 @@ export default class MCP230XX extends Device { async init(){ await super.init() - // console.log(this.address, this.chip17) let res = await this.chip.cfg({}) - // console.log(res) let cfg = this.chip17 ?'10100010':'00100010' if (res.response !==cfg ) throw `could not configure mcp chip at ${this.address}=0x${this.address.toString(16)}` } diff --git a/src/mcp230xxi.mjs b/src/mcp230xxi.js similarity index 92% rename from src/mcp230xxi.mjs rename to src/mcp230xxi.js index 312528a..3d86c71 100644 --- a/src/mcp230xxi.mjs +++ b/src/mcp230xxi.js @@ -1,17 +1,8 @@ import MCP230XX from './mcp230xx' -import logger from '@uci/logger' import { byteFormat } from '@uci/utils/src/byte' +import logger from '@uci/logger' let log = {} -const LOG_OPTS = (id) => { - return { - repo:'uci-mcp', - npm:'@uci/mcp', - file:'src/mcp230xxi.mjs', - class:'MCP230XXi', - id:id, - instance_created:new Date().getTime() - }} // sockets:'inter#s>t', inter:{port:INTERRUPT_PORT} @@ -49,8 +40,8 @@ export default class MCP230XXi extends MCP230XX { this[pin] = opts[pin] || {} }) this.pins = pins - log = logger.child(LOG_OPTS(this.id)) - Object.assign(this.pin, this.bindFuncs(pin)) + log = logger({file:'src/mcp230xxi.js',class:'MCP230XXi',name:'mcp',id:this.id}) + Object.assign(this.pin, this.bindFuncs(pin)) // add interrupt pin commands to base set in "command.js" this._interruptProcess = null }