Skip to content

Commit b782cf7

Browse files
authored
Merge pull request #329 from parallaxinc/windowsSerial
Fixed Windows serial issue #327
2 parents 02c8a15 + da578ae commit b782cf7

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- '0.10'
5-
- '0.12'
4+
- '6'
65
before_install:
7-
- 'npm install -g npm' # need latest npm for scoped modules
86
- 'export DISPLAY=:99.0'
97
- 'sh -e /etc/init.d/xvfb start'
108
script: npm run ci
@@ -17,5 +15,5 @@ deploy:
1715
skip_cleanup: true
1816
on:
1917
tags: true
20-
node: '0.10'
18+
node: '6'
2119
all_branches: true

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "__MSG_appName__",
33
"description": "__MSG_appDescription__",
4-
"version": "0.13.0",
4+
"version": "0.14.0",
55
"manifest_version": 2,
66
"default_locale": "en",
77
"permissions": [

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "parallax-ide",
3-
"version": "0.13.0",
3+
"version": "0.14.0",
44
"description": "Write, compile, and download code to your Parallax Boe-Bot Robot or custom BASIC Stamp microcontroller-based electronic creations.",
55
"main": "index.js",
66
"directories": {
@@ -14,7 +14,7 @@
1414
"history": "^1.12.5",
1515
"iggins": "^0.4.0",
1616
"invariant": "^2.1.1",
17-
"irken": "^0.8.0",
17+
"irken": "^0.9.0",
1818
"lodash": "^3.9.1",
1919
"raw-loader": "^0.5.1",
2020
"react": "^0.13.1",

src/plugins/handlers.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,8 @@ function handlers(app, opts, done){
627627
/Bluetooth-Modem/,
628628
/dev\/cu\./
629629
],
630-
source: content
630+
source: content,
631+
delay: 300
631632
};
632633

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

639640
if(autoDownload){
640-
// TODO: how can I clean up this interaction?
641-
checkAutoDownload();
641+
// windows serial sometimes needs to wait after boards scanned.
642+
setTimeout(function() {
643+
checkAutoDownload();
644+
}, 100);
642645
}
643646
});
644647
}
@@ -681,7 +684,8 @@ function handlers(app, opts, done){
681684
/Bluetooth-Incoming-Port/,
682685
/Bluetooth-Modem/,
683686
/dev\/cu\./
684-
]
687+
],
688+
delay: 300
685689
};
686690

687691
app.scanBoards(scanOpts)

0 commit comments

Comments
 (0)