Skip to content

Fixed Windows serial issue #327 #329

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

Merged
merged 3 commits into from
Oct 26, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
sudo: false
language: node_js
node_js:
- '0.10'
- '0.12'
- '6'
before_install:
- 'npm install -g npm' # need latest npm for scoped modules
- 'export DISPLAY=:99.0'
- 'sh -e /etc/init.d/xvfb start'
script: npm run ci
Expand All @@ -17,5 +15,5 @@ deploy:
skip_cleanup: true
on:
tags: true
node: '0.10'
node: '6'
all_branches: true
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"description": "__MSG_appDescription__",
"version": "0.13.0",
"version": "0.14.0",
"manifest_version": 2,
"default_locale": "en",
"permissions": [
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parallax-ide",
"version": "0.13.0",
"version": "0.14.0",
"description": "Write, compile, and download code to your Parallax Boe-Bot Robot or custom BASIC Stamp microcontroller-based electronic creations.",
"main": "index.js",
"directories": {
Expand All @@ -14,7 +14,7 @@
"history": "^1.12.5",
"iggins": "^0.4.0",
"invariant": "^2.1.1",
"irken": "^0.8.0",
"irken": "^0.9.0",
"lodash": "^3.9.1",
"raw-loader": "^0.5.1",
"react": "^0.13.1",
Expand Down
12 changes: 8 additions & 4 deletions src/plugins/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,8 @@ function handlers(app, opts, done){
/Bluetooth-Modem/,
/dev\/cu\./
],
source: content
source: content,
delay: 300
};

store.dispatch(creators.reloadDevices());
Expand All @@ -637,8 +638,10 @@ function handlers(app, opts, done){
store.dispatch(creators.updateDevices(devices));

if(autoDownload){
// TODO: how can I clean up this interaction?
checkAutoDownload();
// windows serial sometimes needs to wait after boards scanned.
setTimeout(function() {
checkAutoDownload();
}, 100);
}
});
}
Expand Down Expand Up @@ -681,7 +684,8 @@ function handlers(app, opts, done){
/Bluetooth-Incoming-Port/,
/Bluetooth-Modem/,
/dev\/cu\./
]
],
delay: 300
};

app.scanBoards(scanOpts)
Expand Down