Skip to content

automatically unsubscribe to upload, download and configure subjects #28

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.

Sign up for GitHub

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 5 commits into from
Jul 13, 2018
Merged

automatically unsubscribe to upload, download and configure subjects #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c586822
automatically unsubscribe to upload, download and configure subjects
Jul 13, 2018
fa3ebdc
minor fixes
Jul 13, 2018
cb6d398
1.0.4
Jul 13, 2018
a815e5b
1.0.5
Jul 13, 2018
62d3f45
restore package.json
Jul 13, 2018
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
Prev Previous commit
Next Next commit
minor fixes
  • Loading branch information
Alberto Iannaccone committed Jul 13, 2018
commit fa3ebdcd7af6cd50b3eea6ba52c9690f61f4c95f
4 changes: 2 additions & 2 deletions src/boardConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export default class BoardConfiguration {
this.configureDone = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_DONE))
.pipe(first())
.pipe(takeUntil(this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR))));
this.configureInProgress = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_IN_PROGRESS))
this.configureError = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR))
.pipe(first())
.pipe(takeUntil(this.configureDone));
this.configureError = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_ERROR));
this.configureInProgress = this.configuring.pipe(filter(configure => configure.status === this.CONFIGURE_IN_PROGRESS));
this.daemon.serialMonitorMessages.subscribe(message => {
this.serialMonitorContent += message;
});
Expand Down
8 changes: 5 additions & 3 deletions src/daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ export default class Daemon {
.subscribe(() => this.closeAllPorts());
}

notifyUploadError(err, msg) {
this.uploading.next({ status: this.UPLOAD_ERROR, err, msg });
notifyUploadError(err) {
this.uploading.next({ status: this.UPLOAD_ERROR, err });
}

openChannel(cb) {
Expand Down Expand Up @@ -119,7 +119,9 @@ export default class Daemon {
if (typeof this.stopUploadCommand === 'function') {
this.stopUploadCommand();
}
throw new Error('Stop Upload not supported on Chrome OS');
else {
throw new Error('Stop Upload not supported on Chrome OS');
}
}

initUpload() {
Expand Down
7 changes: 3 additions & 4 deletions src/socket-daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ export default class SocketDaemon extends Daemon {
});
}

notifyDownloadError(err, msg) {
this.downloading.next({ status: this.DOWNLOAD_ERROR, err, msg });
notifyDownloadError(err) {
this.downloading.next({ status: this.DOWNLOAD_ERROR, err });
}

/**
Expand Down Expand Up @@ -482,8 +482,7 @@ export default class SocketDaemon extends Daemon {
stopUploadCommand() {
this.uploading.next({
status: this.UPLOAD_ERROR,
err: 'upload stopped',
msg: 'Upload stopped'
err: 'upload stopped'
});
this.socket.emit('command', 'killprogrammer');
}
Expand Down