File tree 3 files changed +10
-9
lines changed 3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -36,10 +36,10 @@ export default class BoardConfiguration {
36
36
this . configureDone = this . configuring . pipe ( filter ( configure => configure . status === this . CONFIGURE_DONE ) )
37
37
. pipe ( first ( ) )
38
38
. 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 ) )
40
40
. pipe ( first ( ) )
41
41
. 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 ) ) ;
43
43
this . daemon . serialMonitorMessages . subscribe ( message => {
44
44
this . serialMonitorContent += message ;
45
45
} ) ;
Original file line number Diff line number Diff line change @@ -61,8 +61,8 @@ export default class Daemon {
61
61
. subscribe ( ( ) => this . closeAllPorts ( ) ) ;
62
62
}
63
63
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 } ) ;
66
66
}
67
67
68
68
openChannel ( cb ) {
@@ -119,7 +119,9 @@ export default class Daemon {
119
119
if ( typeof this . stopUploadCommand === 'function' ) {
120
120
this . stopUploadCommand ( ) ;
121
121
}
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
+ }
123
125
}
124
126
125
127
initUpload ( ) {
Original file line number Diff line number Diff line change @@ -96,8 +96,8 @@ export default class SocketDaemon extends Daemon {
96
96
} ) ;
97
97
}
98
98
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 } ) ;
101
101
}
102
102
103
103
/**
@@ -482,8 +482,7 @@ export default class SocketDaemon extends Daemon {
482
482
stopUploadCommand ( ) {
483
483
this . uploading . next ( {
484
484
status : this . UPLOAD_ERROR ,
485
- err : 'upload stopped' ,
486
- msg : 'Upload stopped'
485
+ err : 'upload stopped'
487
486
} ) ;
488
487
this . socket . emit ( 'command' , 'killprogrammer' ) ;
489
488
}
You can’t perform that action at this time.
0 commit comments