Skip to content
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

Allow receiveMessage() to return undefined #29

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Allow receiveMessage() to return undefined #29

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
2 changes: 1 addition & 1 deletion lib/binding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class CanBridge {
getDevices: () => Promise<CanDeviceInfo[]>;
registerDeviceToHAL: (descriptor:string, messageId:Number, messageMask:number) => number;
unregisterDeviceFromHAL: (descriptor:string) => Promise<number>;
receiveMessage: (descriptor:string, messageId:number, messageMask:number) => CanMessage;
receiveMessage: (descriptor:string, messageId:number, messageMask:number) => CanMessage | undefined;
openStreamSession: (descriptor:string, messageId:number, messageMask:number, maxSize:number) => number;
readStreamSession: (descriptor:string, sessionHandle:number, messagesToRead:number) => CanMessage[];
closeStreamSession: (descriptor:string, sessionHandle:number) => number;
Expand Down
24 changes: 24 additions & 0 deletions src/canWrapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ Napi::Object receiveMessage(const Napi::CallbackInfo& info) {

rev::usb::CANStatus status = device->ReceiveCANMessage(message, messageId, messageMask);
if (status != rev::usb::CANStatus::kOk) {
if (status == rev::ubs::CANStatus::kTimeout) {
// We haven't received this message, which is not worth throwing an exception over
return Napi::Env::Undefined();
}
Napi::Error::New(env, "Receiving message failed with status code " + std::to_string((int)status)).ThrowAsJavaScriptException();
return Napi::Object::New(env);
}
Expand Down Expand Up @@ -515,6 +519,26 @@ Napi::Number sendCANMessage(const Napi::CallbackInfo& info) {
return Napi::Number::New(env, status);
}

// Params:
// descriptor: string
// messageId: Number
// requestedMessageLength: Number
// Returns:
// status: Number
Napi::Number sendCANRtrMessage(const Napi::CallbackInfo& info) {
Napi::Env env = info.Env();
std::string descriptor = info[0].As<Napi::String>().Utf8Value();
uint32_t messageId = info[1].As<Napi::Number>().Uint32Value();
uint8_t requestedMessageLength = info[2].As<Napi::Number>().Uint8Value();

uint8_t messageData[0];
int status = _sendCANMessage(descriptor, messageId, messageData, dataParam.Length(), repeatPeriodMs);
if (status < 0) {
Napi::Error::New(env, DEVICE_NOT_FOUND_ERROR).ThrowAsJavaScriptException();
}
return Napi::Number::New(env, status);
}

// Params:
// descriptor: string
// messageId: Number
Expand Down