heliox/old-monorepo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix exception when disconnecting

Browse source
This commit is contained in:
GHOSCHT 2021-08-27 21:19:11 +02:00
parent a60acb1381
commit 6c720bd8aa
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dashboard/src/PortController.ts
View file

@ -32,7 +32,7 @@ class PortController {
this.parser = this.port.pipe(new parsers.Readline({ delimiter: "\r\n" })); this.parser = this.port.pipe(new parsers.Readline({ delimiter: "\r\n" }));
} }
open(callback: (error:Error | null | undefined)=>void, onCloseCallback:(error:Error)=>void) { open(callback: (error:Error | null | undefined)=>void, onCloseCallback:(error:Error | null | undefined)=>void) {
if (this.isOpen) { if (this.isOpen) {
throw new Error("Port already open"); throw new Error("Port already open");
} }

8
Dashboard/src/redux/actions/asyncSerialConnectionActions.ts
View file

@ -25,9 +25,11 @@ const connect = (): ThunkResult<void> => async (dispatch, getState) => {
dispatch(connectionFailure(error)); dispatch(connectionFailure(error));
} }
}, (error) => { }, (error) => {
if (error.message === "Reading from COM port (ReadIOCompletion): Access denied") { if (error !== null && error !== undefined) {
dispatch(connectionFailure(new Error("Device disconnected"))); if (error.message === "Reading from COM port (ReadIOCompletion): Access denied") {
dispatch(connectionEnd()); dispatch(connectionFailure(new Error(`Device ${state.serialConnection.port} disconnected`)));
dispatch(connectionEnd());
}
} }
}); });
}; };