@tscircuit/footprinter 0.0.19 → 0.0.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/footprinter",
   "type": "module",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "",
   "main": "dist/index.cjs",
   "scripts": {

package/src/fn/quad.ts

@@ -60,14 +60,15 @@ const quad_def = base_quad_def.transform((v) => {
 
 const SIDES_CCW = ["left", "bottom", "right", "top"] as const
 
-export const getQuadCoords = (
-  pinCount: number,
-  pn: number, // pin number
-  w: number, // width of the package
-  h: number, // height (length) of the package
-  p: number, // pitch between pins
+export const getQuadCoords = (params: {
+  pin_count: number
+  pn: number // pin number
+  w: number // width of the package
+  h: number // height (length) of the package
+  p: number // pitch between pins
   pl: number // length of the pin
-) => {
+}) => {
+  const { pin_count: pinCount, pn, w, h, p, pl } = params
   const sidePinCount = pinCount / 4
   const side = SIDES_CCW[Math.floor((pn - 1) / sidePinCount)]
   const pos = (pn - 1) % sidePinCount
@@ -97,19 +98,21 @@ export const quad = (
   const params = quad_def.parse(raw_params)
   const pads: AnySoupElement[] = []
   const pin_map = getQuadPinMap(params)
+  /** Side pin count */
+  const spc = params.num_pins / 4
   for (let i = 0; i < params.num_pins; i++) {
     const {
       x,
       y,
       o: orientation,
-    } = getQuadCoords(
-      params.num_pins,
-      i + 1,
-      params.w,
-      params.h,
-      params.p ?? 0.5,
-      params.pl
-    )
+    } = getQuadCoords({
+      pin_count: params.num_pins,
+      pn: i + 1,
+      w: params.w,
+      h: params.h,
+      p: params.p ?? 0.5,
+      pl: params.pl,
+    })
 
     let pw = params.pw
     let pl = params.pl
@@ -123,9 +126,8 @@ export const quad = (
 
   if (params.thermalpad) {
     if (typeof params.thermalpad === "boolean") {
-      const sidePinCount = params.num_pins / 4
-      const ibw = params.p * (sidePinCount - 1) + params.pw
-      const ibh = params.p * (sidePinCount - 1) + params.pw
+      const ibw = params.p * (spc - 1) + params.pw
+      const ibh = params.p * (spc - 1) + params.pw
       pads.push(rectpad(["thermalpad"], 0, 0, ibw, ibh))
     } else {
       pads.push(
@@ -136,24 +138,42 @@ export const quad = (
 
   // Silkscreen corners
   const silkscreen_corners: PcbSilkscreenPath[] = []
-  for (let corner_index = 0; corner_index < 4; corner_index++) {
-    const dx = Math.floor(corner_index / 2) * 2 - 1
-    const dy = 1 - (corner_index % 2) * 2
+  for (const [corner, dx, dy] of [
+    ["top-left", -1, 1],
+    ["bottom-left", -1, -1],
+    ["bottom-right", 1, -1],
+    ["top-right", 1, 1],
+  ] as const) {
+    // const dx = Math.floor(corner_index / 2) * 2 - 1
+    // const dy = 1 - (corner_index % 2) * 2
     const corner_x = (params.w / 2 - params.pl / 2) * dx
     const corner_y = (params.h / 2 - params.pl / 2) * dy
     let arrow: "none" | "in1" | "in2" = "none"
     /** corner size */
     const csz = params.pw * 2
-    if (pin_map[1] === 1 && corner_index === 0) {
+
+    if (pin_map[1] === 1 && corner === "top-left") {
+      arrow = "in1"
+    } else if (pin_map[spc * 4] === 1 && corner === "top-left") {
+      arrow = "in2"
+    } else if (pin_map[spc * 3 + 1] === 1 && corner === "top-right") {
+      arrow = "in2"
+    } else if (pin_map[spc * 3] === 1 && corner === "top-right") {
+      arrow = "in1"
+    } else if (pin_map[spc] === 1 && corner === "bottom-left") {
+      arrow = "in1"
+    } else if (pin_map[spc + 1] === 1 && corner === "bottom-left") {
+      arrow = "in2"
+    } else if (pin_map[spc * 2] === 1 && corner === "bottom-right") {
       arrow = "in1"
-    } else if (pin_map[16] === 1 && corner_index === 0) {
+    } else if (pin_map[spc * 2 + 1] === 1 && corner === "bottom-right") {
       arrow = "in2"
     }
     if (arrow === "none") {
       silkscreen_corners.push({
         layer: "top",
         pcb_component_id: "",
-        pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner_index}`,
+        pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner}`,
         route: [
           {
             x: corner_x - csz * dx,
@@ -176,7 +196,7 @@ export const quad = (
         {
           layer: "top",
           pcb_component_id: "",
-          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner_index}`,
+          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner}_1`,
           route: [
             {
               x: corner_x - csz * dx,
@@ -192,7 +212,7 @@ export const quad = (
         {
           layer: "top",
           pcb_component_id: "",
-          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner_index}`,
+          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner}_2`,
           route: [
             {
               x: corner_x,
@@ -208,10 +228,10 @@ export const quad = (
         {
           layer: "top",
           pcb_component_id: "",
-          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner_index}`,
+          pcb_silkscreen_path_id: `pcb_silkscreen_path_${corner}_3`,
           route: [
             {
-              x: corner_x - 0.2,
+              x: corner_x - 0.2 * -dx,
               y: corner_y + 0.2 * rotate_arrow,
             },
             {
@@ -219,11 +239,11 @@ export const quad = (
               y: corner_y,
             },
             {
-              x: corner_x + 0.2 * rotate_arrow,
+              x: corner_x + 0.2 * rotate_arrow * -dx,
               y: corner_y + 0.2,
             },
             {
-              x: corner_x - 0.2,
+              x: corner_x - 0.2 * -dx,
               y: corner_y + 0.2 * rotate_arrow,
             },
           ],

package/tests/quad.test.ts

@@ -11,11 +11,11 @@ test("quad16_w4_l4_p0.4_pw0.25_pl0.4", async (t) => {
   t.pass()
 })
 
-test("quad16_w4_l4_p0.4_pw0.25_pl0.4_thermalpad_startingpin(topside,leftpin)", async (t) => {
+test("quad16_w4_l4_p0.4_pw0.25_pl0.4_thermalpad_startingpin(bottomside,leftpin)", async (t) => {
   const { fp, logSoup } = await getTestFixture(t)
   const soup = fp
     .string(
-      "quad16_w4_l4_p0.4_pw0.25_pl0.4_thermalpad_startingpin(topside,leftpin)"
+      "quad16_w4_l4_p0.4_pw0.25_pl0.4_thermalpad_startingpin(bottomside,leftpin)"
     )
     .soup()