Skip to content
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
2 changes: 2 additions & 0 deletions lib/solvers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
AutoroutingPipeline1_OriginalUnravel,
AssignableAutoroutingPipeline3,
AutoroutingPipelineSolver3_HgPortPointPathing,
AutoroutingPipelineSolver4,
} from "@tscircuit/capacity-autorouter"
import { CopperPourPipelineSolver } from "@tscircuit/copper-pour-solver"

Expand All @@ -15,6 +16,7 @@ export const SOLVERS = {
AssignableAutoroutingPipeline3,
AutoroutingPipeline1_OriginalUnravel,
AutoroutingPipelineSolver3_HgPortPointPathing,
AutoroutingPipelineSolver4,
CopperPourPipelineSolver,
}

Expand Down
6 changes: 5 additions & 1 deletion lib/utils/autorouting/CapacityMeshAutorouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
AssignableAutoroutingPipeline3,
AutoroutingPipeline1_OriginalUnravel,
AutoroutingPipelineSolver3_HgPortPointPathing,
AutoroutingPipelineSolver4,
} from "@tscircuit/capacity-autorouter"
import { AutorouterError } from "lib/errors/AutorouterError"
import type { SimpleRouteJson, SimplifiedPcbTrace } from "./SimpleRouteJson"
Expand All @@ -22,7 +23,7 @@ export interface AutorouterOptions {
stepDelay?: number
useAssignableSolver?: boolean
useAutoJumperSolver?: boolean
autorouterVersion?: "v1" | "v2" | "v3" | "latest"
autorouterVersion?: "v1" | "v2" | "v3" | "v4" | "latest"
effort?: number
onSolverStarted?: (details: {
solverName: string
Expand All @@ -39,6 +40,7 @@ export class TscircuitAutorouter implements GenericLocalAutorouter {
| AssignableAutoroutingPipeline3
| AutoroutingPipeline1_OriginalUnravel
| AutoroutingPipelineSolver3_HgPortPointPathing
| AutoroutingPipelineSolver4
private eventHandlers: {
complete: Array<(ev: AutorouterCompleteEvent) => void>
error: Array<(ev: AutorouterErrorEvent) => void>
Expand Down Expand Up @@ -71,6 +73,8 @@ export class TscircuitAutorouter implements GenericLocalAutorouter {
solverName = "AutoroutingPipeline1_OriginalUnravel"
} else if (autorouterVersion === "v3") {
solverName = "AutoroutingPipelineSolver3_HgPortPointPathing"
} else if (autorouterVersion === "v4") {
solverName = "AutoroutingPipelineSolver4"
} else if (useAutoJumperSolver) {
solverName = "AssignableAutoroutingPipeline3"
} else if (useAssignableSolver) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@resvg/resvg-js": "^2.6.2",
"@tscircuit/alphabet": "0.0.18",
"@tscircuit/checks": "0.0.110",
"@tscircuit/capacity-autorouter": "^0.0.334",
"@tscircuit/capacity-autorouter": "^0.0.353",
"@tscircuit/circuit-json-util": "^0.0.90",
"@tscircuit/common": "^0.0.20",
"@tscircuit/copper-pour-solver": "^0.0.20",
Expand All @@ -46,7 +46,7 @@
"@tscircuit/math-utils": "^0.0.36",
"@tscircuit/miniflex": "^0.0.4",
"@tscircuit/ngspice-spice-engine": "^0.0.8",
"@tscircuit/props": "^0.0.497",
"@tscircuit/props": "^0.0.498",
"@tscircuit/schematic-match-adapt": "^0.0.16",
"@tscircuit/schematic-trace-solver": "^v0.0.45",
"@tscircuit/solver-utils": "^0.0.3",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions tests/features/autorouter-version-v4.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { expect, test } from "bun:test"
import { getTestFixture } from "../fixtures/get-test-fixture"

test("board with autorouterVersion v4 uses AutoroutingPipelineSolver4", async () => {
const { circuit } = getTestFixture()

let solverStartedName: string | undefined

circuit.on("solver:started", (event) => {
solverStartedName = event.solverName
})

circuit.add(
<board
width="20mm"
height="20mm"
autorouter={{
local: true,
groupMode: "subcircuit",
}}
autorouterVersion="v4"
>
<resistor
name="R1"
pcbX={-5}
pcbY={0}
resistance={10000}
footprint="0402"
/>
<led name="LED1" pcbX={5} pcbY={0} footprint="0603" />

<trace from=".R1 > .pin2" to=".LED1 > .anode" />
</board>,
)

await circuit.renderUntilSettled()

expect(solverStartedName).toBe("AutoroutingPipelineSolver4")

const traces = circuit.selectAll("trace")
expect(traces.length).toBeGreaterThan(0)

expect(circuit).toMatchPcbSnapshot(import.meta.path)
})
Loading