Skip to content

Commit 2cdb5af

Browse files
committed
Merge pull request #62 from parallaxinc/update-bs2-serial
update the bs2-serial library for the new syntax
2 parents 4c19a09 + 8cdf988 commit 2cdb5af

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": "test"
88
},
99
"dependencies": {
10-
"bs2-serial": "jacobrosenthal/bs2-serial",
10+
"bs2-serial": "^0.2.0",
1111
"codemirror": "^4.13.0",
1212
"frylord": "^0.5.0",
1313
"holovisor": "^0.2.0",

plugins/sidebar/file-operations.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,20 @@ const FileOperations = React.createClass({
7575
return;
7676
}
7777

78-
when.all([
79-
programmer.getRevisions(),
80-
programmer.compile({ source: space.current.deref() })
81-
]).spread(function(revs, memory){
82-
var options = {
83-
path: devicePath,
84-
board: revs.bs2,
85-
memory: memory
86-
};
87-
88-
return programmer.bootload(options);
89-
})
90-
.tap(() => toast.clear())
91-
.tap(() => this.handleSuccess(`'${name}' downloaded successfully`))
92-
.catch(this.handleError)
93-
.finally(overlay.hide);
78+
programmer.compile({ source: space.current.deref() })
79+
.then(function(memory){
80+
var options = {
81+
path: devicePath,
82+
board: 'bs2',
83+
memory: memory
84+
};
85+
86+
return programmer.bootload(options);
87+
})
88+
.tap(() => toast.clear())
89+
.tap(() => this.handleSuccess(`'${name}' downloaded successfully`))
90+
.catch(this.handleError)
91+
.finally(overlay.hide);
9492
},
9593
renderOverlay: function(component){
9694
const overlay = this.props.overlay;

0 commit comments

Comments
 (0)