Skip to content

Fallback for serial USB drive helpers #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
makermelissa-ai-assistant wants to merge 1 commit into from
Closed

Fallback for serial USB drive helpers #540

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions js/workflows/usb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,25 @@ class USBWorkflow extends Workflow {

async _trySerialFileTransfer() {
try {
if (await this.showBusy(this.repl.tryDisableUsbDrive())) {
let usbDriveDisabled;
if (typeof this.repl.tryDisableUsbDrive === "function") {
usbDriveDisabled = await this.showBusy(this.repl.tryDisableUsbDrive());
} else {
const disabledMarker = "WEB_EDITOR_USB_DRIVE_DISABLED";
const code = `
try:
import storage
if hasattr(storage, "unsafe_disable_usb_drive"):
storage.unsafe_disable_usb_drive()
print("${disabledMarker}")
except Exception:
pass
`;
const result = await this.showBusy(this.repl.runCode(code));
usbDriveDisabled = String(result || "").includes(disabledMarker);
}

if (usbDriveDisabled) {
this._usbDriveDisabled = true;
console.log("CIRCUITPY USB drive disabled; using serial file transfer");
return true;
Expand All @@ -347,7 +365,18 @@ class USBWorkflow extends Workflow {
}

try {
if (await this.repl.enableUsbDrive()) {
let usbDriveRestored;
if (typeof this.repl.enableUsbDrive === "function") {
usbDriveRestored = await this.repl.enableUsbDrive();
} else {
await this.repl.runCode(
`import storage
storage.enable_usb_drive()`
);
usbDriveRestored = true;
}

if (usbDriveRestored) {
console.log("CIRCUITPY USB drive restored");
} else {
console.warn("CircuitPython could not restore the CIRCUITPY USB drive");
Expand Down