Skip to content

Fixes for radio bridge connection #17

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 1 commit into from
Jul 26, 2024
Merged

Fixes for radio bridge connection #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/usb-device-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@ export class DAPWrapper {
// We wait on errors as immediately after flash the micro:bit won't be ready to respond
this._deviceId = await this.readMem32WaitOnError(FICR.DEVICE_ID_1);

this._pageSize = await this.cortexM.readMem32(FICR.CODEPAGESIZE);
this._numPages = await this.cortexM.readMem32(FICR.CODESIZE);
this._pageSize = await this.readMem32WaitOnError(FICR.CODEPAGESIZE);
this._numPages = await this.readMem32WaitOnError(FICR.CODESIZE);
}

async readMem32WaitOnError(register: number): Promise<number> {
let retries = 0;
let lastError: Error | undefined;
while (retries < 10) {
while (retries < 20) {
try {
return await this.cortexM.readMem32(register);
} catch (e) {
if (e instanceof Error) {
lastError = e;
if (/^Transfer/.test(e.message)) {
retries++;
await new Promise((resolve) => setTimeout(resolve, 10));
await new Promise((resolve) => setTimeout(resolve, 20));
} else {
throw e;
}
Expand Down
4 changes: 1 addition & 3 deletions lib/usb-radio-bridge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,7 @@ export class MicrobitRadioBridgeConnection
message: "Serial connect start",
});

if (this.delegate.status !== ConnectionStatus.CONNECTED) {
await this.delegate.connect();
}
await this.delegate.connect();

try {
this.serialSession = new RadioBridgeSerialSession(
Expand Down