c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial target repo setup to move to master (v3.10)

Browse Source
This commit is contained in:
Sam El-Husseini
2018-04-21 10:25:43 -07:00
parent cf7767ec1c
commit 6ea0c50472
36 changed files with 2717 additions and 1459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/extension.ts
View File

@ -252,7 +252,7 @@ namespace pxt.editor {
})
}
export function deployCoreAsync(resp: pxtc.CompileResult, d: pxt.commands.DeployOptions = {}): Promise<void> {
export function deployCoreAsync(resp: pxtc.CompileResult): Promise<void> {
let saveHexAsync = () => {
return pxt.commands.saveOnlyAsync(resp)
}
@ -372,9 +372,11 @@ namespace pxt.editor {
})
})
.catch(e => {
if (e.type === "devicenotfound" && d.reportDeviceNotFoundAsync) {
// TODO: (microbit master)
if (e.type === "devicenotfound") { //&& d.reportDeviceNotFoundAsync) {
pxt.tickEvent("hid.flash.devicenotfound");
return d.reportDeviceNotFoundAsync("/device/windows-app/troubleshoot", resp);
//return d.reportDeviceNotFoundAsync("/device/windows-app/troubleshoot", resp);
return undefined;
} else {
return saveHexAsync()
}