Skip to content
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.

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

fix: revert to old uploaders and fix android uploads #164

Merged
merged 2 commits into from
Jan 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {
"@biomejs/biome": "^1.7.2",
"@leaphy-robotics/playwright-arduino": "1.0.5",
"@leaphy-robotics/playwright-arduino": "1.0.6",
"@playwright/test": "^1.43.1",
"@sentry/vite-plugin": "^2.16.1",
"@sveltejs/vite-plugin-svelte": "^5.0.1",
Expand All @@ -34,20 +34,21 @@
"@floating-ui/dom": "^1.6.3",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.7.1",
"@leaphy-robotics/avrdude-webassembly": "1.7.1",
"@leaphy-robotics/dfu-util-wasm": "^1.0.2",
"@leaphy-robotics/leaphy-blocks": "3.3.3",
"@leaphy-robotics/picotool-wasm": "1.0.3",
"@leaphy-robotics/webusb-ftdi": "1.0.1",
"@leaphy-robotics/webusb-ftdi": "1.0.2",
"@sentry/svelte": "^8.34.0",
"@types/w3c-web-usb": "^1.0.10",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"base64-js": "^1.5.1",
"blockly": "10",
"buffer": "^6.0.3",
"chart.js": "^4.4.2",
"chartjs-adapter-date-fns": "^3.0.0",
"date-fns": "^4.1.0",
"intel-hex": "^0.2.0",
"jszip": "^3.10.1",
"monaco-editor": "^0.52.0",
"rrweb": "^2.0.0-alpha.4",
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/core/popups/popups/Uploader.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ async function upload(res: Record<string, string>) {

currentState = "UPDATE_STARTED";
await SerialState.reserve();
} catch {
} catch (e) {
console.log(e);
popupState.close();
return PopupsState.open({
component: ErrorPopup,
Expand Down
9 changes: 5 additions & 4 deletions src/lib/domain/robots.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import nanoIcon from "$assets/robots/icons/l_nano.svg";
import originalIcon from "$assets/robots/icons/l_original.svg";
import unoIcon from "$assets/robots/icons/l_uno.svg";
import WorkspaceState, { Mode } from "$state/workspace.svelte";
import AvrDude from "../programmers/AvrDude";
import DFU from "../programmers/DFU";
import Pico from "../programmers/Pico";
import STK500v1 from "../programmers/STK500v1/STK500v1";
import STK500v2 from "../programmers/STK500v2";
import { type Programmer, RobotType } from "./robots.types";

const DEFAULT_LIBRARIES = [
Expand Down Expand Up @@ -74,14 +75,14 @@ export enum PinMapping {
const baseUno = {
mapping: PinMapping.UNO,
fqbn: "arduino:avr:uno",
programmer: new AvrDude("atmega328p"),
programmer: new STK500v1(),
board: "l_uno",
};

const baseNano = {
mapping: PinMapping.NANO,
fqbn: "arduino:avr:nano",
programmer: new AvrDude("atmega328p"),
programmer: new STK500v1(),
board: "l_nano",
};

Expand Down Expand Up @@ -227,7 +228,7 @@ const robotDevices: RobotDevice[] = [
type: RobotType.L_MEGA,
mapping: PinMapping.MEGA,
name: "Arduino Mega",
programmer: new AvrDude("atmega2560"),
programmer: new STK500v2(),
fqbn: "arduino:avr:mega",
libraries: DEFAULT_LIBRARIES.concat([
"QMC5883LCompass",
Expand Down
96 changes: 0 additions & 96 deletions src/lib/programmers/AvrDude.ts

This file was deleted.

Loading
Loading