-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Serial port list throttling and repl error with multiple boards #1456
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,11 +25,14 @@ var rport = /usb|acm|^com/i; | |
// This string appears over 20 times in this file. | ||
var UNDEFINED = "undefined"; | ||
|
||
|
||
var Serial = { | ||
used: [], | ||
attempts: [], | ||
detect: function(callback) { | ||
// Max number of times listing serial conntections can fail | ||
var maxAttempts = 10; | ||
// Delay (ms) before trying again to list serial connections | ||
var retryDelay = 400; | ||
var serialport; | ||
|
||
/* istanbul ignore if */ | ||
|
@@ -88,7 +91,14 @@ var Serial = { | |
Serial.attempts[Serial.used.length]++; | ||
|
||
// Retry Serial connection | ||
Serial.detect.call(this, callback); | ||
if (Serial.attempts[Serial.used.length] > maxAttempts) { | ||
this.fail("Board", "No connected device found"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here I would have logged the id of the board but I haven't because when initializing multiple boards without specifing ids they all end up having the same generated uid. Is this how it is supposed to be? |
||
return; | ||
} | ||
setTimeout(() => { | ||
Serial.detect.call(this, callback); | ||
}, retryDelay); | ||
|
||
return; | ||
} | ||
|
||
|
@@ -431,11 +441,19 @@ function finalizeAndBroadcast(data, type, io) { | |
|
||
if (io.name !== "Mock" && this.sigint) { | ||
process.on("SIGINT", function() { | ||
// Time to wait before forcing exit | ||
var failExitTimeout = 1000; | ||
|
||
this.emit("exit"); | ||
this.warn("Board", "Closing."); | ||
|
||
var timeout = setTimeout(function () { | ||
process.reallyExit(); | ||
}, failExitTimeout); | ||
var interval = setInterval(function() { | ||
if (!this.io.pending) { | ||
clearInterval(interval); | ||
clearTimeout(timeout); | ||
process.nextTick(process.reallyExit); | ||
} | ||
}.bind(this), 1); | ||
|
@@ -1177,6 +1195,11 @@ function Boards(opts) { | |
this.emit("error", error); | ||
}.bind(this)); | ||
|
||
// echo the fail event from the boards | ||
this[index].on("fail", function (event) { | ||
this.emit("fail", event); | ||
}.bind(this)); | ||
|
||
return new Promise(function(resolve) { | ||
this[index].on("ready", function() { | ||
resolve(initialized[portOpts.id]); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My gut says this is a fine timeout.