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

[UWP] Fix infinite spin when downloading without device plugged (#1500)

Browse Source 
* [UWP] Fix infinite spin when downloading without device plugged

* Undo format changes

* Undo format changes
This commit is contained in:
Guillaume Jenkins 2018-10-23 12:40:24 -04:00 committed by GitHub
parent a7e613c237
commit 52bd7bd146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editor/extension.ts
View File

@ -117,16 +117,18 @@ namespace pxt.editor {
reconnectAsync(first: boolean) { reconnectAsync(first: boolean) {
// configure serial at 115200 // configure serial at 115200
if (!first) let p = Promise.resolve();
return this.packetIo.reconnectAsync() if (!first) {
.then(() => this.allocDAP()) p = this.packetIo.reconnectAsync()
.then(() => this.cortexM.init()) .then(() => this.allocDAP());
.then(() => this.cmsisdap.cmdNums(0x82, [0x00, 0xC2, 0x01, 0x00])) }
.then(() => { }, err => { this.useSerial = false })
else return p
return this.cortexM.init() .then(() => this.cortexM.init())
.then(() => this.cmsisdap.cmdNums(0x82, [0x00, 0xC2, 0x01, 0x00])) .then(() => {
.then(() => { }, err => { this.useSerial = false }) return this.cmsisdap.cmdNums(0x82, [0x00, 0xC2, 0x01, 0x00])
.then(() => { this.useSerial = true }, (err: any) => { this.useSerial = false; });
});
} }
disconnectAsync() { disconnectAsync() {
@ -157,7 +159,8 @@ namespace pxt.editor {
let previousDapWrapper: DAPWrapper; let previousDapWrapper: DAPWrapper;
function dapAsync() { function dapAsync() {
if (previousDapWrapper) if (previousDapWrapper)
return Promise.resolve(previousDapWrapper) return previousDapWrapper.reconnectAsync(false) // Always fully reconnect to handle device unplugged mid-session
.then(() => previousDapWrapper);
return Promise.resolve() return Promise.resolve()
.then(() => { .then(() => {
if (previousDapWrapper) { if (previousDapWrapper) {
@ -648,7 +651,7 @@ namespace pxt.editor {
converts to converts to
<block type="radio_on_number" x="196" y="208"> <block type="radio_on_number" x="196" y="208">
<field name="HANDLER_receivedNumber" id="DCy(W;1)*jLWQUpoy4Mm" variabletype="">receivedNumber</field> <field name="HANDLER_receivedNumber" id="DCy(W;1)*jLWQUpoy4Mm" variabletype="">receivedNumber</field>
</block> </block>
<block type="radio_on_value" x="134" y="408"> <block type="radio_on_value" x="134" y="408">