@tscircuit/cli 0.0.185 → 0.0.187

package/example-project/examples/macrokeypad.tsx

@@ -1,10 +1,55 @@
 import { layout } from "@tscircuit/layout"
+import { ArduinoProMicroBreakout } from "example-project/src/ArduinoProMicroBreakout"
+import { Key } from "example-project/src/Key"
 import manualEdits from "example-project/src/manual-edits"
 import { SwitchShaft } from "example-project/src/SwitchShaft"
 
-export const MacroKeypad = () => (
-  <board width="20mm" height="20mm">
-    <SwitchShaft name="SW1" pcbX={3} pcbY={3} />
-    {/* <SwitchShaft name="SW2" /> */}
-  </board>
-)
+export const MacroKeypad = () => {
+  const keyPositions = Array.from({ length: 9 })
+    .map((_, i) => ({
+      keyNum: i + 1,
+      col: i % 3,
+      row: Math.floor(i / 3),
+    }))
+    .map((p) => ({
+      ...p,
+      x: p.col * 19.05 - 19.05,
+      y: p.row * 19.05 - 19.05,
+    }))
+
+  const rowToMicroPin = {
+    0: "D2",
+    1: "D3",
+    2: "D4",
+  }
+  const colToMicroPin = {
+    0: "D5",
+    1: "D6",
+    2: "D7",
+  }
+
+  return (
+    <board width="120mm" height="80mm">
+      {keyPositions.map(({ keyNum, x, y }) => (
+        <Key name={`K${keyNum}`} keyNum={keyNum} pcbX={x} pcbY={y} />
+      ))}
+      <ArduinoProMicroBreakout key="u1" name="U1" pcbX={44} />
+      {keyPositions.map(({ keyNum, row, col }) => (
+        <trace
+          // @ts-ignore
+          key={`trace-${keyNum}-col`}
+          from={`.SW${keyNum} .pin1`}
+          to={`.U1 .${colToMicroPin[col as 0 | 1 | 2]}`}
+        />
+      ))}
+      {keyPositions.map(({ keyNum, row, col }) => (
+        <trace
+          // @ts-ignore
+          key={`trace-${keyNum}-row`}
+          from={`.D${keyNum} .pin2`}
+          to={`.U1 .${rowToMicroPin[row as 0 | 1 | 2]}`}
+        />
+      ))}
+    </board>
+  )
+}

package/example-project/src/ArduinoProMicroBreakout.tsx

@@ -0,0 +1,37 @@
+export const ArduinoProMicroBreakout = (props: {
+  name: string
+  pcbX?: number
+  pcbY?: number
+}) => (
+  <chip
+    {...props}
+    footprint="dip24_w0.7in_h1.3in"
+    pinLabels={{
+      pin1: "TXD",
+      pin2: "RXI",
+      pin3: "GND1",
+      pin4: "GND2",
+      pin5: "D2",
+      pin6: "D3",
+      pin7: "D4",
+      pin8: "D5",
+      pin9: "D6",
+      pin10: "D7",
+      pin11: "D8",
+      pin12: "D9",
+      // right side (from bottom)
+      pin13: "D10",
+      pin14: "D16",
+      pin15: "D14",
+      pin16: "D15",
+      pin17: "A0",
+      pin18: "A1",
+      pin19: "A2",
+      pin20: "A3",
+      pin21: "VCC",
+      pin22: "RST",
+      pin23: "GND3",
+      pin24: "RAW",
+    }}
+  />
+)

package/example-project/src/Key.tsx

@@ -0,0 +1,36 @@
+import { SwitchShaft } from "./SwitchShaft"
+
+export const Key = (props: {
+  name: string
+  keyNum: number
+  pcbX: number
+  pcbY: number
+}) => {
+  const shaftName = `SW${props.keyNum}`
+  const diodeName = `D${props.keyNum}`
+  return (
+    <>
+      <SwitchShaft
+        key="shaft1"
+        name={shaftName}
+        pcbX={props.pcbX}
+        pcbY={props.pcbY}
+      />
+      <diode
+        // @ts-ignore
+        key="diode"
+        pcbRotation={-90}
+        name={diodeName}
+        footprint="0603"
+        pcbX={props.pcbX + 7}
+        pcbY={props.pcbY - 6}
+      />
+      <trace
+        // @ts-ignore
+        key="trace1"
+        from={`.${shaftName} .pin2`}
+        to={`.${diodeName} .pin1`}
+      />
+    </>
+  )
+}

package/example-project/src/SwitchShaft.tsx

@@ -14,30 +14,23 @@ export const SwitchShaft = (props: {
     {...props}
     footprint={
       <footprint>
+        {/* <silkscreentext text={props.name} /> */}
         <smtpad
           shape="rect"
           width="2.55mm"
           height="2.5mm"
           portHints={["pin1"]}
+          layer="top"
         />
         <smtpad
           shape="rect"
           width="2.55mm"
           height="2.5mm"
           portHints={["pin2"]}
+          layer="top"
         />
-        <platedhole
-          shape="circle"
-          name="H1"
-          holeDiameter="3mm"
-          outerDiameter="3.1mm"
-        />
-        <platedhole
-          shape="circle"
-          name="H2"
-          holeDiameter="3mm"
-          outerDiameter="3.1mm"
-        />
+        <hole name="H1" diameter="3mm" />
+        <hole name="H2" diameter="3mm" />
         <constraint xDist="6.35mm" centerToCenter left=".H1" right=".H2" />
         <constraint yDist="2.54mm" centerToCenter top=".H1" bottom=".H2" />
         <constraint edgeToEdge xDist="11.3mm" left=".pin1" right=".pin2" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.0.185",
+  "version": "0.0.187",
   "private": false,
   "type": "module",
   "description": "Command line tool for developing, publishing and installing tscircuit circuits",
@@ -8,6 +8,7 @@
   "scripts": {
     "start": "bun cli/cli.ts",
     "dev": "bun run build:dev-server && concurrently 'bun run dev:frontend' 'bun run dev:test-project'",
+    "dev:fast": "concurrently 'bun run dev:frontend' 'bun run dev:test-project'",
     "dev:frontend": "vite dev --config frontend/vite.config.ts",
     "dev:test-project": "bun --hot cli/cli.ts dev --no-cleanup --cwd ./example-project",
     "start:dev-server": "bun build:dev-server && bun cli/cli.ts dev -y --cwd ./example-project",
@@ -36,7 +37,7 @@
     "@edge-runtime/primitives": "^4.1.0",
     "@hono/node-server": "^1.8.2",
     "@tscircuit/builder": "*",
-    "@tscircuit/core": "0.0.35",
+    "@tscircuit/core": "0.0.41",
     "@tscircuit/props": "^0.0.62",
     "archiver": "^7.0.1",
     "axios": "^1.6.7",
@@ -98,7 +99,7 @@
     "@tscircuit/manual-edit-events": "^0.0.4",
     "@tscircuit/pcb-viewer": "^1.4.4",
     "@tscircuit/schematic-viewer": "^1.2.14",
-    "@tscircuit/soup-util": "^0.0.20",
+    "@tscircuit/soup-util": "^0.0.23",
     "@tscircuit/table-viewer": "0.0.8",
     "@types/archiver": "^6.0.2",
     "@types/bun": "^1.0.8",