MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

AutoBuild tweaks

Browse Source
This commit is contained in:
Scott Lahteine 2019-09-30 02:55:57 -05:00
parent a9c259c77a
commit 1e57c6e6e3
3 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildroot/share/vscode/AutoBuildMarlin/README.md
View File

@ -34,7 +34,7 @@ Before you install AutoBuildMarlin you'll first need to [Install PlatformIO in V
Icon|Action Icon|Action
----|------ ----|------
![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/B_small.png)|Start **PIO Build** to test your Marlin build ![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/B_small.png)|Start **Marlin Build** to test your Marlin build
![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/C_small.png)|Start **PIO Clean** to delete old build files ![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/U_small.png)|Start **Marlin Upload** to install Marlin on your board
![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/U_small.png)|Start **PIO Upload** to install Marlin on your board ![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/T_small.png)|Start **Marlin Upload (traceback)** to install Marlin with debugging
![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/T_small.png)|Start **PIO Upload (traceback)** to install Marlin with debugging ![](https://github.com/MarlinFirmware/Marlin/raw/bugfix-2.0.x/buildroot/share/vscode/AutoBuildMarlin/img/C_small.png)|Start **Marlin Clean** to delete old build files

30
buildroot/share/vscode/AutoBuildMarlin/extension.js
View File

@ -7,34 +7,34 @@ function activate(context) {
console.log('Extension "AutoBuildMarlin" is now active!'); console.log('Extension "AutoBuildMarlin" is now active!');
var NEXT_TERM_ID = 1; var NEXT_TERM_ID = 1;
var pio_build = vscode.commands.registerCommand('piobuild', function () { var mf_build = vscode.commands.registerCommand('mfbuild', function () {
vscode.commands.executeCommand('workbench.action.files.saveAll'); vscode.commands.executeCommand('workbench.action.files.saveAll');
const terminal = vscode.window.createTerminal(`AB Build #${NEXT_TERM_ID++}`); const terminal = vscode.window.createTerminal(`Marlin Build #${NEXT_TERM_ID++}`);
terminal.show(true); terminal.show(true);
terminal.sendText("python buildroot/share/atom/auto_build.py build"); terminal.sendText("python buildroot/share/atom/auto_build.py build");
}); });
var pio_clean = vscode.commands.registerCommand('pioclean', function () { var mf_upload = vscode.commands.registerCommand('mfupload', function () {
const terminal = vscode.window.createTerminal(`AB Clean #${NEXT_TERM_ID++}`);
terminal.show(true);
terminal.sendText("python buildroot/share/atom/auto_build.py clean");
});
var pio_upload = vscode.commands.registerCommand('pioupload', function () {
vscode.commands.executeCommand('workbench.action.files.saveAll'); vscode.commands.executeCommand('workbench.action.files.saveAll');
const terminal = vscode.window.createTerminal(`AB Upload #${NEXT_TERM_ID++}`); const terminal = vscode.window.createTerminal(`Marlin Upload #${NEXT_TERM_ID++}`);
terminal.show(true); terminal.show(true);
terminal.sendText("python buildroot/share/atom/auto_build.py upload"); terminal.sendText("python buildroot/share/atom/auto_build.py upload");
}); });
var pio_traceback = vscode.commands.registerCommand('piotraceback', function () { var mf_traceback = vscode.commands.registerCommand('mftraceback', function () {
vscode.commands.executeCommand('workbench.action.files.saveAll'); vscode.commands.executeCommand('workbench.action.files.saveAll');
const terminal = vscode.window.createTerminal(`AB Traceback #${NEXT_TERM_ID++}`); const terminal = vscode.window.createTerminal(`Marlin Traceback #${NEXT_TERM_ID++}`);
terminal.show(true); terminal.show(true);
terminal.sendText("python buildroot/share/atom/auto_build.py traceback"); terminal.sendText("python buildroot/share/atom/auto_build.py traceback");
}); });
var mf_clean = vscode.commands.registerCommand('mfclean', function () {
const terminal = vscode.window.createTerminal(`Marlin Clean #${NEXT_TERM_ID++}`);
terminal.show(true);
terminal.sendText("python buildroot/share/atom/auto_build.py clean");
});
context.subscriptions.push(pio_build); context.subscriptions.push(mf_build);
context.subscriptions.push(pio_clean); context.subscriptions.push(mf_upload);
context.subscriptions.push(pio_upload); context.subscriptions.push(mf_traceback);
context.subscriptions.push(pio_traceback); context.subscriptions.push(mf_clean);
} }
exports.activate = activate; exports.activate = activate;

68
buildroot/share/vscode/AutoBuildMarlin/package.json
View File

@ -6,65 +6,69 @@
"publisher": "marlinfirmware", "publisher": "marlinfirmware",
"icon": "logo.svg", "icon": "logo.svg",
"engines": { "engines": {
"vscode": "^1.23.0" "vscode": "^1.32.0"
}, },
"enableProposedApi": true, "enableProposedApi": true,
"categories": [ "categories": [
"Other" "Other"
], ],
"activationEvents": [ "activationEvents": [
"onCommand:piobuild", "onCommand:mfbuild",
"onCommand:pioclean", "onCommand:mfclean",
"onCommand:pioupload", "onCommand:mfupload",
"onCommand:piotraceback" "onCommand:mftraceback"
], ],
"main": "./extension", "main": "./extension",
"contributes": { "contributes": {
"viewsContainers": { "viewsContainers": {
"activitybar": [ "activitybar": [
{ {
"id": "auto-build", "id": "autoBuildVC",
"title": "Auto Build Marlin", "title": "Marlin Build",
"icon": "resources/AB.svg" "icon": "resources/AB.svg"
} }
] ]
}, },
"views": { "views": {
"auto-build": [ "autoBuildVC": [
{ {
"id": "autobuild", "id": "autoBuildView",
"name": " " "name": "Build…"
},
{
"id": "marlinView",
"name": "Marlin Info"
} }
] ]
}, },
"commands": [ "commands": [
{ {
"command": "piobuild", "command": "mfbuild",
"title": "PIO Build", "title": "Build",
"icon": { "icon": {
"light": "resources/B48x48_light.svg", "light": "resources/B48x48_light.svg",
"dark": "resources/B48x48_dark.svg" "dark": "resources/B48x48_dark.svg"
} }
}, },
{ {
"command": "pioupload", "command": "mfupload",
"title": "PIO Upload", "title": "Upload",
"icon": { "icon": {
"light": "resources/U48x48_light.svg", "light": "resources/U48x48_light.svg",
"dark": "resources/U48x48_dark.svg" "dark": "resources/U48x48_dark.svg"
} }
}, },
{ {
"command": "piotraceback", "command": "mftraceback",
"title": "PIO Upload (traceback)", "title": "Upload (traceback)",
"icon": { "icon": {
"light": "resources/T48x48_light.svg", "light": "resources/T48x48_light.svg",
"dark": "resources/T48x48_dark.svg" "dark": "resources/T48x48_dark.svg"
} }
}, },
{ {
"command": "pioclean", "command": "mfclean",
"title": "PIO Clean", "title": "Clean",
"icon": { "icon": {
"light": "resources/C48x48_light.svg", "light": "resources/C48x48_light.svg",
"dark": "resources/C48x48_dark.svg" "dark": "resources/C48x48_dark.svg"
@ -74,20 +78,24 @@
"menus": { "menus": {
"view/title": [ "view/title": [
{ {
"command": "piobuild", "command": "mfbuild",
"group": "navigation@1" "group": "navigation@1",
"when": "view == autoBuildView || view == marlinView"
}, },
{ {
"command": "pioupload", "command": "mfupload",
"group": "navigation@2" "group": "navigation@2",
"when": "view == autoBuildView || view == marlinView"
}, },
{ {
"command": "piotraceback", "command": "mftraceback",
"group": "navigation@3" "group": "navigation@3",
"when": "view == autoBuildView || view == marlinView"
}, },
{ {
"command": "pioclean", "command": "mfclean",
"group": "navigation@4" "group": "navigation@4",
"when": "view == autoBuildView || view == marlinView"
} }
] ]
} }
@ -100,10 +108,10 @@
"test": "npm run compile && node ./node_modules/vscode/bin/test" "test": "npm run compile && node ./node_modules/vscode/bin/test"
}, },
"devDependencies": { "devDependencies": {
"vscode": "^1.1.17", "@types/vscode": "^1.34.0",
"typescript": "^2.6.1", "typescript": "^3.5.1",
"tslint": "^5.8.0", "tslint": "^5.16.0",
"@types/node": "^7.0.43", "@types/node": "^10.14.17",
"@types/mocha": "^2.2.42" "@types/mocha": "^2.2.42"
} }
} }