Skip to content

Fix windows version #4

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix windows version #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5eef40
fix mbed detection and exceution path
JojoS62 Oct 16, 2018
0b6bb7a
fix for flash command
JojoS62 Oct 16, 2018
2eacd0d
npm prebulish task
JojoS62 Oct 25, 2018
683d5f9
fix typo for extension.mbed.serialmonitor
JojoS62 Oct 25, 2018
755556d
exclude vsix files
JojoS62 Oct 25, 2018
94c4e85
fixed typos
JojoS62 Nov 22, 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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
out
node_modules
.vscode-test/
.vsix
*.vsix
7 changes: 7 additions & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
"problemMatcher": [
"$tsc-watch"
]
},
{
"type": "npm",
"script": "vscode:prepublish",
"problemMatcher": [
"$tsc"
]
}
]
}
16 changes: 8 additions & 8 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ export function activate(context: vscode.ExtensionContext) {

flashIcon = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
flashIcon.text = `$(circuit-board) flash`;
flashIcon.tooltip = 'Flash complied mbed binary into board';
flashIcon.tooltip = 'Flash compiled mbed binary into board';
flashIcon.command = 'extension.mbed.flash';
flashIcon.show();

logIcon = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
logIcon.text = `$(terminal) serial monitor`;
logIcon.tooltip = 'Open serial monitor';
logIcon.command = 'extensio.mbed.serialMonitor';
logIcon.command = 'extension.mbed.serialMonitor';
logIcon.show();

commandOutput = vscode.window.createOutputChannel('mbed tasks');
Expand Down Expand Up @@ -113,7 +113,7 @@ export function exec(cmd:string, cwd:string): Promise<void> {

export function checkMbedInstalled(): Promise<void> {
return new Promise((resolve, reject) => {
process = spawnCMD('which mbed');
process = (process.platform === 'win32') ? spawnCMD('where mbed') : spawnCMD('which mbed');
process.on('close', (status) => {
if (status) {
reject(`error`);
Expand Down Expand Up @@ -162,10 +162,10 @@ export function mbedCompileProject() {
const cmd = generateCommand();
const folder = vscode.workspace.workspaceFolders;

const path = vscode.workspace.workspaceFolders[0].uri.path;
const path = vscode.workspace.workspaceFolders[0].uri.fsPath;
exec(cmd, path)
.then(() => {
vscode.window.showInformationMessage(`Successfully complied`)
vscode.window.showInformationMessage(`Successfully compiled`)
}).catch((reason) => {
commandOutput.appendLine(`> ERROR: ${reason}`);
vscode.window.showErrorMessage(reason, 'Show Output')
Expand All @@ -174,13 +174,13 @@ export function mbedCompileProject() {
}

export function mbedCompileAndFlashProject() {
const cmd = generateCommand();
const cmd = generateCommand() + ' -f';
const folder = vscode.workspace.workspaceFolders;

const path = vscode.workspace.workspaceFolders[0].uri.path;
const path = vscode.workspace.workspaceFolders[0].uri.fsPath;
exec(cmd, path)
.then(() => {
vscode.window.showInformationMessage(`Successfully complied`)
vscode.window.showInformationMessage(`Successfully compiled`)
}).catch((reason) => {
commandOutput.appendLine(`> ERROR: ${reason}`);
vscode.window.showErrorMessage(reason, 'Show Output')
Expand Down