Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions src/extension.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import * as vscode from 'vscode';
import { RTOSTracker } from './rtos/rtos';

export function activate(context: vscode.ExtensionContext) {
export interface RTOSViewsAPI {
/** Register an additional debug adapter type to be tracked by RTOS Views. */
addDebugType(debugType: string): void;
}

export function activate(context: vscode.ExtensionContext): RTOSViewsAPI {
context.subscriptions.push(
vscode.commands.registerCommand('mcu-debug.rtos-views.helloWorld', () => {
vscode.window.showInformationMessage('Hello from rtos-views!');
})
);
const rtosTracker = new RTOSTracker(context); // eslint-disable-line @typescript-eslint/no-unused-vars
const rtosTracker = new RTOSTracker(context);
return {
addDebugType: (debugType: string) => rtosTracker.addDebugType(debugType),
};
}

export function deactivate() { } // eslint-disable-line @typescript-eslint/no-empty-function
62 changes: 41 additions & 21 deletions src/rtos/rtos.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,32 +192,45 @@ class MyDebugTracker {
resolve(false);
} else {
trackerApi = ret;
const arg: IDebuggerTrackerSubscribeArg = {
version: 1,
body: {
debuggers: TrackedDebuggers,
handler: this.debugTrackerEventHandler.bind(this),
wantCurrentStatus: true,
notifyAllEvents: false,
// Make sure you set debugLevel to zero for production
debugLevel: 0,
},
};
const result = trackerApi.subscribe(arg);
if (typeof result === 'string') {
vscode.window.showErrorMessage(
`Subscription failed with extension 'debug-tracker-vscode' : ${result}`
);
resolve(false);
} else {
trackerApiClientInfo = result;
resolve(true);
}
resolve(this.doSubscribe());
}
});
});
}

public resubscribe(): boolean {
if (!trackerApi) {
return false;
}
if (trackerApiClientInfo) {
trackerApi.unsubscribe(trackerApiClientInfo.clientId);
}
return this.doSubscribe();
}

private doSubscribe(): boolean {
const arg: IDebuggerTrackerSubscribeArg = {
version: 1,
body: {
debuggers: TrackedDebuggers,
handler: this.debugTrackerEventHandler.bind(this),
wantCurrentStatus: true,
notifyAllEvents: false,
// Make sure you set debugLevel to zero for production
debugLevel: 0,
},
};
const result = trackerApi.subscribe(arg);
if (typeof result === 'string') {
vscode.window.showErrorMessage(
`Subscription failed with extension 'debug-tracker-vscode' : ${result}`
);
return false;
}
trackerApiClientInfo = result;
return true;
}

private settingsChanged(e: vscode.ConfigurationChangeEvent) {
if (e.affectsConfiguration('mcu-debug.rtos-views.trackDebuggers')) {
this.updateTrackedDebuggersFromSettings(true);
Expand Down Expand Up @@ -408,6 +421,13 @@ export class RTOSTracker implements DebugEventHandler {
this.update();
}

public addDebugType(debugType: string): void {
if (!TrackedDebuggers.includes(debugType)) {
TrackedDebuggers.push(debugType);
this.theTracker.resubscribe();
}
}

public notifyPanelDisposed() {
this.visible = false;
}
Expand Down