UCOMmandIt
/
uci-i2c-bus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactored bus packet so packet cmd: is bus function 

changed examples accordingly
master
David Kebler 2018-02-01 23:58:54 -08:00
parent a2844cc313
commit a5e52274b0
6 changed files with 112 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.esmrc.json
View File

@ -1,3 +0,0 @@
{
"@std/esm": "cjs"
}

32
examples/ipc-relay.mjs
View File

@ -12,35 +12,35 @@ const delay = time => new Promise(res=>setTimeout(()=>res(),time))
; ;
(async () => { (async () => {
let relays = new Base({sockets:'uc', path:PATH, log:true}) let relays = new Base({sockets:'uc', path:PATH})
relays.reply = function (packet) { relays.reply = function (packet) {
// console.log(packet.bus) // console.log(packet.bus)
console.log('response from relays',packet.bus.func, packet.bus.args.cmd, packet.bus.response) console.log(`response from relays for ${packet.cmd_sent}:`,packet.args, `was ${packet.response}`)
} }
await relays.init() await relays.init()
console.log('=============sending============') console.log('=============sending============')
let packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd: 0}} } let packet = {cmd:'read', args:{address:39 ,cmd: 0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 0, byte:0}} } packet = {cmd:'write', args:{address:39,cmd: 0, byte:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:0}} } packet = {cmd:'read', args:{address:39 ,cmd:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 9, byte:255}} } packet = {cmd:'write', args:{address:39,cmd: 9, byte:255} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:9}} } packet = {cmd:'read', args:{address:39 ,cmd:9} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
await delay(1000) await delay(1000)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 9, byte:0}} } packet = {cmd:'write', args:{address:39,cmd: 9, byte:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:9}} } packet = {cmd:'read', args:{address:39 ,cmd:9} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
await delay(1000) await delay(1000)

22
examples/ipc-scan.mjs
View File

@ -3,25 +3,29 @@
* *
*/ */
import Bus from '../src/bus-packet' import Base from '../../uci-base/src/base'
const PATH = '/opt/uci/uci-base/src/unix.sock'
const delay = time => new Promise(res=>setTimeout(()=>res(),time)) const delay = time => new Promise(res=>setTimeout(()=>res(),time))
; ;
(async () => { (async () => {
let i2cbus = new Bus({id:'i2c-bus', sockets:'us,uc'}) let scanner = new Base({id:'pipe-i2c-client', sockets:'uc', path:PATH})
i2cbus.reply = function (packet) { scanner.reply = function (packet) {
console.log('==== response from i2cbus =>',packet.bus.response) let addresses = packet.response.map(device => {
return device.toString(16)})
// console.log(packet)
console.log('==== device hex addreses on i2cbus ===\n',addresses)
} }
await scanner.init()
await i2cbus.init()
console.log('=============sending============') console.log('=============sending============')
let packet = {cmd:'rw', bus:{func:'scan'} } let packet = {cmd:'scan'}
console.dir(packet) console.dir(packet)
await i2cbus.send(packet) await scanner.send(packet)
await delay(1000) await delay(3000)
process.kill(process.pid, 'SIGTERM') process.kill(process.pid, 'SIGTERM')

30
examples/tcp-relay.mjs
View File

@ -16,31 +16,31 @@ const delay = time => new Promise(res=>setTimeout(()=>res(),time))
relays.reply = function (packet) { relays.reply = function (packet) {
// console.log(packet.bus) // console.log(packet.bus)
console.log('response from relays',packet.bus.func, packet.bus.args.cmd, packet.bus.response) console.log(`response from relays for ${packet.cmd_sent}:`,packet.args, `was ${packet.response}`)
} }
await relays.init() await relays.init()
console.log('=============sending============') console.log('=============sending============')
let packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd: 0}} } let packet = {cmd:'read', args:{address:39 ,cmd: 0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 0, byte:0}} } packet = {cmd:'write', args:{address:39,cmd: 0, byte:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:0}} } packet = {cmd:'read', args:{address:39 ,cmd:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 9, byte:255}} } packet = {cmd:'write', args:{address:39,cmd: 9, byte:255} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:9}} } packet = {cmd:'read', args:{address:39 ,cmd:9} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
await delay(1000) await delay(1000)
packet = {cmd:'rw', bus:{func:'write', args:{address:39,cmd: 9, byte:0}} } packet = {cmd:'write', args:{address:39,cmd: 9, byte:0} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
packet = {cmd:'rw', bus:{func:'read', args:{address:39 ,cmd:9}} } packet = {cmd:'read', args:{address:39 ,cmd:9} }
console.dir(packet.bus) console.dir(packet)
await relays.send(packet) await relays.send(packet)
await delay(1000) await delay(1000)

11
examples/tcp-scan.mjs
View File

@ -2,11 +2,8 @@
* A tcp customer/client to talk with the i2c bus and scan the bus for devices * A tcp customer/client to talk with the i2c bus and scan the bus for devices
* *
*/ */
import Base from '../../uci-base/src/base'
const HOST = 'sbc' const HOST = 'sbc'
const delay = time => new Promise(res=>setTimeout(()=>res(),time)) const delay = time => new Promise(res=>setTimeout(()=>res(),time))
; ;
(async () => { (async () => {
@ -14,14 +11,14 @@ const delay = time => new Promise(res=>setTimeout(()=>res(),time))
let scanner = new Base({id:'tcp-i2c-client', sockets:'tc', host:HOST}) let scanner = new Base({id:'tcp-i2c-client', sockets:'tc', host:HOST})
scanner.reply = function (packet) { scanner.reply = function (packet) {
let addresses = packet.bus.response.map(device => { let addresses = packet.response.map(device => {
return device.toString(16)}) return device.toString(16)})
console.log(packet) // console.log(packet)
console.log('==== device hex addreses on i2cbus ===\n',addresses) console.log('==== device hex addreses on i2cbus ===\n',addresses)
} }
await scanner.init() await scanner.init()
console.log('=============sending============') console.log('=============sending============')
let packet = {cmd:'rw', bus:{func:'scan'} } let packet = {cmd:'scan'}
console.dir(packet) console.dir(packet)
await scanner.send(packet) await scanner.send(packet)

90
src/bus-packet.mjs
View File

@ -11,66 +11,100 @@ export default class Bus extends Base {
this.busnum = opts.busnum || 1 this.busnum = opts.busnum || 1
this.i2cbus = i2c.open(this.busnum, () => {}) this.i2cbus = i2c.open(this.busnum, () => {})
this.funcs = bus_funcs this.funcs = bus_funcs
this.registerPacketProcessor.bind(this)(process)
// this.init = this.init.bind(this) // this.init = this.init.bind(this)
} }
async init(){ async init(){
// console.log('init', this.rw)
await super.init() await super.init()
} }
async rw (packet){ } // end of Bus Packet Class
// console.dir('=>',packet.bus.fusncs)
if (!packet.bus.func) return {error: 'no i2c bus function in packet', packet: packet.bus } // replace base processor with one for i2c bus functions
if (this.funcs[packet.bus.func]) { const process = async function (packet){
packet.bus.response = await this.funcs[packet.bus.func].bind(this)(packet.bus.args) if (!packet.cmd) return {error: 'no cmd: key in packet', packet: packet }
if (this.context.funcs[packet.cmd]) {
// let res = validateArgs(packet)
// if (res.error) return res.error
packet.cmd_sent = packet.cmd
packet.response = await this.context.funcs[packet.cmd].bind(this.context)(packet.args)
packet.cmd = 'reply' packet.cmd = 'reply'
return packet return packet
} } else return {error: 'no i2c bus function available for packet command', packet: packet }
return {error: 'no i2c bus function available for packet function', packet: packet.bus } }
const validateArgs = function (packet) {
let missing = []
console.log(packet)
if (packet.cmd==='scan' || packet.cmd ==='close') return {}
if (!packet.args.address) missing.push('address')
switch (packet.cmd)
{
case 'readRaw':
case 'writeRaw':
if (!packet.args.length) missing.push('length')
if (!packet.args.buffer) missing.push('buffer')
break
case 'read':
case 'read2':
case 'write':
case 'write2':
if (!packet.args.cmd) missing.push('cmd')
} }
} // end of Bus Packet Class switch (packet.cmd)
{
case 'write':
case 'write2':
case 'send':
if (!packet.args.byte) missing.push('byte')
}
if (missing.length > 0) {
return {error: `following arguments are missing ${missing}`, packet: packet }
}
return {}
}
const bus_funcs = { const bus_funcs = {
scan: function () { return pify(this.i2cbus.scan).bind(this.i2cbus)() }, scan: function () { return pify(this.i2cbus.scan).bind(this.i2cbus)() },
close: function () { return pify(this.i2cbus.close).bind(this.i2cbus)() }, close: function () { return pify(this.i2cbus.close).bind(this.i2cbus)() },
readRaw: function (arg) { readRaw: function (args) {
return pify(this.i2cbus.i2cRead).bind(this.i2cbus)(arg.address, arg.length, arg.buffer) return pify(this.i2cbus.i2cRead).bind(this.i2cbus)(args.address, args.length, args.buffer)
}, },
writeRaw: function (arg) { writeRaw: function (args) {
return pify(this.i2cbus.i2cWrite).bind(this.i2cbus)(arg.address, arg.length, arg.buffer) return pify(this.i2cbus.i2cWrite).bind(this.i2cbus)(args.address, args.length, args.buffer)
}, },
read: function (arg) { read: function (args) {
// console.log('read: address, cmd', address, cmd) // console.log('read: address, cmd', address, cmd)
return pify(this.i2cbus.readByte).bind(this.i2cbus)(arg.address, arg.cmd) return pify(this.i2cbus.readByte).bind(this.i2cbus)(args.address, args.cmd)
}, },
write: function (arg) { write: function (args) {
// console.log('write: address, cmd, byte', arg.address, arg.cmd, arg.byte) // console.log('write: address, cmd, byte', args.address, args.cmd, args.byte)
return pify(this.i2cbus.writeByte.bind(this.i2cbus))(arg.address, arg.cmd, arg.byte) return pify(this.i2cbus.writeByte.bind(this.i2cbus))(args.address, args.cmd, args.byte)
}, },
read2: function (arg) { read2: function (args) {
return pify(this.i2cbus.readWord.bind(this.i2cbus))(arg.address, arg.cmd) return pify(this.i2cbus.readWord.bind(this.i2cbus))(args.address, args.cmd)
}, },
write2: function (arg) { write2: function (args) {
return pify(this.i2cbus.writeWord.bind(this.i2cbus))(arg.address, arg.cmd, arg.bytes) return pify(this.i2cbus.writeWord.bind(this.i2cbus))(args.address, args.cmd, args.byte)
}, },
receive: function (arg) { receive: function (args) {
// console.log('receivebyte', address) // console.log('receivebyte', address)
return pify(this.i2cbus.receiveByte.bind(this.i2cbus))(arg.address) return pify(this.i2cbus.receiveByte.bind(this.i2cbus))(args.address)
}, },
send: function (arg) { send: function (args) {
// console.log('sendbyte', address,byte) // console.log('sendbyte', address,byte)
return pify(this.i2cbus.sendByte.bind(this.i2cbus))(arg.address, arg.byte) return pify(this.i2cbus.sendByte.bind(this.i2cbus))(args.address, args.byte)
} }
} //end i2c functions
}