Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
b45bf7512c | |||
2dec405a9b | |||
29009aa5e5 | |||
86011827dc | |||
c20cfab069 | |||
197f9096f8 | |||
6d499cb683 |
@ -28,13 +28,18 @@ namespace pxt.editor {
|
|||||||
|
|
||||||
let initPromise: Promise<Ev3Wrapper>
|
let initPromise: Promise<Ev3Wrapper>
|
||||||
function initAsync() {
|
function initAsync() {
|
||||||
if (!initPromise)
|
const forceHexDownload = /forceHexDownload/i.test(window.location.href);
|
||||||
|
if (!initPromise && Cloud.isLocalHost() && Cloud.localToken && !forceHexDownload)
|
||||||
initPromise = hf2Async()
|
initPromise = hf2Async()
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
initPromise = null
|
initPromise = null
|
||||||
noHID = true
|
noHID = true
|
||||||
return Promise.reject(err)
|
return Promise.reject(err)
|
||||||
})
|
})
|
||||||
|
else {
|
||||||
|
noHID = true
|
||||||
|
initPromise = Promise.reject(new Error("no HID"))
|
||||||
|
}
|
||||||
return initPromise
|
return initPromise
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,13 +121,9 @@ namespace pxt.editor {
|
|||||||
const res: pxt.editor.ExtensionResult = {
|
const res: pxt.editor.ExtensionResult = {
|
||||||
deployCoreAsync,
|
deployCoreAsync,
|
||||||
};
|
};
|
||||||
initAsync()
|
initAsync().catch(e => {
|
||||||
/*
|
// probably no HID - we'll try this again upon deployment
|
||||||
.then(w => w.streamFileAsync("/tmp/serial.txt", buf => {
|
})
|
||||||
let str = Util.fromUTF8(Util.uint8ArrayToString(buf))
|
|
||||||
|
|
||||||
}))
|
|
||||||
*/
|
|
||||||
return Promise.resolve<pxt.editor.ExtensionResult>(res);
|
return Promise.resolve<pxt.editor.ExtensionResult>(res);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pxt-ev3",
|
"name": "pxt-ev3",
|
||||||
"version": "0.0.6",
|
"version": "0.0.9",
|
||||||
"description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
|
"description": "LEGO Mindstorms EV3 for Microsoft MakeCode",
|
||||||
"private": true,
|
"private": true,
|
||||||
"keywords": [
|
"keywords": [
|
||||||
@ -40,7 +40,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pxt-common-packages": "0.9.2",
|
"pxt-common-packages": "0.9.2",
|
||||||
"pxt-core": "^2.0.2"
|
"pxt-core": "2.0.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "node node_modules/pxt-core/built/pxt.js travis"
|
"test": "node node_modules/pxt-core/built/pxt.js travis"
|
||||||
|
Reference in New Issue
Block a user