jepler/circuitpython-org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1161 from makermelissa/esptool

Browse source 
Update Installer to treat C3 chips as not having Native USB
This commit is contained in:
Melissa LeBlanc-Williams 2023-03-01 14:52:34 -08:00 committed by GitHub
commit 78d1e77dba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cpinstaller/src/cpinstaller.js
View file

@ -103,7 +103,7 @@ export class CPInstallButton extends InstallButton {
steps: [this.stepWelcome, this.stepSerialConnect, this.stepConfirm, this.stepEraseAll, this.stepBootloader, this.stepSelectBootDrive, this.stepCopyUf2, this.stepSelectCpyDrive, this.stepCredentials, this.stepSuccess],
isEnabled: async () => { return this.hasNativeUsb() && !!this.bootloaderUrl && !!this.uf2FileUrl },
},
binFullProgram: { // Non-native USB Install
binFullProgram: { // Non-native USB Install (Once we have boot drive disable working, we can remove hasNativeUsb() check)
label: `Full CircuitPython [version] Install`,
steps: [this.stepWelcome, this.stepSerialConnect, this.stepConfirm, this.stepEraseAll, this.stepFlashBin, this.stepSetupRepl, this.stepCredentials, this.stepSuccess],
isEnabled: async () => { return !this.hasNativeUsb() && !!this.binFileUrl },
@ -1150,8 +1150,9 @@ export class CPInstallButton extends InstallButton {
// server.hostname
}
// This is necessary because chips with native USB will have a CIRCUITPY drive, which blocks writing via REPL
hasNativeUsb() {
if (!this.chipFamily || ("esp32").includes(this.chipFamily)) {
if (!this.chipFamily || ("esp32", "esp32c3").includes(this.chipFamily)) {
return false;
}