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

Bump pxt-core to 3.19.4 + Support drive deploy in Electron offline app (#677)

Browse Source 
* initial

* Bump pxt-core to 3.19.4 for drive deploy
This commit is contained in:
Guillaume Jenkins 2018-06-14 13:33:53 -04:00 committed by GitHub
parent e981d1b95d
commit bb4966dca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/deploy.ts
View File

@ -98,11 +98,13 @@ export function deployCoreAsync(resp: pxtc.CompileResult, isCli = false) {
resp.outfiles[pxtc.BINARY_UF2] = btoa(data) resp.outfiles[pxtc.BINARY_UF2] = btoa(data)
let saveUF2Async = () => { let saveUF2Async = () => {
if (isCli || !pxt.commands.saveOnlyAsync) { if (pxt.commands.electronDeployAsync) {
return Promise.resolve() return pxt.commands.electronDeployAsync(resp);
} else {
return pxt.commands.saveOnlyAsync(resp)
} }
if (!isCli && pxt.commands.saveOnlyAsync) {
return pxt.commands.saveOnlyAsync(resp);
}
return Promise.resolve();
} }
if (noHID) return saveUF2Async() if (noHID) return saveUF2Async()

2
package.json
View File

@ -40,7 +40,7 @@
}, },
"dependencies": { "dependencies": {
"pxt-common-packages": "0.23.15", "pxt-common-packages": "0.23.15",
"pxt-core": "3.18.17" "pxt-core": "3.19.4"
}, },
"scripts": { "scripts": {
"test": "node node_modules/pxt-core/built/pxt.js travis" "test": "node node_modules/pxt-core/built/pxt.js travis"

2
pxtarget.json
View File

@ -42,7 +42,7 @@
"useUF2": true, "useUF2": true,
"useELF": true, "useELF": true,
"hasHex": true, "hasHex": true,
"deployDrives": ".*", "deployDrives": "EV3",
"deployFileMarker": "INFO_UF2.TXT", "deployFileMarker": "INFO_UF2.TXT",
"driveName": "EV3", "driveName": "EV3",
"flashCodeAlign": 256, "flashCodeAlign": 256,