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

add delay to fix mac deployment (#929)

Browse Source
This commit is contained in:
Peli de Halleux 2019-09-30 13:43:12 -07:00 committed by GitHub
parent ad3652c290
commit 4c9c7d6a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/deploy.ts
View File

@ -309,6 +309,7 @@ export function deployCoreAsync(resp: pxtc.CompileResult) {
.then(() => w.flashAsync(elfPath, UF2.readBytes(origElfUF2, 0, origElfUF2.length * 256))) .then(() => w.flashAsync(elfPath, UF2.readBytes(origElfUF2, 0, origElfUF2.length * 256)))
.then(() => w.flashAsync(rbfPath, rbfBIN)) .then(() => w.flashAsync(rbfPath, rbfBIN))
.then(() => w.runAsync(rbfPath)) .then(() => w.runAsync(rbfPath))
.then(() => Promise.delay(500))
.then(() => { .then(() => {
pxt.tickEvent("webserial.success"); pxt.tickEvent("webserial.success");
return w.disconnectAsync() return w.disconnectAsync()

3
editor/wrap.ts
View File

@ -17,6 +17,7 @@ export interface DirEntry {
const runTemplate = "C00882010084XX0060640301606400" const runTemplate = "C00882010084XX0060640301606400"
const usbMagic = 0x3d3f const usbMagic = 0x3d3f
const DIRECT_COMMAND_NO_REPLY = 0x80
export class Ev3Wrapper { export class Ev3Wrapper {
msgs = new U.PromiseBuffer<Uint8Array>() msgs = new U.PromiseBuffer<Uint8Array>()
@ -93,7 +94,7 @@ export class Ev3Wrapper {
runAsync(path: string) { runAsync(path: string) {
let codeHex = runTemplate.replace("XX", U.toHex(U.stringToUint8Array(path))) let codeHex = runTemplate.replace("XX", U.toHex(U.stringToUint8Array(path)))
let code = U.fromHex(codeHex) let code = U.fromHex(codeHex)
let pkt = this.allocCore(2 + code.length, 0) let pkt = this.allocCore(2 + code.length, DIRECT_COMMAND_NO_REPLY)
HF2.write16(pkt, 5, 0x0800) HF2.write16(pkt, 5, 0x0800)
U.memcpy(pkt, 7, code) U.memcpy(pkt, 7, code)
log(`run ${path}`) log(`run ${path}`)