Skip to content

Fix RP2040 roundrect hole offsets #168

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
wants to merge 2 commits into from
Closed

Fix RP2040 roundrect hole offsets #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36147a6
Fix RP2040 hole alignment
seveibar Nov 16, 2025
c3a7aba
Handle roundrect drill offsets in pad conversion
seveibar Nov 16, 2025
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
181 changes: 46 additions & 135 deletions src/convert-kicad-json-to-tscircuit-soup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,37 @@ export const convertKicadJsonToTsCircuitSoup = async (
port_hints: [pad.name],
pcb_port_id,
} as any)
} else if (pad.pad_shape === "roundrect") {
const rotation = getRotationDeg(pad.at as any)
const width = isNinetyLike(rotation) ? pad.size[1] : pad.size[0]
const height = isNinetyLike(rotation) ? pad.size[0] : pad.size[1]
const offX = pad.drill?.offset?.[0] ?? 0
const offY = pad.drill?.offset?.[1] ?? 0
const rotOff = rotatePoint(offX, offY, rotation)
const rr = pad.roundrect_rratio ?? 0
const rectBorderRadius = rr > 0 ? (Math.min(width, height) / 2) * rr : 0
const pcb_port_id = pad.name
? portNameToPcbPortId.get(pad.name)
: undefined
circuitJson.push({
type: "pcb_plated_hole",
pcb_plated_hole_id: `pcb_plated_hole_${platedHoleId++}`,
shape: "circular_hole_with_rect_pad",
hole_shape: "circle",
pad_shape: "rect",
x: pad.at[0],
y: -pad.at[1],
hole_offset_x: rotOff.x,
hole_offset_y: -rotOff.y,
hole_diameter: pad.drill?.width!,
rect_pad_width: width,
rect_pad_height: height,
rect_border_radius: rectBorderRadius,
layers: ["top", "bottom"],
pcb_component_id,
port_hints: [pad.name],
pcb_port_id,
} as any)
}
} else if (pad.pad_type === "np_thru_hole") {
circuitJson.push({
Expand All @@ -333,146 +364,26 @@ export const convertKicadJsonToTsCircuitSoup = async (
const hasCuLayer = hole.layers?.some(
(l) => l.endsWith(".Cu") || l === "*.Cu",
)

if (hasCuLayer) continue
const rotation = getRotationDeg(hole.at as any)
const offX = hole.drill?.offset?.[0] ?? 0
const offY = hole.drill?.offset?.[1] ?? 0
const rotOff = rotatePoint(offX, offY, rotation)
const x = hole.at[0] + rotOff.x
const y = -(hole.at[1] + rotOff.y)
const holeCenterX = hole.at[0] + rotOff.x
const holeCenterY = -(hole.at[1] + rotOff.y)
const holeDiameter = hole.drill?.width ?? 0
const outerDiameter = hole.size?.width ?? holeDiameter
const rr = hole.roundrect_rratio ?? 0
const rectBorderRadius =
rr > 0
? (Math.min(
isNinetyLike(rotation)
? (hole.size?.height ?? outerDiameter)
: (hole.size?.width ?? outerDiameter),
isNinetyLike(rotation)
? (hole.size?.width ?? outerDiameter)
: (hole.size?.height ?? outerDiameter),
) /
2) *
rr
: 0
if (hasCuLayer) {
if (hole.pad_shape === "rect") {
const pcb_port_id = hole.name
? portNameToPcbPortId.get(hole.name)
: undefined
circuitJson.push({
type: "pcb_plated_hole",
pcb_plated_hole_id: `pcb_plated_hole_${platedHoleId++}`,
shape: "circular_hole_with_rect_pad",
hole_shape: "circle",
pad_shape: "rect",
// x/y are the pad center; hole_offset_* positions the hole
x: hole.at[0],
y: -hole.at[1],
hole_offset_x: rotOff.x,
hole_offset_y: -rotOff.y,
hole_diameter: holeDiameter,
rect_pad_width: isNinetyLike(rotation)
? (hole.size?.height ?? outerDiameter)
: (hole.size?.width ?? outerDiameter),
rect_pad_height: isNinetyLike(rotation)
? (hole.size?.width ?? outerDiameter)
: (hole.size?.height ?? outerDiameter),
rect_border_radius: rectBorderRadius,
port_hints: [hole.name],
layers: ["top", "bottom"],
pcb_component_id,
pcb_port_id,
} as any)
} else if (hole.pad_shape === "oval") {
const pcb_port_id = hole.name
? portNameToPcbPortId.get(hole.name)
: undefined
circuitJson.push({
type: "pcb_plated_hole",
pcb_plated_hole_id: `pcb_plated_hole_${platedHoleId++}`,
shape: "pill",
x,
y,
outer_width: isNinetyLike(rotation)
? (hole.size?.height ?? outerDiameter)
: (hole.size?.width ?? outerDiameter),
outer_height: isNinetyLike(rotation)
? (hole.size?.width ?? outerDiameter)
: (hole.size?.height ?? outerDiameter),
hole_width: isNinetyLike(rotation)
? (hole.drill?.height ?? holeDiameter)
: (hole.drill?.width ?? holeDiameter),
hole_height: isNinetyLike(rotation)
? (hole.drill?.width ?? holeDiameter)
: (hole.drill?.height ?? holeDiameter),
port_hints: [hole.name],
layers: ["top", "bottom"],
pcb_component_id,
pcb_port_id,
} as any)
} else if (hole.pad_shape === "roundrect") {
const pcb_port_id = hole.name
? portNameToPcbPortId.get(hole.name)
: undefined
const offX = hole.drill?.offset?.[0] ?? 0
const offY = hole.drill?.offset?.[1] ?? 0
const rotOff = rotatePoint(offX, offY, rotation)
const width = isNinetyLike(rotation)
? (hole.size?.height ?? outerDiameter)
: (hole.size?.width ?? outerDiameter)
const height = isNinetyLike(rotation)
? (hole.size?.width ?? outerDiameter)
: (hole.size?.height ?? outerDiameter)
circuitJson.push({
type: "pcb_plated_hole",
pcb_plated_hole_id: `pcb_plated_hole_${platedHoleId++}`,
shape: "circular_hole_with_rect_pad",
hole_shape: "circle",
pad_shape: "rect",
x,
y,
hole_offset_x: rotOff.x,
hole_offset_y: -rotOff.y,
hole_diameter: holeDiameter,
rect_pad_width: width,
rect_pad_height: height,
rect_border_radius: rectBorderRadius,
port_hints: [hole.name],
layers: ["top", "bottom"],
pcb_component_id,
pcb_port_id,
} as any)
} else {
const pcb_port_id = hole.name
? portNameToPcbPortId.get(hole.name)
: undefined
circuitJson.push({
type: "pcb_plated_hole",
pcb_plated_hole_id: `pcb_plated_hole_${platedHoleId++}`,
shape: "circle",
x,
y,
outer_diameter: outerDiameter,
hole_diameter: holeDiameter,
port_hints: [hole.name],
layers: ["top", "bottom"],
pcb_component_id,
pcb_port_id,
})
}
} else {
circuitJson.push({
type: "pcb_hole",
pcb_hole_id: `pcb_hole_${holeId++}`,
x,
y,
hole_diameter: outerDiameter,
hole_shape: "circle",
pcb_component_id,
} as any)
}
const pcb_port_id = hole.name
? portNameToPcbPortId.get(hole.name)
: undefined
circuitJson.push({
type: "pcb_hole",
pcb_hole_id: `pcb_hole_${holeId++}`,
x: holeCenterX,
y: holeCenterY,
hole_diameter: holeDiameter,
pcb_component_id,
pcb_port_id,
} as any)
}
}

Expand Down
Loading
Loading