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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { inflateSourceCapacitor } from "./inflators/inflateSourceCapacitor"
import { inflateSourceInductor } from "./inflators/inflateSourceInductor"
import { inflateSourceDiode } from "./inflators/inflateSourceDiode"
import { inflateSourceTrace } from "./inflators/inflateSourceTrace"
import { inflateSourceTransistor } from "./inflators/inflateSourceTransistor"

export class Subcircuit extends Group<typeof subcircuitProps> {
constructor(props: z.input<typeof subcircuitProps>) {
Expand Down Expand Up @@ -77,6 +78,9 @@ export class Subcircuit extends Group<typeof subcircuitProps> {
case "simple_chip":
inflateSourceChip(sourceComponent, inflationCtx)
break
case "simple_transistor":
inflateSourceTransistor(sourceComponent, inflationCtx)
break
default:
throw new Error(
`No inflator implemented for source component ftype: "${sourceComponent.ftype}"`,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import type {
SourceSimpleTransistor,
PcbComponent,
CadComponent,
} from "circuit-json"
import { Transistor } from "lib/components/normal-components/Transistor"
import { inflatePcbComponent } from "./inflatePcbComponent"
import type { InflatorContext } from "../InflatorFn"

export function inflateSourceTransistor(
sourceElm: SourceSimpleTransistor,
inflatorContext: InflatorContext,
) {
const { injectionDb, subcircuit, groupsMap } = inflatorContext

const pcbElm = injectionDb.pcb_component.getWhere({
source_component_id: sourceElm.source_component_id,
}) as PcbComponent | null

const cadElm = injectionDb.cad_component.getWhere({
source_component_id: sourceElm.source_component_id,
}) as CadComponent | null

const transistor = new Transistor({
name: sourceElm.name,
type: sourceElm.transistor_type,
})

if (pcbElm) {
inflatePcbComponent(pcbElm, {
...inflatorContext,
normalComponent: transistor,
})
}

// Add the transistor to its group if it has one, otherwise add to subcircuit
if (sourceElm.source_group_id && groupsMap?.has(sourceElm.source_group_id)) {
const group = groupsMap.get(sourceElm.source_group_id)!
group.add(transistor)
} else {
subcircuit.add(transistor)
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { test, expect } from "bun:test"
import { getTestFixture } from "tests/fixtures/get-test-fixture"
import { renderToCircuitJson } from "tests/fixtures/renderToCircuitJson"

/**
* This test verifies that a subcircuit can inflate a transistor component
*/
test("subcircuit-circuit-json07", async () => {
const { circuit } = await getTestFixture()

const subcircuitCircuitJson = await renderToCircuitJson(
<group name="G1">
<transistor name="Q1" type="npn" footprint="sot-23" />
<port name="P1" direction="left" connectsTo="Q1.collector" />
<port name="P2" direction="right" connectsTo="Q1.emitter" />
</group>,
)

circuit.add(
<board width="20mm" height="20mm">
<subcircuit name="S1" circuitJson={subcircuitCircuitJson} />
<resistor
name="R1"
resistance="1k"
footprint="0402"
connections={{ pin1: ".S1 .G1 .Q1 .collector" }}
/>
</board>,
)

await circuit.renderUntilSettled()

const circuitJson = await circuit.getCircuitJson()

const Q1 = circuitJson.find(
(element) =>
element.type === "source_component" &&
(element as any).ftype === "simple_transistor" &&
(element as any).name === "Q1",
) as any

expect(Q1).toBeDefined()
expect(Q1?.transistor_type).toBe("npn")

const pcbTrace = circuitJson.find((c) => c.type === "pcb_trace")

expect(pcbTrace).toBeDefined()
expect(circuit).toMatchPcbSnapshot(import.meta.path)
})