Skip to content

Commit fa3ebdc

Browse files
author
Alberto Iannaccone
committed
minor fixes
1 parent c586822 commit fa3ebdc

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/boardConfiguration.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ export default class BoardConfiguration {
3636
this.configureDone = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_DONE))
3737
.pipe(first())
3838
.pipe(takeUntil(this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR))));
39-
this.configureInProgress = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_IN_PROGRESS))
39+
this.configureError = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR))
4040
.pipe(first())
4141
.pipe(takeUntil(this.configureDone));
42-
this.configureError = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR));
42+
this.configureInProgress = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_IN_PROGRESS));
4343
this.daemon.serialMonitorMessages.subscribe(message => {
4444
this.serialMonitorContent += message;
4545
});

src/daemon.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ export default class Daemon {
6161
.subscribe(() => this.closeAllPorts());
6262
}
6363

64-
notifyUploadError(err, msg) {
65-
this.uploading.next({ status: this.UPLOAD_ERROR, err, msg });
64+
notifyUploadError(err) {
65+
this.uploading.next({ status: this.UPLOAD_ERROR, err });
6666
}
6767

6868
openChannel(cb) {
@@ -119,7 +119,9 @@ export default class Daemon {
119119
if (typeof this.stopUploadCommand === 'function') {
120120
this.stopUploadCommand();
121121
}
122-
throw new Error('Stop Upload not supported on Chrome OS');
122+
else {
123+
throw new Error('Stop Upload not supported on Chrome OS');
124+
}
123125
}
124126

125127
initUpload() {

src/socket-daemon.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ export default class SocketDaemon extends Daemon {
9696
});
9797
}
9898

99-
notifyDownloadError(err, msg) {
100-
this.downloading.next({ status: this.DOWNLOAD_ERROR, err, msg });
99+
notifyDownloadError(err) {
100+
this.downloading.next({ status: this.DOWNLOAD_ERROR, err });
101101
}
102102

103103
/**
@@ -482,8 +482,7 @@ export default class SocketDaemon extends Daemon {
482482
stopUploadCommand() {
483483
this.uploading.next({
484484
status: this.UPLOAD_ERROR,
485-
err: 'upload stopped',
486-
msg: 'Upload stopped'
485+
err: 'upload stopped'
487486
});
488487
this.socket.emit('command', 'killprogrammer');
489488
}

0 commit comments

Comments
 (0)