diff --git a/src/fn/pushbutton.ts b/src/fn/pushbutton.ts index f069063c..b0aae588 100644 --- a/src/fn/pushbutton.ts +++ b/src/fn/pushbutton.ts @@ -25,12 +25,13 @@ export const pushbutton = ( const width = parameters.w const height = parameters.h const holeDiameter = parameters.id + const outerDiameter = parameters.od const holes: AnyCircuitElement[] = [ - platedhole(1, -width / 2, height / 2, holeDiameter, holeDiameter * 1.5), - platedhole(2, -width / 2, -height / 2, holeDiameter, holeDiameter * 1.5), - platedhole(3, width / 2, -height / 2, holeDiameter, holeDiameter * 1.5), - platedhole(4, width / 2, height / 2, holeDiameter, holeDiameter * 1.5), + platedhole(1, -width / 2, height / 2, holeDiameter, outerDiameter), + platedhole(2, -width / 2, -height / 2, holeDiameter, outerDiameter), + platedhole(3, width / 2, -height / 2, holeDiameter, outerDiameter), + platedhole(4, width / 2, height / 2, holeDiameter, outerDiameter), ] const silkscreenLines: AnyCircuitElement[] = [ @@ -60,7 +61,7 @@ export const pushbutton = ( 0.5, ) - const padOuterRadius = (holeDiameter * 1.5) / 2 + const padOuterRadius = outerDiameter / 2 const pinRowSpanX = width const pinRowSpanY = height const padOuterHalfWidth = pinRowSpanX / 2 + padOuterRadius diff --git a/tests/__snapshots__/pushbutton.snap.svg b/tests/__snapshots__/pushbutton.snap.svg index 319a9257..7535da5a 100644 --- a/tests/__snapshots__/pushbutton.snap.svg +++ b/tests/__snapshots__/pushbutton.snap.svg @@ -1 +1 @@ -{REF} \ No newline at end of file +{REF} \ No newline at end of file diff --git a/tests/kicad-parity/__snapshots__/pushbutton.snap.svg b/tests/kicad-parity/__snapshots__/pushbutton.snap.svg index c76c521c..2d165b52 100644 --- a/tests/kicad-parity/__snapshots__/pushbutton.snap.svg +++ b/tests/kicad-parity/__snapshots__/pushbutton.snap.svg @@ -1 +1 @@ -{REF}REF**Diff: 11.33% \ No newline at end of file +{REF}REF**Diff: 0.00% \ No newline at end of file diff --git a/tests/kicad-parity/__snapshots__/pushbutton_boolean_difference.snap.svg b/tests/kicad-parity/__snapshots__/pushbutton_boolean_difference.snap.svg index 92e222b1..74fd7897 100644 --- a/tests/kicad-parity/__snapshots__/pushbutton_boolean_difference.snap.svg +++ b/tests/kicad-parity/__snapshots__/pushbutton_boolean_difference.snap.svg @@ -1 +1 @@ -SW_PUSH_6mm_H5mm - Alignment Analysis (Footprinter vs KiCad)pushbutton_w6.5_h4.5_id1.3333333333333333KiCad: SW_PUSH_6mm_H5mmPerfect alignment = complete overlap \ No newline at end of file +SW_PUSH_6mm_H5mm - Alignment Analysis (Footprinter vs KiCad)pushbutton_w6.5_h4.5_id1.1_od2KiCad: SW_PUSH_6mm_H5mmPerfect alignment = complete overlap \ No newline at end of file diff --git a/tests/kicad-parity/pushbutton_kicad_parity.test.ts b/tests/kicad-parity/pushbutton_kicad_parity.test.ts index e25b1f59..85685257 100644 --- a/tests/kicad-parity/pushbutton_kicad_parity.test.ts +++ b/tests/kicad-parity/pushbutton_kicad_parity.test.ts @@ -9,7 +9,7 @@ test("parity/pushbutton", async () => { booleanDifferenceSvg, courtyardDiffPercent, } = await compareFootprinterVsKicad( - "pushbutton_w6.5_h4.5_id1.3333333333333333", + "pushbutton_w6.5_h4.5_id1.1_od2", "Button_Switch_THT.pretty/SW_PUSH_6mm_H5mm.circuit.json", )