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
24 changes: 14 additions & 10 deletions lib/components/primitive-components/Group/Group.ts
Original file line number Diff line number Diff line change
Expand Up @@ -779,21 +779,24 @@ export class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
if (this.props.autorouter?.inputFormat === "simplified") {
const preferredTraceWidth =
props.defaultTraceWidth ?? props.nominalTraceWidth
const { simpleRouteJson } = getSimpleRouteJsonFromCircuitJson({
db,
minTraceWidth: Number(props.minTraceWidth ?? 0.15),
nominalTraceWidth:
preferredTraceWidth != null
? Number(preferredTraceWidth)
: undefined,
subcircuit_id: this.subcircuit_id,
subcircuitComponent: this,
})
simpleRouteJson.allowViaInPad = autorouterConfig.allowViaInPad

const { autorouting_result } = await fetchWithDebug(
`${serverUrl}/autorouting/solve`,
{
method: "POST",
body: JSON.stringify({
input_simple_route_json: getSimpleRouteJsonFromCircuitJson({
db,
minTraceWidth: Number(props.minTraceWidth ?? 0.15),
nominalTraceWidth:
preferredTraceWidth != null
? Number(preferredTraceWidth)
: undefined,
subcircuit_id: this.subcircuit_id,
subcircuitComponent: this,
}).simpleRouteJson,
input_simple_route_json: simpleRouteJson,
subcircuit_id: this.subcircuit_id!,
}),
headers: {
Expand Down Expand Up @@ -1074,6 +1077,7 @@ export class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
simpleRouteJson,
routingPhasePlan.drcTolerances,
)
simpleRouteJson.allowViaInPad = phaseAutorouterConfig.allowViaInPad

if (
(hasPhasedAutorouting || isReroutePhase) &&
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@tsci/tscircuit.ti": "github:tscircuit/ti#57e314be4b2b06bc546d4def7453e619604d1157",
"@tscircuit/alphabet": "0.0.25",
"@tscircuit/breakout-point-solver": "github:tscircuit/breakout-point-solver#bac9629",
"@tscircuit/capacity-autorouter": "^0.0.718",
"@tscircuit/capacity-autorouter": "^0.0.722",
"@tscircuit/checks": "0.0.146",
"@tscircuit/circuit-json-util": "^0.0.101",
"@tscircuit/common": "^0.0.20",
Expand Down
32 changes: 32 additions & 0 deletions tests/features/autorouter-allow-via-in-pad.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { expect, test } from "bun:test"
import type { SimpleRouteJson } from "lib/utils/autorouting/SimpleRouteJson"
import { getTestFixture } from "tests/fixtures/get-test-fixture"

test("board autorouter passes allowViaInPad to SimpleRouteJson", async () => {
const { circuit } = getTestFixture()
let autorouterInput: SimpleRouteJson | undefined

circuit.on("autorouting:start", ({ simpleRouteJson }) => {
autorouterInput = simpleRouteJson
})

circuit.add(
<board
width="12mm"
height="8mm"
autorouter={{
local: true,
groupMode: "subcircuit",
allowViaInPad: true,
}}
>
<resistor name="R1" resistance="1k" footprint="0402" pcbX={-3} />
<resistor name="R2" resistance="1k" footprint="0402" pcbX={3} />
<trace from=".R1 > .pin2" to=".R2 > .pin1" />
</board>,
)

await circuit.renderUntilSettled()

expect(autorouterInput?.allowViaInPad).toBe(true)
})
Loading