Skip to content

Optimize I2C Library with Async/Await and Non-Blocking Streams #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Optimize I2C Library with Async/Await and Non-Blocking Streams #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 213 additions & 15 deletions lib/i2c.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,30 @@ class i2c extends EventEmitter {
});
});
}
scanAsync() {
return new Promise((resolve, reject) => {
this.scan((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
scanAsync() {
return new Promise((resolve, reject) => {
this.scan((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
scanAsync() {
return new Promise((resolve, reject) => {
this.scan((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}

setAddress(address) {
wire.setAddress(address);
Expand All @@ -59,6 +83,30 @@ class i2c extends EventEmitter {
});
});
}
openAsync(device) {
return new Promise((resolve, reject) => {
this.open(device, (err) => {
if (err) reject(err);
else resolve();
});
});
}
openAsync(device) {
return new Promise((resolve, reject) => {
this.open(device, (err) => {
if (err) reject(err);
else resolve();
});
});
}
openAsync(device) {
return new Promise((resolve, reject) => {
this.open(device, (err) => {
if (err) reject(err);
else resolve();
});
});
}

close() {
wire.close();
Expand All @@ -75,6 +123,30 @@ class i2c extends EventEmitter {
});
});
}
writeAsync(buf) {
return new Promise((resolve, reject) => {
this.write(buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeAsync(buf) {
return new Promise((resolve, reject) => {
this.write(buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeAsync(buf) {
return new Promise((resolve, reject) => {
this.write(buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}

writeByte(byte, callback) {
this.setAddress(this.address);
Expand All @@ -84,6 +156,30 @@ class i2c extends EventEmitter {
});
});
}
writeByteAsync(byte) {
return new Promise((resolve, reject) => {
this.writeByte(byte, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeByteAsync(byte) {
return new Promise((resolve, reject) => {
this.writeByte(byte, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeByteAsync(byte) {
return new Promise((resolve, reject) => {
this.writeByte(byte, (err) => {
if (err) reject(err);
else resolve();
});
});
}

writeBytes(cmd, buf, callback) {
this.setAddress(this.address);
Expand All @@ -96,6 +192,30 @@ class i2c extends EventEmitter {
});
});
}
writeBytesAsync(cmd, buf) {
return new Promise((resolve, reject) => {
this.writeBytes(cmd, buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeBytesAsync(cmd, buf) {
return new Promise((resolve, reject) => {
this.writeBytes(cmd, buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}
writeBytesAsync(cmd, buf) {
return new Promise((resolve, reject) => {
this.writeBytes(cmd, buf, (err) => {
if (err) reject(err);
else resolve();
});
});
}

read(len, callback) {
this.setAddress(this.address);
Expand All @@ -105,6 +225,30 @@ class i2c extends EventEmitter {
});
});
}
readAsync(len) {
return new Promise((resolve, reject) => {
this.read(len, (err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
readAsync(len) {
return new Promise((resolve, reject) => {
this.read(len, (err) => {
if (err) reject(err);
else resolve(data);
});
});
}
readAsync(len) {
return new Promise((resolve, reject) => {
this.read(len, (err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}

readByte(callback) {
this.setAddress(this.address);
Expand All @@ -114,6 +258,30 @@ class i2c extends EventEmitter {
});
});
}
readByteAsync() {
return new Promise((resolve, reject) => {
this.readByte((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
readByteAsync() {
return new Promise((resolve, reject) => {
this.readByte((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
readByteAsync() {
return new Promise((resolve, reject) => {
this.readByte((err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}

readBytes(cmd, len, callback) {
this.setAddress(this.address);
Expand All @@ -123,23 +291,53 @@ class i2c extends EventEmitter {
});
});
}
readBytesAsync(cmd, len) {
return new Promise((resolve, reject) => {
this.readBytes(cmd, len, (err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
readBytesAsync(cmd, len) {
return new Promise((resolve, reject) => {
this.readBytes(cmd, len, (err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}
readBytesAsync(cmd, len) {
return new Promise((resolve, reject) => {
this.readBytes(cmd, len, (err, data) => {
if (err) reject(err);
else resolve(data);
});
});
}

stream(cmd, len, delay) {
if (delay == null) delay = 100;
stream(cmd, len, delay = 100) {
this.setAddress(this.address);
wire.readBlock(cmd, len, delay, (err, data) => {
if (err) {
this.emit('error', err);
} else {
this.emit('data', {
address: this.address,
data: data,
cmd: cmd,
length: len,
timestamp: Date.now()
});
}
});

const intervalId = setInterval(() => {
wire.readBlock(cmd, len, null, (err, data) => {
if (err) {
this.emit('error', err);
} else {
this.emit('data', {
address: this.address,
data: data,
cmd: cmd,
length: len,
timestamp: Date.now()
});
}
});
}, delay);

return () => {
clearInterval(intervalId);
};
}
}

Expand Down
28 changes: 9 additions & 19 deletions src/i2c.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,17 @@ void ReadBlock(const Nan::FunctionCallbackInfo<v8::Value>& info) {

Local<Object> buffer = Nan::NewBuffer(len).ToLocalChecked();

if (i2c_smbus_read_i2c_block_data(fd, cmd, len, data.data()) != len) {
err = Nan::Error(Nan::New("Error reading length of bytes").ToLocalChecked());
}

while (fd > 0) {
if (i2c_smbus_read_i2c_block_data(fd, cmd, len, data.data()) != len) {
err = Nan::Error(Nan::New("Error reading length of bytes").ToLocalChecked());
}

memcpy(node::Buffer::Data(buffer), data.data(), len);
memcpy(node::Buffer::Data(buffer), data.data(), len);

if (info[3]->IsFunction()) {
const unsigned argc = 2;
Local<Function> callback = Local<Function>::Cast(info[3]);
Local<Value> argv[argc] = { err, buffer };
Nan::Call(callback, Nan::GetCurrentContext()->Global(), argc, argv);
}

if (info[2]->IsNumber()) {
int32_t delay = info[2]->Int32Value(Nan::GetCurrentContext()).FromJust();
usleep(delay * 1000);
} else {
break;
}
if (info[3]->IsFunction()) {
const unsigned argc = 2;
Local<Function> callback = Local<Function>::Cast(info[3]);
Local<Value> argv[argc] = { err, buffer };
Nan::Call(callback, Nan::GetCurrentContext()->Global(), argc, argv);
}

info.GetReturnValue().Set(buffer);
Expand Down