From ad8fdc399b683d4f3836bc4c2d1c5921ab91294f Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Sun, 15 Mar 2026 18:39:18 -0700 Subject: [PATCH 1/3] include ports in sort order --- edg/core/TransformUtil.py | 5 +++++ edg/electronics_model/NetlistGenerator.py | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/edg/core/TransformUtil.py b/edg/core/TransformUtil.py index 095af7c37..0356960e7 100644 --- a/edg/core/TransformUtil.py +++ b/edg/core/TransformUtil.py @@ -93,6 +93,11 @@ def link_component(self, must_have_link: bool = True) -> Path: assert self.links return Path(self.blocks, self.links, (), ()) + def port_component(self, must_have_port: bool = True) -> Path: + if must_have_port: + assert self.ports + return Path(self.blocks, self.links, self.ports, ()) + def to_tuple(self) -> Tuple[str, ...]: return self.blocks + self.links + self.ports + self.params diff --git a/edg/electronics_model/NetlistGenerator.py b/edg/electronics_model/NetlistGenerator.py index cbe2a4f2b..734c46a2c 100644 --- a/edg/electronics_model/NetlistGenerator.py +++ b/edg/electronics_model/NetlistGenerator.py @@ -82,14 +82,14 @@ def __init__(self, design: CompiledDesign): self.all_scopes = [BoardScope.empty(TransformUtil.Path.empty())] # list of unique scopes self.scopes: Scopes = {TransformUtil.Path.empty(): self.all_scopes[0]} self.class_paths: ClassPaths = {TransformUtil.Path.empty(): []} # seed root - self.block_link_order: List[TransformUtil.Path] = [] + self.path_traverse_order: List[TransformUtil.Path] = [] self.design = design def process_blocklike( self, path: TransformUtil.Path, block: Union[edgir.Link, edgir.LinkArray, edgir.HierarchyBlock] ) -> None: - self.block_link_order.append(path) + self.path_traverse_order.append(path) # TODO may need rethought to support multi-board assemblies scope = self.scopes[path] # including footprint and exports, and everything within a link @@ -255,6 +255,10 @@ def visit_link(self, context: TransformUtil.TransformContext, link: edgir.Link) def visit_linkarray(self, context: TransformUtil.TransformContext, link: edgir.LinkArray) -> None: self.process_blocklike(context.path, link) + @override + def visit_portlike(self, context: TransformUtil.TransformContext, port: edgir.PortLike) -> None: + self.path_traverse_order.append(context.path) + @staticmethod def name_net(net: Iterable[TransformUtil.Path]) -> TransformUtil.Path: """Names a net based on all the paths of ports and links that are part of the net.""" @@ -291,7 +295,7 @@ def pin_name_goodness(pin1: TransformUtil.Path, pin2: TransformUtil.Path) -> int return best_path def scope_to_netlist(self, scope: BoardScope) -> Netlist: - path_ordering = {path: i for i, path in enumerate(self.block_link_order)} + path_ordering = {path: i for i, path in enumerate(self.path_traverse_order)} # Convert to the netlist format seen: Set[TransformUtil.Path] = set() @@ -320,7 +324,7 @@ def scope_to_netlist(self, scope: BoardScope) -> Netlist: named_nets = sorted( [(self.name_net(net), net) for net in nets], - key=lambda pair: path_ordering[pair[0].link_component(must_have_link=False)], + key=lambda pair: path_ordering[pair[0].port_component(must_have_port=False)], ) board_refdes_prefix = self.design.get_value(("refdes_prefix",)) From 4ef262ec3f51334606631015221a5f5a3dde53d3 Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Sun, 15 Mar 2026 18:43:55 -0700 Subject: [PATCH 2/3] update outputs --- examples/BasicKeyboard/BasicKeyboard.net | 6 +- .../BasicKeyboard/BasicKeyboard.svgpcb.js | 2 +- examples/BldcController/BldcController.net | 12 +- .../BldcController/BldcController.svgpcb.js | 2 +- examples/BleJoystick/BleJoystick.net | 46 ++--- examples/BleJoystick/BleJoystick.svgpcb.js | 8 +- examples/CanAdapter/CanAdapter.net | 24 +-- examples/CanAdapter/CanAdapter.svgpcb.js | 6 +- examples/Datalogger/Datalogger.net | 44 ++--- examples/Datalogger/Datalogger.svgpcb.js | 12 +- examples/DeskController/DeskController.net | 18 +- .../DeskController/DeskController.svgpcb.js | 4 +- examples/EspLora/EspLora.net | 52 +++--- examples/EspLora/EspLora.svgpcb.js | 12 +- examples/EspProgrammer/EspProgrammer.net | 30 ++-- .../EspProgrammer/EspProgrammer.svgpcb.js | 8 +- examples/Fcml/Fcml.net | 166 +++++++++--------- examples/Fcml/Fcml.svgpcb.js | 18 +- examples/HighSwitch/HighSwitch.net | 14 +- examples/HighSwitch/HighSwitch.svgpcb.js | 4 +- .../IotCurtainCrawler/IotCurtainCrawler.net | 8 +- .../IotCurtainCrawler.svgpcb.js | 2 +- examples/IotDisplay/IotDisplay.net | 34 ++-- examples/IotDisplay/IotDisplay.svgpcb.js | 6 +- examples/IotFan/IotFan.net | 8 +- examples/IotFan/IotFan.svgpcb.js | 2 +- examples/IotIron/IotIron.net | 26 +-- examples/IotIron/IotIron.svgpcb.js | 6 +- examples/IotKnob/IotKnob.net | 8 +- examples/IotKnob/IotKnob.svgpcb.js | 2 +- examples/IotLedDriver/IotLedDriver.net | 82 ++++----- examples/IotLedDriver/IotLedDriver.svgpcb.js | 20 +-- examples/IotRollerBlinds/IotRollerBlinds.net | 8 +- .../IotRollerBlinds/IotRollerBlinds.svgpcb.js | 2 +- .../IotThermalCamera/IotThermalCamera.net | 26 +-- .../IotThermalCamera.svgpcb.js | 6 +- examples/Keyboard/Keyboard.net | 22 +-- examples/Keyboard/Keyboard.svgpcb.js | 4 +- examples/Multimeter/Multimeter.net | 90 +++++----- examples/Multimeter/Multimeter.svgpcb.js | 16 +- examples/PcbBot/PcbBot.net | 8 +- examples/PcbBot/PcbBot.svgpcb.js | 2 +- examples/PicoProbe/PicoProbe.net | 34 ++-- examples/PicoProbe/PicoProbe.svgpcb.js | 4 +- examples/RobotCrawler/RobotCrawler.net | 36 ++-- examples/RobotCrawler/RobotCrawler.svgpcb.js | 4 +- examples/RobotDriver/RobotDriver.net | 20 +-- examples/RobotDriver/RobotDriver.svgpcb.js | 4 +- examples/SwdDebugger/SwdDebugger.net | 28 +-- examples/SwdDebugger/SwdDebugger.svgpcb.js | 6 +- examples/TestBlinkyArray/TestBlinkyArray.net | 28 +-- .../TestBlinkyArray/TestBlinkyArray.svgpcb.js | 4 +- .../TestBlinkyBasicBattery.net | 6 +- .../TestBlinkyBasicBattery.svgpcb.js | 2 +- examples/TestBlinkyChain/TestBlinkyChain.net | 34 ++-- .../TestBlinkyChain/TestBlinkyChain.svgpcb.js | 6 +- .../TestBlinkyComplete/TestBlinkyComplete.net | 34 ++-- .../TestBlinkyComplete.svgpcb.js | 6 +- .../TestBlinkyExpanded/TestBlinkyExpanded.net | 34 ++-- .../TestBlinkyExpanded.svgpcb.js | 6 +- .../TestBlinkyImplicit/TestBlinkyImplicit.net | 34 ++-- .../TestBlinkyImplicit.svgpcb.js | 6 +- examples/TestBlinkyMicro/TestBlinkyMicro.net | 28 +-- .../TestBlinkyMicro/TestBlinkyMicro.svgpcb.js | 4 +- .../TestBlinkyPacked/TestBlinkyPacked.net | 28 +-- .../TestBlinkyPacked.svgpcb.js | 4 +- .../TestBlinkyWithLibrary.net | 28 +-- .../TestBlinkyWithLibrary.svgpcb.js | 4 +- .../TestBlinkyWithLibraryExport.net | 28 +-- .../TestBlinkyWithLibraryExport.svgpcb.js | 4 +- .../TestBlinkyWithModeledSchematicImport.net | 8 +- ...BlinkyWithModeledSchematicImport.svgpcb.js | 2 +- .../TestBlinkyWithSchematicImport.net | 8 +- .../TestBlinkyWithSchematicImport.svgpcb.js | 2 +- examples/TofArray/TofArray.net | 6 +- examples/TofArray/TofArray.svgpcb.js | 2 +- .../UsbFpgaProgrammer/UsbFpgaProgrammer.net | 26 +-- .../UsbFpgaProgrammer.svgpcb.js | 8 +- examples/UsbKey/UsbKey.net | 6 +- examples/UsbKey/UsbKey.svgpcb.js | 2 +- .../UsbSourceMeasure/UsbSourceMeasure.net | 136 +++++++------- .../UsbSourceMeasure.svgpcb.js | 28 +-- examples/UsbUart/UsbUart.net | 10 +- examples/UsbUart/UsbUart.svgpcb.js | 2 +- 84 files changed, 793 insertions(+), 793 deletions(-) diff --git a/examples/BasicKeyboard/BasicKeyboard.net b/examples/BasicKeyboard/BasicKeyboard.net index 91dbd94b7..089710820 100644 --- a/examples/BasicKeyboard/BasicKeyboard.net +++ b/examples/BasicKeyboard/BasicKeyboard.net @@ -179,10 +179,10 @@ (node (ref U1) (pin 10)) (node (ref D3) (pin 2)) (node (ref D6) (pin 2))) -(net (code 6) (name "mcu.pwr_out") - (node (ref U1) (pin 12))) -(net (code 7) (name "mcu.gnd") +(net (code 6) (name "mcu.gnd") (node (ref U1) (pin 13))) +(net (code 7) (name "mcu.pwr_out") + (node (ref U1) (pin 12))) (net (code 8) (name "mcu.vusb_out") (node (ref U1) (pin 14))) (net (code 9) (name "sw.d[0,0].cathode") diff --git a/examples/BasicKeyboard/BasicKeyboard.svgpcb.js b/examples/BasicKeyboard/BasicKeyboard.svgpcb.js index 4858f65c9..15d92a7d3 100644 --- a/examples/BasicKeyboard/BasicKeyboard.svgpcb.js +++ b/examples/BasicKeyboard/BasicKeyboard.svgpcb.js @@ -13,8 +13,8 @@ board.setNetlist([ {name: "mcu.gpio.1_0", pads: [["U1", "9"], ["D1", "2"], ["D4", "2"]]}, {name: "mcu.gpio.1_1", pads: [["U1", "11"], ["D2", "2"], ["D5", "2"]]}, {name: "mcu.gpio.1_2", pads: [["U1", "10"], ["D3", "2"], ["D6", "2"]]}, - {name: "mcu.pwr_out", pads: [["U1", "12"]]}, {name: "mcu.gnd", pads: [["U1", "13"]]}, + {name: "mcu.pwr_out", pads: [["U1", "12"]]}, {name: "mcu.vusb_out", pads: [["U1", "14"]]}, {name: "sw.d[0,0].cathode", pads: [["SW1", "1"], ["D1", "1"]]}, {name: "sw.d[0,1].cathode", pads: [["SW2", "1"], ["D2", "1"]]}, diff --git a/examples/BldcController/BldcController.net b/examples/BldcController/BldcController.net index 9d2cab86f..1a5226aed 100644 --- a/examples/BldcController/BldcController.net +++ b/examples/BldcController/BldcController.net @@ -1039,12 +1039,7 @@ (node (ref R11) (pin 2)) (node (ref R12) (pin 1)) (node (ref TP7) (pin 1))) -(net (code 26) (name "isense.out") - (node (ref U3) (pin 6)) - (node (ref R16) (pin 1)) - (node (ref TP8) (pin 1)) - (node (ref R18) (pin 1))) -(net (code 27) (name "isense.pwr_out") +(net (code 26) (name "isense.pwr_out") (node (ref R13) (pin 2)) (node (ref R14) (pin 1)) (node (ref U4) (pin 11)) @@ -1053,6 +1048,11 @@ (node (ref C4) (pin 1)) (node (ref C5) (pin 1)) (node (ref C8) (pin 2))) +(net (code 27) (name "isense.out") + (node (ref U3) (pin 6)) + (node (ref R16) (pin 1)) + (node (ref TP8) (pin 1)) + (node (ref R18) (pin 1))) (net (code 28) (name "isense.amp.r1.b") (node (ref U3) (pin 2)) (node (ref R14) (pin 2)) diff --git a/examples/BldcController/BldcController.svgpcb.js b/examples/BldcController/BldcController.svgpcb.js index fc0fa302b..3c385bb8e 100644 --- a/examples/BldcController/BldcController.svgpcb.js +++ b/examples/BldcController/BldcController.svgpcb.js @@ -397,8 +397,8 @@ board.setNetlist([ {name: "hall.phases.v", pads: [["U1", "24"], ["J3", "3"], ["R9", "2"], ["TP5", "1"]]}, {name: "hall.phases.w", pads: [["U1", "25"], ["J3", "4"], ["R10", "2"], ["TP6", "1"]]}, {name: "vsense.output", pads: [["U1", "6"], ["R11", "2"], ["R12", "1"], ["TP7", "1"]]}, - {name: "isense.out", pads: [["U3", "6"], ["R16", "1"], ["TP8", "1"], ["R18", "1"]]}, {name: "isense.pwr_out", pads: [["R13", "2"], ["R14", "1"], ["U4", "11"], ["U4", "4"], ["C3", "1"], ["C4", "1"], ["C5", "1"], ["C8", "2"]]}, + {name: "isense.out", pads: [["U3", "6"], ["R16", "1"], ["TP8", "1"], ["R18", "1"]]}, {name: "isense.amp.r1.b", pads: [["U3", "2"], ["R14", "2"], ["R16", "2"]]}, {name: "isense.amp.r2.b", pads: [["U3", "3"], ["R15", "2"], ["R17", "2"]]}, {name: "isense_clamp.signal_out", pads: [["U1", "5"], ["R18", "2"]]}, diff --git a/examples/BleJoystick/BleJoystick.net b/examples/BleJoystick/BleJoystick.net index 98a5383af..67392bc1c 100644 --- a/examples/BleJoystick/BleJoystick.net +++ b/examples/BleJoystick/BleJoystick.net @@ -656,44 +656,44 @@ (net (code 6) (name "Jusb.usb.dm") (node (ref JJ2) (pin A7)) (node (ref JJ2) (pin B7))) -(net (code 7) (name "Jmp2722.cc.cc1") - (node (ref JJ2) (pin A5)) - (node (ref JU1) (pin 1))) -(net (code 8) (name "Jmp2722.cc.cc2") - (node (ref JJ2) (pin B5)) - (node (ref JU1) (pin 22))) -(net (code 9) (name "Jmp2722.pwr_out") +(net (code 7) (name "Jmp2722.pwr_out") (node (ref JU1) (pin 13)) (node (ref JL1) (pin 2)) (node (ref JC6) (pin 1)) (node (ref JU2) (pin 2)) (node (ref JC7) (pin 1))) -(net (code 10) (name "Jmp2722.vrntc") +(net (code 8) (name "Jmp2722.vrntc") (node (ref JU1) (pin 7)) (node (ref JR1) (pin 1))) -(net (code 11) (name "Jmp2722.int") +(net (code 9) (name "Jmp2722.int") (node (ref JU1) (pin 8))) -(net (code 12) (name "Jmp2722.stat") +(net (code 10) (name "Jmp2722.stat") (node (ref JU1) (pin 11))) -(net (code 13) (name "Jmp2722.pg") +(net (code 11) (name "Jmp2722.pg") (node (ref JU1) (pin 9))) -(net (code 14) (name "Jmp2722.usb.dp") +(net (code 12) (name "Jmp2722.usb.dp") (node (ref JU1) (pin 21))) -(net (code 15) (name "Jmp2722.usb.dm") +(net (code 13) (name "Jmp2722.usb.dm") (node (ref JU1) (pin 20))) +(net (code 14) (name "Jmp2722.cc.cc1") + (node (ref JJ2) (pin A5)) + (node (ref JU1) (pin 1))) +(net (code 15) (name "Jmp2722.cc.cc2") + (node (ref JJ2) (pin B5)) + (node (ref JU1) (pin 22))) (net (code 16) (name "Jmp2722.ic.pmid") (node (ref JU1) (pin 3)) (node (ref JC2) (pin 1))) (net (code 17) (name "Jmp2722.ic.vcc") (node (ref JU1) (pin 19)) (node (ref JC4) (pin 1))) -(net (code 18) (name "Jmp2722.vbst_cap.neg") +(net (code 18) (name "Jmp2722.vbst_cap.pos") + (node (ref JU1) (pin 6)) + (node (ref JC1) (pin 1))) +(net (code 19) (name "Jmp2722.vbst_cap.neg") (node (ref JU1) (pin 4)) (node (ref JC1) (pin 2)) (node (ref JL1) (pin 1))) -(net (code 19) (name "Jmp2722.vbst_cap.pos") - (node (ref JU1) (pin 6)) - (node (ref JC1) (pin 1))) (net (code 20) (name "Jfake_ntc.output") (node (ref JU1) (pin 10)) (node (ref JR1) (pin 2)) @@ -714,16 +714,16 @@ (node (ref JJ3) (pin 2)) (node (ref JSW1) (pin 1)) (node (ref JR10) (pin 2))) -(net (code 25) (name "Jstick.ax1") +(net (code 25) (name "Jstick.sw") + (node (ref JU1) (pin 17)) + (node (ref JU3) (pin 5)) + (node (ref JU4) (pin 1))) +(net (code 26) (name "Jstick.ax1") (node (ref JU4) (pin 4)) (node (ref JR4) (pin 1))) -(net (code 26) (name "Jstick.ax2") +(net (code 27) (name "Jstick.ax2") (node (ref JU4) (pin 7)) (node (ref JR6) (pin 1))) -(net (code 27) (name "Jstick.sw") - (node (ref JU1) (pin 17)) - (node (ref JU3) (pin 5)) - (node (ref JU4) (pin 1))) (net (code 28) (name "Jax1_div.output") (node (ref JU3) (pin 3)) (node (ref JR4) (pin 2)) diff --git a/examples/BleJoystick/BleJoystick.svgpcb.js b/examples/BleJoystick/BleJoystick.svgpcb.js index bf33d1512..cc9a9370f 100644 --- a/examples/BleJoystick/BleJoystick.svgpcb.js +++ b/examples/BleJoystick/BleJoystick.svgpcb.js @@ -248,8 +248,6 @@ board.setNetlist([ {name: "Jv3v3", pads: [["JU2", "3"], ["JC8", "1"], ["JTP4", "1"], ["JD1", "1"], ["JU3", "1"], ["JU3", "16"], ["JU3", "7"], ["JC9", "1"], ["JC10", "1"], ["JJ3", "1"], ["JR3", "1"], ["JU4", "5"], ["JU4", "6"], ["JU5", "1"], ["JC12", "1"], ["JD2", "2"], ["JR13", "1"], ["JR14", "1"]]}, {name: "Jusb.usb.dp", pads: [["JJ2", "A6"], ["JJ2", "B6"]]}, {name: "Jusb.usb.dm", pads: [["JJ2", "A7"], ["JJ2", "B7"]]}, - {name: "Jmp2722.cc.cc1", pads: [["JJ2", "A5"], ["JU1", "1"]]}, - {name: "Jmp2722.cc.cc2", pads: [["JJ2", "B5"], ["JU1", "22"]]}, {name: "Jmp2722.pwr_out", pads: [["JU1", "13"], ["JL1", "2"], ["JC6", "1"], ["JU2", "2"], ["JC7", "1"]]}, {name: "Jmp2722.vrntc", pads: [["JU1", "7"], ["JR1", "1"]]}, {name: "Jmp2722.int", pads: [["JU1", "8"]]}, @@ -257,18 +255,20 @@ board.setNetlist([ {name: "Jmp2722.pg", pads: [["JU1", "9"]]}, {name: "Jmp2722.usb.dp", pads: [["JU1", "21"]]}, {name: "Jmp2722.usb.dm", pads: [["JU1", "20"]]}, + {name: "Jmp2722.cc.cc1", pads: [["JJ2", "A5"], ["JU1", "1"]]}, + {name: "Jmp2722.cc.cc2", pads: [["JJ2", "B5"], ["JU1", "22"]]}, {name: "Jmp2722.ic.pmid", pads: [["JU1", "3"], ["JC2", "1"]]}, {name: "Jmp2722.ic.vcc", pads: [["JU1", "19"], ["JC4", "1"]]}, - {name: "Jmp2722.vbst_cap.neg", pads: [["JU1", "4"], ["JC1", "2"], ["JL1", "1"]]}, {name: "Jmp2722.vbst_cap.pos", pads: [["JU1", "6"], ["JC1", "1"]]}, + {name: "Jmp2722.vbst_cap.neg", pads: [["JU1", "4"], ["JC1", "2"], ["JL1", "1"]]}, {name: "Jfake_ntc.output", pads: [["JU1", "10"], ["JR1", "2"], ["JR2", "1"]]}, {name: "Jmcu.program_uart_node.a_tx", pads: [["JU3", "12"], ["JJ3", "3"]]}, {name: "Jmcu.program_uart_node.b_tx", pads: [["JU3", "11"], ["JJ3", "4"]]}, {name: "Jmcu.program_en_node", pads: [["JU3", "2"], ["JJ3", "6"], ["JR3", "2"], ["JC11", "1"]]}, {name: "Jmcu.program_boot_node", pads: [["JU3", "8"], ["JJ3", "2"], ["JSW1", "1"], ["JR10", "2"]]}, + {name: "Jstick.sw", pads: [["JU1", "17"], ["JU3", "5"], ["JU4", "1"]]}, {name: "Jstick.ax1", pads: [["JU4", "4"], ["JR4", "1"]]}, {name: "Jstick.ax2", pads: [["JU4", "7"], ["JR6", "1"]]}, - {name: "Jstick.sw", pads: [["JU1", "17"], ["JU3", "5"], ["JU4", "1"]]}, {name: "Jax1_div.output", pads: [["JU3", "3"], ["JR4", "2"], ["JR5", "1"]]}, {name: "Jax2_div.output", pads: [["JU3", "15"], ["JR6", "2"], ["JR7", "1"]]}, {name: "Jtrig.out", pads: [["JU5", "2"], ["JR8", "1"]]}, diff --git a/examples/CanAdapter/CanAdapter.net b/examples/CanAdapter/CanAdapter.net index a23217c95..76465b8f5 100644 --- a/examples/CanAdapter/CanAdapter.net +++ b/examples/CanAdapter/CanAdapter.net @@ -422,13 +422,13 @@ (node (ref OU2) (pin 4)) (node (ref OR1) (pin 2)) (node (ref OR2) (pin 1))) -(net (code 6) (name "Oreg_3v3.boot_cap.neg") +(net (code 6) (name "Oreg_3v3.boot_cap.pos") + (node (ref OU2) (pin 6)) + (node (ref OC2) (pin 1))) +(net (code 7) (name "Oreg_3v3.boot_cap.neg") (node (ref OU2) (pin 2)) (node (ref OC2) (pin 2)) (node (ref OL1) (pin 1))) -(net (code 7) (name "Oreg_3v3.boot_cap.pos") - (node (ref OU2) (pin 6)) - (node (ref OC2) (pin 1))) (net (code 8) (name "Oreg_3v3.en_res.b") (node (ref OU2) (pin 5)) (node (ref OR3) (pin 2))) @@ -447,18 +447,18 @@ (node (ref OU3) (pin 8)) (node (ref OJ1) (pin 2)) (node (ref OR5) (pin 2))) -(net (code 13) (name "Ocan.can.canh") - (node (ref OU1) (pin 6)) - (node (ref OU4) (pin 7))) -(net (code 14) (name "Ocan.can.canl") - (node (ref OU1) (pin 14)) - (node (ref OU4) (pin 6))) -(net (code 15) (name "Ocan.controller.txd") +(net (code 13) (name "Ocan.controller.txd") (node (ref OU3) (pin 6)) (node (ref OU4) (pin 1))) -(net (code 16) (name "Ocan.controller.rxd") +(net (code 14) (name "Ocan.controller.rxd") (node (ref OU3) (pin 5)) (node (ref OU4) (pin 4))) +(net (code 15) (name "Ocan.can.canh") + (node (ref OU1) (pin 6)) + (node (ref OU4) (pin 7))) +(net (code 16) (name "Ocan.can.canl") + (node (ref OU1) (pin 14)) + (node (ref OU4) (pin 6))) (net (code 17) (name "Oledr.res.a") (node (ref OD2) (pin 1)) (node (ref OR5) (pin 1))) diff --git a/examples/CanAdapter/CanAdapter.svgpcb.js b/examples/CanAdapter/CanAdapter.svgpcb.js index e3259e85a..1736cb591 100644 --- a/examples/CanAdapter/CanAdapter.svgpcb.js +++ b/examples/CanAdapter/CanAdapter.svgpcb.js @@ -162,17 +162,17 @@ board.setNetlist([ {name: "Ov3v3", pads: [["OR1", "1"], ["OL1", "2"], ["OC4", "1"], ["OD1", "1"], ["OU3", "1"], ["OU3", "16"], ["OU3", "7"], ["OC5", "1"], ["OC6", "1"], ["OJ1", "1"], ["OR4", "1"], ["OU4", "3"], ["OC8", "1"], ["OD2", "2"]]}, {name: "Oobd.pwr", pads: [["OU1", "16"], ["OFB1", "1"]]}, {name: "Oreg_3v3.fb.output", pads: [["OU2", "4"], ["OR1", "2"], ["OR2", "1"]]}, - {name: "Oreg_3v3.boot_cap.neg", pads: [["OU2", "2"], ["OC2", "2"], ["OL1", "1"]]}, {name: "Oreg_3v3.boot_cap.pos", pads: [["OU2", "6"], ["OC2", "1"]]}, + {name: "Oreg_3v3.boot_cap.neg", pads: [["OU2", "2"], ["OC2", "2"], ["OL1", "1"]]}, {name: "Oreg_3v3.en_res.b", pads: [["OU2", "5"], ["OR3", "2"]]}, {name: "Omcu.program_uart_node.a_tx", pads: [["OU3", "12"], ["OJ1", "3"]]}, {name: "Omcu.program_uart_node.b_tx", pads: [["OU3", "11"], ["OJ1", "4"]]}, {name: "Omcu.program_en_node", pads: [["OU3", "2"], ["OJ1", "6"], ["OR4", "2"], ["OC7", "1"]]}, {name: "Omcu.program_boot_node", pads: [["OU3", "8"], ["OJ1", "2"], ["OR5", "2"]]}, - {name: "Ocan.can.canh", pads: [["OU1", "6"], ["OU4", "7"]]}, - {name: "Ocan.can.canl", pads: [["OU1", "14"], ["OU4", "6"]]}, {name: "Ocan.controller.txd", pads: [["OU3", "6"], ["OU4", "1"]]}, {name: "Ocan.controller.rxd", pads: [["OU3", "5"], ["OU4", "4"]]}, + {name: "Ocan.can.canh", pads: [["OU1", "6"], ["OU4", "7"]]}, + {name: "Ocan.can.canl", pads: [["OU1", "14"], ["OU4", "6"]]}, {name: "Oledr.res.a", pads: [["OD2", "1"], ["OR5", "1"]]}, {name: "Oledg.signal", pads: [["OU3", "13"], ["OD3", "2"]]}, {name: "Oledg.res.a", pads: [["OD3", "1"], ["OR6", "1"]]}, diff --git a/examples/Datalogger/Datalogger.net b/examples/Datalogger/Datalogger.net index 2634dceb2..3b817bd7b 100644 --- a/examples/Datalogger/Datalogger.net +++ b/examples/Datalogger/Datalogger.net @@ -1448,13 +1448,13 @@ (node (ref U2) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 11) (name "pwr_5v.vbst_cap.neg") +(net (code 11) (name "pwr_5v.vbst_cap.pos") + (node (ref U2) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 12) (name "pwr_5v.vbst_cap.neg") (node (ref U2) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 12) (name "pwr_5v.vbst_cap.pos") - (node (ref U2) (pin 6)) - (node (ref C2) (pin 1))) (net (code 13) (name "buffer.sc_out") (node (ref Q1) (pin 2)) (node (ref D1) (pin 2)) @@ -1517,11 +1517,11 @@ (net (code 30) (name "mcu.reset_node") (node (ref J3) (pin 10)) (node (ref U5) (pin 45))) -(net (code 31) (name "mcu.swd.swo") +(net (code 31) (name "mcu.swd.tdi") + (node (ref J3) (pin 8))) +(net (code 32) (name "mcu.swd.swo") (node (ref J3) (pin 6)) (node (ref U5) (pin 12))) -(net (code 32) (name "mcu.swd.tdi") - (node (ref J3) (pin 8))) (net (code 33) (name "mcu.ic.xtal_rtc.xtal_in") (node (ref U5) (pin 42))) (net (code 34) (name "mcu.ic.xtal_rtc.xtal_out") @@ -1579,17 +1579,17 @@ (node (ref U5) (pin 16)) (node (ref J5) (pin 10)) (node (ref R10) (pin 2))) -(net (code 49) (name "xbee.data.rx") - (node (ref U5) (pin 58)) - (node (ref U9) (pin 3))) -(net (code 50) (name "xbee.data.tx") +(net (code 49) (name "xbee.data.tx") (node (ref U5) (pin 50)) (node (ref U9) (pin 2))) -(net (code 51) (name "xbee.associate") +(net (code 50) (name "xbee.data.rx") + (node (ref U5) (pin 58)) + (node (ref U9) (pin 3))) +(net (code 51) (name "xbee.rssi") + (node (ref U9) (pin 6))) +(net (code 52) (name "xbee.associate") (node (ref U9) (pin 15)) (node (ref D2) (pin 2))) -(net (code 52) (name "xbee.rssi") - (node (ref U9) (pin 6))) (net (code 53) (name "xbee_assoc.res.a") (node (ref D2) (pin 1)) (node (ref R11) (pin 1))) @@ -1657,13 +1657,13 @@ (net (code 73) (name "eink.ic.vcom") (node (ref U11) (pin 1)) (node (ref C43) (pin 1))) -(net (code 74) (name "eink.boost_sw.gate") - (node (ref U11) (pin 23)) - (node (ref Q2) (pin 1))) -(net (code 75) (name "eink.boost_sw.source") +(net (code 74) (name "eink.boost_sw.source") (node (ref U11) (pin 22)) (node (ref Q2) (pin 2)) (node (ref R13) (pin 1))) +(net (code 75) (name "eink.boost_sw.gate") + (node (ref U11) (pin 23)) + (node (ref Q2) (pin 1))) (net (code 76) (name "eink.boost_ind.b") (node (ref Q2) (pin 3)) (node (ref L2) (pin 2)) @@ -1673,12 +1673,12 @@ (node (ref C33) (pin 2)) (node (ref D4) (pin 1)) (node (ref D5) (pin 2))) -(net (code 78) (name "ext.data.rx") - (node (ref U5) (pin 60)) - (node (ref U12) (pin 5))) -(net (code 79) (name "ext.data.tx") +(net (code 78) (name "ext.data.tx") (node (ref U5) (pin 61)) (node (ref U12) (pin 4))) +(net (code 79) (name "ext.data.rx") + (node (ref U5) (pin 60)) + (node (ref U12) (pin 5))) (net (code 80) (name "ext.cts") (node (ref U5) (pin 62)) (node (ref U12) (pin 1))) diff --git a/examples/Datalogger/Datalogger.svgpcb.js b/examples/Datalogger/Datalogger.svgpcb.js index 665c87042..19ace087a 100644 --- a/examples/Datalogger/Datalogger.svgpcb.js +++ b/examples/Datalogger/Datalogger.svgpcb.js @@ -542,8 +542,8 @@ board.setNetlist([ {name: "usb_conn.conn.cc.cc2", pads: [["J2", "B5"], ["R2", "2"]]}, {name: "bat.pwr", pads: [["U1", "1"], ["U10", "15"], ["C31", "1"]]}, {name: "pwr_5v.fb.output", pads: [["U2", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "pwr_5v.vbst_cap.neg", pads: [["U2", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "pwr_5v.vbst_cap.pos", pads: [["U2", "6"], ["C2", "1"]]}, + {name: "pwr_5v.vbst_cap.neg", pads: [["U2", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "buffer.sc_out", pads: [["Q1", "2"], ["D1", "2"], ["C6", "1"], ["R29", "1"]]}, {name: "buffer.fet.source", pads: [["R5", "2"], ["Q1", "3"], ["U3", "4"]]}, {name: "buffer.fet.gate", pads: [["Q1", "1"], ["U3", "1"]]}, @@ -562,8 +562,8 @@ board.setNetlist([ {name: "mcu.swd_node.swdio", pads: [["J3", "2"], ["U5", "44"], ["R8", "2"]]}, {name: "mcu.swd_node.swclk", pads: [["J3", "4"], ["U5", "40"], ["R9", "2"]]}, {name: "mcu.reset_node", pads: [["J3", "10"], ["U5", "45"]]}, - {name: "mcu.swd.swo", pads: [["J3", "6"], ["U5", "12"]]}, {name: "mcu.swd.tdi", pads: [["J3", "8"]]}, + {name: "mcu.swd.swo", pads: [["J3", "6"], ["U5", "12"]]}, {name: "mcu.ic.xtal_rtc.xtal_in", pads: [["U5", "42"]]}, {name: "mcu.ic.xtal_rtc.xtal_out", pads: [["U5", "43"]]}, {name: "can.controller.txd", pads: [["U5", "51"], ["U8", "3"]]}, @@ -580,10 +580,10 @@ board.setNetlist([ {name: "sd.cs", pads: [["U5", "11"], ["J5", "1"]]}, {name: "sd.wp", pads: [["J5", "11"]]}, {name: "cd_pull.io", pads: [["U5", "16"], ["J5", "10"], ["R10", "2"]]}, - {name: "xbee.data.rx", pads: [["U5", "58"], ["U9", "3"]]}, {name: "xbee.data.tx", pads: [["U5", "50"], ["U9", "2"]]}, - {name: "xbee.associate", pads: [["U9", "15"], ["D2", "2"]]}, + {name: "xbee.data.rx", pads: [["U5", "58"], ["U9", "3"]]}, {name: "xbee.rssi", pads: [["U9", "6"]]}, + {name: "xbee.associate", pads: [["U9", "15"], ["D2", "2"]]}, {name: "xbee_assoc.res.a", pads: [["D2", "1"], ["R11", "1"]]}, {name: "rtc.spi.sck", pads: [["U5", "5"], ["U10", "1"], ["U11", "12"]]}, {name: "rtc.spi.mosi", pads: [["U5", "6"], ["U10", "2"], ["U11", "11"]]}, @@ -605,12 +605,12 @@ board.setNetlist([ {name: "eink.ic.vdl", pads: [["U11", "3"], ["C41", "1"]]}, {name: "eink.ic.vgl", pads: [["U11", "2"], ["C42", "1"], ["D4", "2"]]}, {name: "eink.ic.vcom", pads: [["U11", "1"], ["C43", "1"]]}, - {name: "eink.boost_sw.gate", pads: [["U11", "23"], ["Q2", "1"]]}, {name: "eink.boost_sw.source", pads: [["U11", "22"], ["Q2", "2"], ["R13", "1"]]}, + {name: "eink.boost_sw.gate", pads: [["U11", "23"], ["Q2", "1"]]}, {name: "eink.boost_ind.b", pads: [["Q2", "3"], ["L2", "2"], ["C33", "1"], ["D3", "2"]]}, {name: "eink.vgl_dio.cathode", pads: [["C33", "2"], ["D4", "1"], ["D5", "2"]]}, - {name: "ext.data.rx", pads: [["U5", "60"], ["U12", "5"]]}, {name: "ext.data.tx", pads: [["U5", "61"], ["U12", "4"]]}, + {name: "ext.data.rx", pads: [["U5", "60"], ["U12", "5"]]}, {name: "ext.cts", pads: [["U5", "62"], ["U12", "1"]]}, {name: "ext.rts", pads: [["U5", "59"], ["U12", "6"]]}, {name: "rgb1.red_res.a", pads: [["D6", "3"], ["R14", "1"]]}, diff --git a/examples/DeskController/DeskController.net b/examples/DeskController/DeskController.net index 460626805..801348b7d 100644 --- a/examples/DeskController/DeskController.net +++ b/examples/DeskController/DeskController.net @@ -1004,14 +1004,14 @@ (net (code 8) (name "Dconn.pwr") (node (ref DJ1) (pin 4)) (node (ref DFB1) (pin 1))) -(net (code 9) (name "Dconn.uart.rx") - (node (ref DQ2) (pin 2)) - (node (ref DR2) (pin 2)) - (node (ref DU2) (pin 4))) -(net (code 10) (name "Dconn.uart.tx") +(net (code 9) (name "Dconn.uart.tx") (node (ref DQ1) (pin 2)) (node (ref DR1) (pin 2)) (node (ref DU2) (pin 3))) +(net (code 10) (name "Dconn.uart.rx") + (node (ref DQ2) (pin 2)) + (node (ref DR2) (pin 2)) + (node (ref DU2) (pin 4))) (net (code 11) (name "Dconn.dtx_shift.hv_io") (node (ref DJ1) (pin 3)) (node (ref DQ1) (pin 3))) @@ -1079,12 +1079,12 @@ (net (code 29) (name "Doled.reset") (node (ref DU2) (pin 16)) (node (ref DJ3) (pin 17))) -(net (code 30) (name "Doled.device.vcomh") - (node (ref DJ3) (pin 4)) - (node (ref DC8) (pin 1))) -(net (code 31) (name "Doled.device.vcc") +(net (code 30) (name "Doled.device.vcc") (node (ref DJ3) (pin 3)) (node (ref DC11) (pin 1))) +(net (code 31) (name "Doled.device.vcomh") + (node (ref DJ3) (pin 4)) + (node (ref DC8) (pin 1))) (net (code 32) (name "Doled.c1_cap.pos") (node (ref DJ3) (pin 27)) (node (ref DC6) (pin 1))) diff --git a/examples/DeskController/DeskController.svgpcb.js b/examples/DeskController/DeskController.svgpcb.js index c9de88ef8..ba4136d36 100644 --- a/examples/DeskController/DeskController.svgpcb.js +++ b/examples/DeskController/DeskController.svgpcb.js @@ -321,8 +321,8 @@ board.setNetlist([ {name: "Dspk_chain_2.a", pads: [["DU4", "8"], ["DJ4", "1"]]}, {name: "Dspk_chain_2.b", pads: [["DU4", "5"], ["DJ4", "2"]]}, {name: "Dconn.pwr", pads: [["DJ1", "4"], ["DFB1", "1"]]}, - {name: "Dconn.uart.rx", pads: [["DQ2", "2"], ["DR2", "2"], ["DU2", "4"]]}, {name: "Dconn.uart.tx", pads: [["DQ1", "2"], ["DR1", "2"], ["DU2", "3"]]}, + {name: "Dconn.uart.rx", pads: [["DQ2", "2"], ["DR2", "2"], ["DU2", "4"]]}, {name: "Dconn.dtx_shift.hv_io", pads: [["DJ1", "3"], ["DQ1", "3"]]}, {name: "Dconn.htx_shift.hv_io", pads: [["DJ1", "5"], ["DQ2", "3"]]}, {name: "Dmcu.gpio.swc_0", pads: [["DU2", "5"], ["DSW1", "2"], ["DSW2", "2"], ["DSW3", "2"]]}, @@ -342,8 +342,8 @@ board.setNetlist([ {name: "Dsw.d[1,2].cathode", pads: [["DSW6", "1"], ["DD7", "1"]]}, {name: "Dledr.res.a", pads: [["DD8", "1"], ["DR4", "1"]]}, {name: "Doled.reset", pads: [["DU2", "16"], ["DJ3", "17"]]}, - {name: "Doled.device.vcomh", pads: [["DJ3", "4"], ["DC8", "1"]]}, {name: "Doled.device.vcc", pads: [["DJ3", "3"], ["DC11", "1"]]}, + {name: "Doled.device.vcomh", pads: [["DJ3", "4"], ["DC8", "1"]]}, {name: "Doled.c1_cap.pos", pads: [["DJ3", "27"], ["DC6", "1"]]}, {name: "Doled.c1_cap.neg", pads: [["DJ3", "26"], ["DC6", "2"]]}, {name: "Doled.c2_cap.pos", pads: [["DJ3", "29"], ["DC7", "1"]]}, diff --git a/examples/EspLora/EspLora.net b/examples/EspLora/EspLora.net index af2737ba4..01f392fd7 100644 --- a/examples/EspLora/EspLora.net +++ b/examples/EspLora/EspLora.net @@ -1453,16 +1453,16 @@ (node (ref LU4) (pin 7)) (node (ref LC6) (pin 1)) (node (ref LL1) (pin 2))) -(net (code 21) (name "Llora.ic.vr_pa") - (node (ref LU4) (pin 24)) - (node (ref LC9) (pin 1)) - (node (ref LC10) (pin 1)) - (node (ref LL2) (pin 1))) -(net (code 22) (name "Llora.ic.rfo") +(net (code 21) (name "Llora.ic.rfo") (node (ref LU4) (pin 23)) (node (ref LL2) (pin 2)) (node (ref LL3) (pin 1)) (node (ref LC13) (pin 2))) +(net (code 22) (name "Llora.ic.vr_pa") + (node (ref LU4) (pin 24)) + (node (ref LC9) (pin 1)) + (node (ref LC10) (pin 1)) + (node (ref LL2) (pin 1))) (net (code 23) (name "Llora.ic.dio3") (node (ref LU4) (pin 6))) (net (code 24) (name "Llora.xtal.crystal.xtal_in") @@ -1486,13 +1486,13 @@ (net (code 30) (name "Llora.tx_dcblock.pos") (node (ref LU5) (pin 1)) (node (ref LC11) (pin 1))) -(net (code 31) (name "Llora.rfc_dcblock.neg") - (node (ref LU5) (pin 5)) - (node (ref LC12) (pin 2))) -(net (code 32) (name "Llora.rfc_dcblock.pos") +(net (code 31) (name "Llora.rfc_dcblock.pos") (node (ref LC12) (pin 1)) (node (ref LC17) (pin 1)) (node (ref LL6) (pin 1))) +(net (code 32) (name "Llora.rfc_dcblock.neg") + (node (ref LU5) (pin 5)) + (node (ref LC12) (pin 2))) (net (code 33) (name "Llora.tx_pi.output") (node (ref LC11) (pin 2)) (node (ref LC14) (pin 1)) @@ -1549,12 +1549,12 @@ (node (ref LJ4) (pin 19)) (node (ref LJ4) (pin 20)) (node (ref LU8) (pin 5))) -(net (code 46) (name "Loled.device.vcomh") - (node (ref LJ4) (pin 27)) - (node (ref LC21) (pin 1))) -(net (code 47) (name "Loled.device.vcc") +(net (code 46) (name "Loled.device.vcc") (node (ref LJ4) (pin 28)) (node (ref LC24) (pin 1))) +(net (code 47) (name "Loled.device.vcomh") + (node (ref LJ4) (pin 27)) + (node (ref LC21) (pin 1))) (net (code 48) (name "Loled.c1_cap.pos") (node (ref LJ4) (pin 4)) (node (ref LC19) (pin 1))) @@ -1598,15 +1598,15 @@ (node (ref LU8) (pin 31)) (node (ref LC28) (pin 1)) (node (ref LC29) (pin 1))) -(net (code 61) (name "Lnfc.ic.vddtx") +(net (code 61) (name "Lnfc.ic.vddmid") + (node (ref LU8) (pin 17)) + (node (ref LC33) (pin 1))) +(net (code 62) (name "Lnfc.ic.vddtx") (node (ref LU8) (pin 14)) (node (ref LU8) (pin 18)) (node (ref LU8) (pin 22)) (node (ref LC30) (pin 1)) (node (ref LC31) (pin 1))) -(net (code 62) (name "Lnfc.ic.vddmid") - (node (ref LU8) (pin 17)) - (node (ref LC33) (pin 1))) (net (code 63) (name "Lnfc.ic.xtal.xtal_in") (node (ref LU8) (pin 30)) (node (ref LX2) (pin 1)) @@ -1615,18 +1615,18 @@ (node (ref LU8) (pin 29)) (node (ref LX2) (pin 3)) (node (ref LC35) (pin 1))) -(net (code 65) (name "Lnfc.ic.rxp") - (node (ref LU8) (pin 16)) - (node (ref LC36) (pin 2))) -(net (code 66) (name "Lnfc.ic.rxn") - (node (ref LU8) (pin 15)) - (node (ref LC37) (pin 2))) -(net (code 67) (name "Lnfc.ic.tx1") +(net (code 65) (name "Lnfc.ic.tx1") (node (ref LU8) (pin 21)) (node (ref LL7) (pin 1))) -(net (code 68) (name "Lnfc.ic.tx2") +(net (code 66) (name "Lnfc.ic.tx2") (node (ref LU8) (pin 19)) (node (ref LL8) (pin 1))) +(net (code 67) (name "Lnfc.ic.rxp") + (node (ref LU8) (pin 16)) + (node (ref LC36) (pin 2))) +(net (code 68) (name "Lnfc.ic.rxn") + (node (ref LU8) (pin 15)) + (node (ref LC37) (pin 2))) (net (code 69) (name "Lnfc.rx.rrx1.b") (node (ref LR13) (pin 2)) (node (ref LC36) (pin 1))) diff --git a/examples/EspLora/EspLora.svgpcb.js b/examples/EspLora/EspLora.svgpcb.js index f259b3f76..616985652 100644 --- a/examples/EspLora/EspLora.svgpcb.js +++ b/examples/EspLora/EspLora.svgpcb.js @@ -547,8 +547,8 @@ board.setNetlist([ {name: "Lledb.res.a", pads: [["LD4", "1"], ["LR6", "1"]]}, {name: "Llora.busy", pads: [["LU2", "33"], ["LU4", "14"], ["LTP10", "1"]]}, {name: "Llora.ic.vreg", pads: [["LU4", "7"], ["LC6", "1"], ["LL1", "2"]]}, - {name: "Llora.ic.vr_pa", pads: [["LU4", "24"], ["LC9", "1"], ["LC10", "1"], ["LL2", "1"]]}, {name: "Llora.ic.rfo", pads: [["LU4", "23"], ["LL2", "2"], ["LL3", "1"], ["LC13", "2"]]}, + {name: "Llora.ic.vr_pa", pads: [["LU4", "24"], ["LC9", "1"], ["LC10", "1"], ["LL2", "1"]]}, {name: "Llora.ic.dio3", pads: [["LU4", "6"]]}, {name: "Llora.xtal.crystal.xtal_in", pads: [["LU4", "3"], ["LX1", "1"]]}, {name: "Llora.xtal.crystal.xtal_out", pads: [["LU4", "4"], ["LX1", "3"]]}, @@ -557,8 +557,8 @@ board.setNetlist([ {name: "Llora.rf_sw.vdd_res.b", pads: [["LU5", "6"], ["LR7", "2"]]}, {name: "Llora.rf_sw.ctrl_res.b", pads: [["LU5", "4"], ["LR8", "2"]]}, {name: "Llora.tx_dcblock.pos", pads: [["LU5", "1"], ["LC11", "1"]]}, - {name: "Llora.rfc_dcblock.neg", pads: [["LU5", "5"], ["LC12", "2"]]}, {name: "Llora.rfc_dcblock.pos", pads: [["LC12", "1"], ["LC17", "1"], ["LL6", "1"]]}, + {name: "Llora.rfc_dcblock.neg", pads: [["LU5", "5"], ["LC12", "2"]]}, {name: "Llora.tx_pi.output", pads: [["LC11", "2"], ["LC14", "1"], ["LL4", "2"]]}, {name: "Llora.balun.input", pads: [["LU5", "3"], ["LC15", "1"]]}, {name: "Llora.balun.rfi_n", pads: [["LU4", "22"], ["LL5", "1"], ["LC15", "2"]]}, @@ -572,8 +572,8 @@ board.setNetlist([ {name: "Ltp_lora_dio.io", pads: [["LU2", "31"], ["LU4", "13"], ["LTP9", "1"]]}, {name: "Li2c_pull.i2c.scl", pads: [["LU2", "10"], ["LR9", "2"], ["LTP11", "1"], ["LJ4", "18"], ["LU8", "7"]]}, {name: "Li2c_pull.i2c.sda", pads: [["LU2", "11"], ["LR10", "2"], ["LTP12", "1"], ["LJ4", "19"], ["LJ4", "20"], ["LU8", "5"]]}, - {name: "Loled.device.vcomh", pads: [["LJ4", "27"], ["LC21", "1"]]}, {name: "Loled.device.vcc", pads: [["LJ4", "28"], ["LC24", "1"]]}, + {name: "Loled.device.vcomh", pads: [["LJ4", "27"], ["LC21", "1"]]}, {name: "Loled.c1_cap.pos", pads: [["LJ4", "4"], ["LC19", "1"]]}, {name: "Loled.c1_cap.neg", pads: [["LJ4", "5"], ["LC19", "2"]]}, {name: "Loled.c2_cap.pos", pads: [["LJ4", "2"], ["LC20", "1"]]}, @@ -587,14 +587,14 @@ board.setNetlist([ {name: "Lnfc.reset", pads: [["LU2", "32"], ["LU8", "10"]]}, {name: "Lnfc.irq", pads: [["LU2", "24"], ["LU8", "8"]]}, {name: "Lnfc.ic.vdd", pads: [["LU8", "26"], ["LU8", "27"], ["LU8", "31"], ["LC28", "1"], ["LC29", "1"]]}, - {name: "Lnfc.ic.vddtx", pads: [["LU8", "14"], ["LU8", "18"], ["LU8", "22"], ["LC30", "1"], ["LC31", "1"]]}, {name: "Lnfc.ic.vddmid", pads: [["LU8", "17"], ["LC33", "1"]]}, + {name: "Lnfc.ic.vddtx", pads: [["LU8", "14"], ["LU8", "18"], ["LU8", "22"], ["LC30", "1"], ["LC31", "1"]]}, {name: "Lnfc.ic.xtal.xtal_in", pads: [["LU8", "30"], ["LX2", "1"], ["LC34", "1"]]}, {name: "Lnfc.ic.xtal.xtal_out", pads: [["LU8", "29"], ["LX2", "3"], ["LC35", "1"]]}, - {name: "Lnfc.ic.rxp", pads: [["LU8", "16"], ["LC36", "2"]]}, - {name: "Lnfc.ic.rxn", pads: [["LU8", "15"], ["LC37", "2"]]}, {name: "Lnfc.ic.tx1", pads: [["LU8", "21"], ["LL7", "1"]]}, {name: "Lnfc.ic.tx2", pads: [["LU8", "19"], ["LL8", "1"]]}, + {name: "Lnfc.ic.rxp", pads: [["LU8", "16"], ["LC36", "2"]]}, + {name: "Lnfc.ic.rxn", pads: [["LU8", "15"], ["LC37", "2"]]}, {name: "Lnfc.rx.rrx1.b", pads: [["LR13", "2"], ["LC36", "1"]]}, {name: "Lnfc.rx.rrx2.b", pads: [["LR14", "2"], ["LC37", "1"]]}, {name: "Lnfc.emc.out1", pads: [["LR13", "1"], ["LL7", "2"], ["LC38", "1"], ["LC40", "1"]]}, diff --git a/examples/EspProgrammer/EspProgrammer.net b/examples/EspProgrammer/EspProgrammer.net index e5810055b..8a35e7e1d 100644 --- a/examples/EspProgrammer/EspProgrammer.net +++ b/examples/EspProgrammer/EspProgrammer.net @@ -343,32 +343,32 @@ (net (code 7) (name "Uusb_uart.conn.cc.cc2") (node (ref UJ1) (pin B5)) (node (ref UR2) (pin 2))) -(net (code 8) (name "Uusbconv.uart.tx") +(net (code 8) (name "Uusbconv.suspend") + (node (ref UU1) (pin 12)) + (node (ref UR5) (pin 2))) +(net (code 9) (name "Uusbconv.nsuspend") + (node (ref UU1) (pin 11))) +(net (code 10) (name "Uusbconv.uart.tx") (node (ref UU1) (pin 26)) (node (ref UJ2) (pin 4))) -(net (code 9) (name "Uusbconv.uart.rx") +(net (code 11) (name "Uusbconv.uart.rx") (node (ref UU1) (pin 25)) (node (ref UJ2) (pin 3))) -(net (code 10) (name "Uusbconv.dtr") +(net (code 12) (name "Uusbconv.ri") + (node (ref UU1) (pin 2))) +(net (code 13) (name "Uusbconv.dcd") + (node (ref UU1) (pin 1))) +(net (code 14) (name "Uusbconv.dtr") (node (ref UU1) (pin 28)) (node (ref UQ2) (pin 2)) (node (ref UR3) (pin 1))) -(net (code 11) (name "Uusbconv.rts") +(net (code 15) (name "Uusbconv.dsr") + (node (ref UU1) (pin 27))) +(net (code 16) (name "Uusbconv.rts") (node (ref UU1) (pin 24)) (node (ref UQ1) (pin 2)) (node (ref UR4) (pin 1)) (node (ref UR6) (pin 2))) -(net (code 12) (name "Uusbconv.suspend") - (node (ref UU1) (pin 12)) - (node (ref UR5) (pin 2))) -(net (code 13) (name "Uusbconv.nsuspend") - (node (ref UU1) (pin 11))) -(net (code 14) (name "Uusbconv.ri") - (node (ref UU1) (pin 2))) -(net (code 15) (name "Uusbconv.dcd") - (node (ref UU1) (pin 1))) -(net (code 16) (name "Uusbconv.dsr") - (node (ref UU1) (pin 27))) (net (code 17) (name "Uusbconv.cts") (node (ref UU1) (pin 23))) (net (code 18) (name "Uusbconv.ic.vdd") diff --git a/examples/EspProgrammer/EspProgrammer.svgpcb.js b/examples/EspProgrammer/EspProgrammer.svgpcb.js index 15f6e79ee..3f0eee39b 100644 --- a/examples/EspProgrammer/EspProgrammer.svgpcb.js +++ b/examples/EspProgrammer/EspProgrammer.svgpcb.js @@ -129,15 +129,15 @@ board.setNetlist([ {name: "Uusb_chain_0.d_N", pads: [["UJ1", "A7"], ["UJ1", "B7"], ["UU1", "5"], ["UU2", "1"]]}, {name: "Uusb_uart.conn.cc.cc1", pads: [["UJ1", "A5"], ["UR1", "2"]]}, {name: "Uusb_uart.conn.cc.cc2", pads: [["UJ1", "B5"], ["UR2", "2"]]}, - {name: "Uusbconv.uart.tx", pads: [["UU1", "26"], ["UJ2", "4"]]}, - {name: "Uusbconv.uart.rx", pads: [["UU1", "25"], ["UJ2", "3"]]}, - {name: "Uusbconv.dtr", pads: [["UU1", "28"], ["UQ2", "2"], ["UR3", "1"]]}, - {name: "Uusbconv.rts", pads: [["UU1", "24"], ["UQ1", "2"], ["UR4", "1"], ["UR6", "2"]]}, {name: "Uusbconv.suspend", pads: [["UU1", "12"], ["UR5", "2"]]}, {name: "Uusbconv.nsuspend", pads: [["UU1", "11"]]}, + {name: "Uusbconv.uart.tx", pads: [["UU1", "26"], ["UJ2", "4"]]}, + {name: "Uusbconv.uart.rx", pads: [["UU1", "25"], ["UJ2", "3"]]}, {name: "Uusbconv.ri", pads: [["UU1", "2"]]}, {name: "Uusbconv.dcd", pads: [["UU1", "1"]]}, + {name: "Uusbconv.dtr", pads: [["UU1", "28"], ["UQ2", "2"], ["UR3", "1"]]}, {name: "Uusbconv.dsr", pads: [["UU1", "27"]]}, + {name: "Uusbconv.rts", pads: [["UU1", "24"], ["UQ1", "2"], ["UR4", "1"], ["UR6", "2"]]}, {name: "Uusbconv.cts", pads: [["UU1", "23"]]}, {name: "Uusbconv.ic.vdd", pads: [["UU1", "6"], ["UU1", "9"], ["UC3", "1"]]}, {name: "Uauto.en", pads: [["UJ2", "6"], ["UQ1", "3"]]}, diff --git a/examples/Fcml/Fcml.net b/examples/Fcml/Fcml.net index 840d713ac..ba2dcf7d4 100644 --- a/examples/Fcml/Fcml.net +++ b/examples/Fcml/Fcml.net @@ -2376,26 +2376,7 @@ (node (ref C14) (pin 1)) (node (ref C15) (pin 1)) (node (ref D3) (pin 1))) -(net (code 23) (name "conv.sw[1].high_in") - (node (ref U3) (pin 6)) - (node (ref C14) (pin 2)) - (node (ref Q1) (pin 1)) - (node (ref Q1) (pin 2)) - (node (ref Q1) (pin 3)) - (node (ref C15) (pin 2)) - (node (ref C22) (pin 1)) - (node (ref C23) (pin 1)) - (node (ref Q3) (pin 5)) - (node (ref Q3) (pin 6)) - (node (ref Q3) (pin 7)) - (node (ref Q3) (pin 8))) -(net (code 24) (name "conv.sw[1].high_boot_out") - (node (ref D3) (pin 2)) - (node (ref U6) (pin 8)) - (node (ref C21) (pin 1)) - (node (ref C24) (pin 1)) - (node (ref D5) (pin 1))) -(net (code 25) (name "conv.sw[1].low_out") +(net (code 23) (name "conv.sw[1].low_out") (node (ref Q4) (pin 5)) (node (ref Q4) (pin 6)) (node (ref Q4) (pin 7)) @@ -2413,17 +2394,36 @@ (node (ref Q6) (pin 2)) (node (ref Q6) (pin 3)) (node (ref C35) (pin 2))) +(net (code 24) (name "conv.sw[1].high_in") + (node (ref U3) (pin 6)) + (node (ref C14) (pin 2)) + (node (ref Q1) (pin 1)) + (node (ref Q1) (pin 2)) + (node (ref Q1) (pin 3)) + (node (ref C15) (pin 2)) + (node (ref C22) (pin 1)) + (node (ref C23) (pin 1)) + (node (ref Q3) (pin 5)) + (node (ref Q3) (pin 6)) + (node (ref Q3) (pin 7)) + (node (ref Q3) (pin 8))) +(net (code 25) (name "conv.sw[1].high_boot_out") + (node (ref D3) (pin 2)) + (node (ref U6) (pin 8)) + (node (ref C21) (pin 1)) + (node (ref C24) (pin 1)) + (node (ref D5) (pin 1))) (net (code 26) (name "conv.sw[1].iso.pwr_b") (node (ref U4) (pin 5)) (node (ref C17) (pin 1)) (node (ref U5) (pin 8)) (node (ref C19) (pin 1))) -(net (code 27) (name "conv.sw[1].driver.high_in") - (node (ref U5) (pin 7)) - (node (ref U6) (pin 2))) -(net (code 28) (name "conv.sw[1].driver.low_in") +(net (code 27) (name "conv.sw[1].driver.low_in") (node (ref U5) (pin 6)) (node (ref U6) (pin 3))) +(net (code 28) (name "conv.sw[1].driver.high_in") + (node (ref U5) (pin 7)) + (node (ref U6) (pin 2))) (net (code 29) (name "conv.sw[1].high_gate_res.a") (node (ref U6) (pin 7)) (node (ref R9) (pin 1))) @@ -2436,7 +2436,25 @@ (net (code 32) (name "conv.sw[1].low_gate_res.b") (node (ref R10) (pin 2)) (node (ref Q4) (pin 4))) -(net (code 33) (name "conv.sw[2].high_in") +(net (code 33) (name "conv.sw[2].low_boot_in") + (node (ref U4) (pin 1)) + (node (ref U4) (pin 3)) + (node (ref C16) (pin 1)) + (node (ref U6) (pin 1)) + (node (ref C20) (pin 1)) + (node (ref D4) (pin 1)) + (node (ref C25) (pin 1)) + (node (ref D6) (pin 2))) +(net (code 34) (name "conv.sw[2].low_boot_out") + (node (ref U7) (pin 1)) + (node (ref U7) (pin 3)) + (node (ref C26) (pin 1)) + (node (ref U9) (pin 1)) + (node (ref C30) (pin 1)) + (node (ref D6) (pin 1)) + (node (ref C35) (pin 1)) + (node (ref D7) (pin 2))) +(net (code 35) (name "conv.sw[2].high_in") (node (ref U6) (pin 6)) (node (ref C21) (pin 2)) (node (ref Q3) (pin 1)) @@ -2449,41 +2467,23 @@ (node (ref Q5) (pin 6)) (node (ref Q5) (pin 7)) (node (ref Q5) (pin 8))) -(net (code 34) (name "conv.sw[2].low_boot_in") - (node (ref U4) (pin 1)) - (node (ref U4) (pin 3)) - (node (ref C16) (pin 1)) - (node (ref U6) (pin 1)) - (node (ref C20) (pin 1)) - (node (ref D4) (pin 1)) - (node (ref C25) (pin 1)) - (node (ref D6) (pin 2))) -(net (code 35) (name "conv.sw[2].high_boot_out") +(net (code 36) (name "conv.sw[2].high_boot_out") (node (ref D5) (pin 2)) (node (ref U9) (pin 8)) (node (ref C31) (pin 1)) (node (ref C34) (pin 1)) (node (ref D7) (pin 1))) -(net (code 36) (name "conv.sw[2].low_boot_out") - (node (ref U7) (pin 1)) - (node (ref U7) (pin 3)) - (node (ref C26) (pin 1)) - (node (ref U9) (pin 1)) - (node (ref C30) (pin 1)) - (node (ref D6) (pin 1)) - (node (ref C35) (pin 1)) - (node (ref D7) (pin 2))) (net (code 37) (name "conv.sw[2].iso.pwr_b") (node (ref U7) (pin 5)) (node (ref C27) (pin 1)) (node (ref U8) (pin 8)) (node (ref C29) (pin 1))) -(net (code 38) (name "conv.sw[2].driver.high_in") - (node (ref U8) (pin 7)) - (node (ref U9) (pin 2))) -(net (code 39) (name "conv.sw[2].driver.low_in") +(net (code 38) (name "conv.sw[2].driver.low_in") (node (ref U8) (pin 6)) (node (ref U9) (pin 3))) +(net (code 39) (name "conv.sw[2].driver.high_in") + (node (ref U8) (pin 7)) + (node (ref U9) (pin 2))) (net (code 40) (name "conv.sw[2].high_gate_res.a") (node (ref U9) (pin 7)) (node (ref R11) (pin 1))) @@ -2508,45 +2508,45 @@ (node (ref Q6) (pin 7)) (node (ref Q6) (pin 8)) (node (ref C34) (pin 2))) -(net (code 45) (name "fpga.cdone") - (node (ref U10) (pin 7)) - (node (ref D8) (pin 2))) -(net (code 46) (name "fpga.gpio.led_0") +(net (code 45) (name "fpga.gpio.led_0") (node (ref U10) (pin 21)) (node (ref D9) (pin 2))) -(net (code 47) (name "fpga.gpio.led_1") +(net (code 46) (name "fpga.gpio.led_1") (node (ref U10) (pin 20)) (node (ref D10) (pin 2))) -(net (code 48) (name "fpga.gpio.led_2") +(net (code 47) (name "fpga.gpio.led_2") (node (ref U10) (pin 19)) (node (ref D11) (pin 2))) -(net (code 49) (name "fpga.gpio.led_3") +(net (code 48) (name "fpga.gpio.led_3") (node (ref U10) (pin 18)) (node (ref D12) (pin 2))) -(net (code 50) (name "fpga.gpio.pwm_0L") +(net (code 49) (name "fpga.gpio.pwm_0L") (node (ref U10) (pin 47)) (node (ref TP11) (pin 1)) (node (ref R30) (pin 1))) -(net (code 51) (name "fpga.gpio.pwm_0H") +(net (code 50) (name "fpga.gpio.pwm_0H") (node (ref U10) (pin 48)) (node (ref TP12) (pin 1)) (node (ref R31) (pin 1))) -(net (code 52) (name "fpga.gpio.pwm_1L") +(net (code 51) (name "fpga.gpio.pwm_1L") (node (ref U10) (pin 45)) (node (ref TP13) (pin 1)) (node (ref R32) (pin 1))) -(net (code 53) (name "fpga.gpio.pwm_1H") +(net (code 52) (name "fpga.gpio.pwm_1H") (node (ref U10) (pin 46)) (node (ref TP14) (pin 1)) (node (ref R33) (pin 1))) -(net (code 54) (name "fpga.gpio.pwm_2L") +(net (code 53) (name "fpga.gpio.pwm_2L") (node (ref U10) (pin 43)) (node (ref TP15) (pin 1)) (node (ref R34) (pin 1))) -(net (code 55) (name "fpga.gpio.pwm_2H") +(net (code 54) (name "fpga.gpio.pwm_2H") (node (ref U10) (pin 44)) (node (ref TP16) (pin 1)) (node (ref R35) (pin 1))) +(net (code 55) (name "fpga.cdone") + (node (ref U10) (pin 7)) + (node (ref D8) (pin 2))) (net (code 56) (name "fpga.ic.creset_b") (node (ref U10) (pin 8)) (node (ref R13) (pin 2)) @@ -2604,15 +2604,15 @@ (net (code 70) (name "fpga_led.led[3].res.a") (node (ref D12) (pin 1)) (node (ref R20) (pin 1))) -(net (code 71) (name "usb_fpga_bitbang.dp_pull") - (node (ref U10) (pin 27)) - (node (ref R21) (pin 1))) -(net (code 72) (name "usb_fpga_bitbang.dp") +(net (code 71) (name "usb_fpga_bitbang.dp") (node (ref U10) (pin 26)) (node (ref R22) (pin 1))) -(net (code 73) (name "usb_fpga_bitbang.dm") +(net (code 72) (name "usb_fpga_bitbang.dm") (node (ref U10) (pin 25)) (node (ref R23) (pin 1))) +(net (code 73) (name "usb_fpga_bitbang.dp_pull") + (node (ref U10) (pin 27)) + (node (ref R21) (pin 1))) (net (code 74) (name "mcu.gpio.led_0") (node (ref U14) (pin 34)) (node (ref D13) (pin 2))) @@ -2648,37 +2648,37 @@ (net (code 84) (name "mcu.usb_chain_0.d_N") (node (ref U14) (pin 46)) (node (ref R25) (pin 1))) -(net (code 85) (name "mcu.swd.swo") - (node (ref J6) (pin 6)) - (node (ref U14) (pin 2))) -(net (code 86) (name "mcu.swd.tdi") +(net (code 85) (name "mcu.swd.tdi") (node (ref J6) (pin 8)) (node (ref U14) (pin 3))) -(net (code 87) (name "mcu.ic.qspi.sck") +(net (code 86) (name "mcu.swd.swo") + (node (ref J6) (pin 6)) + (node (ref U14) (pin 2))) +(net (code 87) (name "mcu.ic.vreg_vout") + (node (ref U14) (pin 23)) + (node (ref U14) (pin 45)) + (node (ref U14) (pin 50)) + (node (ref C56) (pin 1)) + (node (ref C57) (pin 1)) + (node (ref C58) (pin 1))) +(net (code 88) (name "mcu.ic.qspi.sck") (node (ref U14) (pin 52)) (node (ref U15) (pin 6))) -(net (code 88) (name "mcu.ic.qspi.mosi") +(net (code 89) (name "mcu.ic.qspi.mosi") (node (ref U14) (pin 53)) (node (ref U15) (pin 5))) -(net (code 89) (name "mcu.ic.qspi.miso") +(net (code 90) (name "mcu.ic.qspi.miso") (node (ref U14) (pin 55)) (node (ref U15) (pin 2))) -(net (code 90) (name "mcu.ic.qspi_cs") +(net (code 91) (name "mcu.ic.qspi_cs") (node (ref U14) (pin 56)) (node (ref U15) (pin 1))) -(net (code 91) (name "mcu.ic.qspi_sd2") +(net (code 92) (name "mcu.ic.qspi_sd2") (node (ref U14) (pin 54)) (node (ref U15) (pin 3))) -(net (code 92) (name "mcu.ic.qspi_sd3") +(net (code 93) (name "mcu.ic.qspi_sd3") (node (ref U14) (pin 51)) (node (ref U15) (pin 7))) -(net (code 93) (name "mcu.ic.vreg_vout") - (node (ref U14) (pin 23)) - (node (ref U14) (pin 45)) - (node (ref U14) (pin 50)) - (node (ref C56) (pin 1)) - (node (ref C57) (pin 1)) - (node (ref C58) (pin 1))) (net (code 94) (name "mcu_sw.out") (node (ref U14) (pin 29)) (node (ref SW2) (pin 1))) diff --git a/examples/Fcml/Fcml.svgpcb.js b/examples/Fcml/Fcml.svgpcb.js index 6d3de8e55..014601236 100644 --- a/examples/Fcml/Fcml.svgpcb.js +++ b/examples/Fcml/Fcml.svgpcb.js @@ -899,29 +899,28 @@ board.setNetlist([ {name: "conv.sw[0].low_gate_res.a", pads: [["U3", "5"], ["R8", "1"]]}, {name: "conv.sw[0].low_gate_res.b", pads: [["R8", "2"], ["Q2", "4"]]}, {name: "conv.sw[0].high_boot_cap.pos", pads: [["U3", "8"], ["C14", "1"], ["C15", "1"], ["D3", "1"]]}, + {name: "conv.sw[1].low_out", pads: [["Q4", "5"], ["Q4", "6"], ["Q4", "7"], ["Q4", "8"], ["U7", "2"], ["C26", "2"], ["C27", "2"], ["U8", "5"], ["C29", "2"], ["U9", "4"], ["C30", "2"], ["C32", "2"], ["C33", "2"], ["Q6", "1"], ["Q6", "2"], ["Q6", "3"], ["C35", "2"]]}, {name: "conv.sw[1].high_in", pads: [["U3", "6"], ["C14", "2"], ["Q1", "1"], ["Q1", "2"], ["Q1", "3"], ["C15", "2"], ["C22", "1"], ["C23", "1"], ["Q3", "5"], ["Q3", "6"], ["Q3", "7"], ["Q3", "8"]]}, {name: "conv.sw[1].high_boot_out", pads: [["D3", "2"], ["U6", "8"], ["C21", "1"], ["C24", "1"], ["D5", "1"]]}, - {name: "conv.sw[1].low_out", pads: [["Q4", "5"], ["Q4", "6"], ["Q4", "7"], ["Q4", "8"], ["U7", "2"], ["C26", "2"], ["C27", "2"], ["U8", "5"], ["C29", "2"], ["U9", "4"], ["C30", "2"], ["C32", "2"], ["C33", "2"], ["Q6", "1"], ["Q6", "2"], ["Q6", "3"], ["C35", "2"]]}, {name: "conv.sw[1].iso.pwr_b", pads: [["U4", "5"], ["C17", "1"], ["U5", "8"], ["C19", "1"]]}, - {name: "conv.sw[1].driver.high_in", pads: [["U5", "7"], ["U6", "2"]]}, {name: "conv.sw[1].driver.low_in", pads: [["U5", "6"], ["U6", "3"]]}, + {name: "conv.sw[1].driver.high_in", pads: [["U5", "7"], ["U6", "2"]]}, {name: "conv.sw[1].high_gate_res.a", pads: [["U6", "7"], ["R9", "1"]]}, {name: "conv.sw[1].high_gate_res.b", pads: [["R9", "2"], ["Q3", "4"]]}, {name: "conv.sw[1].low_gate_res.a", pads: [["U6", "5"], ["R10", "1"]]}, {name: "conv.sw[1].low_gate_res.b", pads: [["R10", "2"], ["Q4", "4"]]}, - {name: "conv.sw[2].high_in", pads: [["U6", "6"], ["C21", "2"], ["Q3", "1"], ["Q3", "2"], ["Q3", "3"], ["C24", "2"], ["C32", "1"], ["C33", "1"], ["Q5", "5"], ["Q5", "6"], ["Q5", "7"], ["Q5", "8"]]}, {name: "conv.sw[2].low_boot_in", pads: [["U4", "1"], ["U4", "3"], ["C16", "1"], ["U6", "1"], ["C20", "1"], ["D4", "1"], ["C25", "1"], ["D6", "2"]]}, - {name: "conv.sw[2].high_boot_out", pads: [["D5", "2"], ["U9", "8"], ["C31", "1"], ["C34", "1"], ["D7", "1"]]}, {name: "conv.sw[2].low_boot_out", pads: [["U7", "1"], ["U7", "3"], ["C26", "1"], ["U9", "1"], ["C30", "1"], ["D6", "1"], ["C35", "1"], ["D7", "2"]]}, + {name: "conv.sw[2].high_in", pads: [["U6", "6"], ["C21", "2"], ["Q3", "1"], ["Q3", "2"], ["Q3", "3"], ["C24", "2"], ["C32", "1"], ["C33", "1"], ["Q5", "5"], ["Q5", "6"], ["Q5", "7"], ["Q5", "8"]]}, + {name: "conv.sw[2].high_boot_out", pads: [["D5", "2"], ["U9", "8"], ["C31", "1"], ["C34", "1"], ["D7", "1"]]}, {name: "conv.sw[2].iso.pwr_b", pads: [["U7", "5"], ["C27", "1"], ["U8", "8"], ["C29", "1"]]}, - {name: "conv.sw[2].driver.high_in", pads: [["U8", "7"], ["U9", "2"]]}, {name: "conv.sw[2].driver.low_in", pads: [["U8", "6"], ["U9", "3"]]}, + {name: "conv.sw[2].driver.high_in", pads: [["U8", "7"], ["U9", "2"]]}, {name: "conv.sw[2].high_gate_res.a", pads: [["U9", "7"], ["R11", "1"]]}, {name: "conv.sw[2].high_gate_res.b", pads: [["R11", "2"], ["Q5", "4"]]}, {name: "conv.sw[2].low_gate_res.a", pads: [["U9", "5"], ["R12", "1"]]}, {name: "conv.sw[2].low_gate_res.b", pads: [["R12", "2"], ["Q6", "4"]]}, {name: "conv.sw_merge", pads: [["L2", "1"], ["U9", "6"], ["C31", "2"], ["Q5", "1"], ["Q5", "2"], ["Q5", "3"], ["Q6", "5"], ["Q6", "6"], ["Q6", "7"], ["Q6", "8"], ["C34", "2"]]}, - {name: "fpga.cdone", pads: [["U10", "7"], ["D8", "2"]]}, {name: "fpga.gpio.led_0", pads: [["U10", "21"], ["D9", "2"]]}, {name: "fpga.gpio.led_1", pads: [["U10", "20"], ["D10", "2"]]}, {name: "fpga.gpio.led_2", pads: [["U10", "19"], ["D11", "2"]]}, @@ -932,6 +931,7 @@ board.setNetlist([ {name: "fpga.gpio.pwm_1H", pads: [["U10", "46"], ["TP14", "1"], ["R33", "1"]]}, {name: "fpga.gpio.pwm_2L", pads: [["U10", "43"], ["TP15", "1"], ["R34", "1"]]}, {name: "fpga.gpio.pwm_2H", pads: [["U10", "44"], ["TP16", "1"], ["R35", "1"]]}, + {name: "fpga.cdone", pads: [["U10", "7"], ["D8", "2"]]}, {name: "fpga.ic.creset_b", pads: [["U10", "8"], ["R13", "2"], ["J5", "10"]]}, {name: "fpga.ic.spi_config.sck", pads: [["U10", "15"], ["U12", "6"], ["J5", "4"]]}, {name: "fpga.ic.spi_config.mosi", pads: [["U10", "14"], ["U12", "5"], ["J5", "6"]]}, @@ -947,9 +947,9 @@ board.setNetlist([ {name: "fpga_led.led[1].res.a", pads: [["D10", "1"], ["R18", "1"]]}, {name: "fpga_led.led[2].res.a", pads: [["D11", "1"], ["R19", "1"]]}, {name: "fpga_led.led[3].res.a", pads: [["D12", "1"], ["R20", "1"]]}, - {name: "usb_fpga_bitbang.dp_pull", pads: [["U10", "27"], ["R21", "1"]]}, {name: "usb_fpga_bitbang.dp", pads: [["U10", "26"], ["R22", "1"]]}, {name: "usb_fpga_bitbang.dm", pads: [["U10", "25"], ["R23", "1"]]}, + {name: "usb_fpga_bitbang.dp_pull", pads: [["U10", "27"], ["R21", "1"]]}, {name: "mcu.gpio.led_0", pads: [["U14", "34"], ["D13", "2"]]}, {name: "mcu.gpio.led_1", pads: [["U14", "35"], ["D14", "2"]]}, {name: "mcu.gpio.led_2", pads: [["U14", "36"], ["D15", "2"]]}, @@ -961,15 +961,15 @@ board.setNetlist([ {name: "mcu.reset_node", pads: [["J6", "10"], ["U14", "26"]]}, {name: "mcu.usb_chain_0.d_P", pads: [["U14", "47"], ["R24", "1"]]}, {name: "mcu.usb_chain_0.d_N", pads: [["U14", "46"], ["R25", "1"]]}, - {name: "mcu.swd.swo", pads: [["J6", "6"], ["U14", "2"]]}, {name: "mcu.swd.tdi", pads: [["J6", "8"], ["U14", "3"]]}, + {name: "mcu.swd.swo", pads: [["J6", "6"], ["U14", "2"]]}, + {name: "mcu.ic.vreg_vout", pads: [["U14", "23"], ["U14", "45"], ["U14", "50"], ["C56", "1"], ["C57", "1"], ["C58", "1"]]}, {name: "mcu.ic.qspi.sck", pads: [["U14", "52"], ["U15", "6"]]}, {name: "mcu.ic.qspi.mosi", pads: [["U14", "53"], ["U15", "5"]]}, {name: "mcu.ic.qspi.miso", pads: [["U14", "55"], ["U15", "2"]]}, {name: "mcu.ic.qspi_cs", pads: [["U14", "56"], ["U15", "1"]]}, {name: "mcu.ic.qspi_sd2", pads: [["U14", "54"], ["U15", "3"]]}, {name: "mcu.ic.qspi_sd3", pads: [["U14", "51"], ["U15", "7"]]}, - {name: "mcu.ic.vreg_vout", pads: [["U14", "23"], ["U14", "45"], ["U14", "50"], ["C56", "1"], ["C57", "1"], ["C58", "1"]]}, {name: "mcu_sw.out", pads: [["U14", "29"], ["SW2", "1"]]}, {name: "mcu_leds.led[0].res.a", pads: [["D13", "1"], ["R26", "1"]]}, {name: "mcu_leds.led[1].res.a", pads: [["D14", "1"], ["R27", "1"]]}, diff --git a/examples/HighSwitch/HighSwitch.net b/examples/HighSwitch/HighSwitch.net index e97975f9e..f97c090f3 100644 --- a/examples/HighSwitch/HighSwitch.net +++ b/examples/HighSwitch/HighSwitch.net @@ -1199,13 +1199,13 @@ (node (ref U1) (pin 4)) (node (ref R1) (pin 2)) (node (ref R2) (pin 1))) -(net (code 7) (name "pwr.vbst_cap.neg") +(net (code 7) (name "pwr.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 8) (name "pwr.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 8) (name "pwr.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 9) (name "mcu.gpio.rgb1_red") (node (ref U2) (pin 28)) (node (ref R7) (pin 2))) @@ -1243,11 +1243,11 @@ (net (code 19) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 34))) -(net (code 20) (name "mcu.swd.swo") +(net (code 20) (name "mcu.swd.tdi") + (node (ref J2) (pin 8))) +(net (code 21) (name "mcu.swd.swo") (node (ref J2) (pin 6)) (node (ref U2) (pin 9))) -(net (code 21) (name "mcu.swd.tdi") - (node (ref J2) (pin 8))) (net (code 22) (name "mcu.ic.xtal_rtc.xtal_in") (node (ref U2) (pin 31))) (net (code 23) (name "mcu.ic.xtal_rtc.xtal_out") diff --git a/examples/HighSwitch/HighSwitch.svgpcb.js b/examples/HighSwitch/HighSwitch.svgpcb.js index 1600409ce..109e741f0 100644 --- a/examples/HighSwitch/HighSwitch.svgpcb.js +++ b/examples/HighSwitch/HighSwitch.svgpcb.js @@ -453,8 +453,8 @@ board.setNetlist([ {name: "can_chain_0.txd", pads: [["U2", "43"], ["U5", "3"]]}, {name: "can_chain_0.rxd", pads: [["U2", "44"], ["U5", "2"]]}, {name: "pwr.fb.output", pads: [["U1", "4"], ["R1", "2"], ["R2", "1"]]}, - {name: "pwr.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "pwr.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "pwr.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.gpio.rgb1_red", pads: [["U2", "28"], ["R7", "2"]]}, {name: "mcu.gpio.rgb1_green", pads: [["U2", "23"], ["R8", "2"]]}, {name: "mcu.gpio.rgb1_blue", pads: [["U2", "22"], ["R9", "2"]]}, @@ -466,8 +466,8 @@ board.setNetlist([ {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "33"], ["R3", "2"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "29"], ["R4", "2"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "34"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"], ["U2", "9"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"], ["U2", "9"]]}, {name: "mcu.ic.xtal_rtc.xtal_in", pads: [["U2", "31"]]}, {name: "mcu.ic.xtal_rtc.xtal_out", pads: [["U2", "32"]]}, {name: "can.can.canh", pads: [["J3", "4"], ["U4", "2"], ["U5", "7"]]}, diff --git a/examples/IotCurtainCrawler/IotCurtainCrawler.net b/examples/IotCurtainCrawler/IotCurtainCrawler.net index 310c08956..dad291d54 100644 --- a/examples/IotCurtainCrawler/IotCurtainCrawler.net +++ b/examples/IotCurtainCrawler/IotCurtainCrawler.net @@ -694,13 +694,13 @@ (node (ref RU1) (pin 4)) (node (ref RR1) (pin 2)) (node (ref RR2) (pin 1))) -(net (code 9) (name "Rreg_3v3.boot_cap.neg") +(net (code 9) (name "Rreg_3v3.boot_cap.pos") + (node (ref RU1) (pin 6)) + (node (ref RC2) (pin 1))) +(net (code 10) (name "Rreg_3v3.boot_cap.neg") (node (ref RU1) (pin 2)) (node (ref RC2) (pin 2)) (node (ref RL1) (pin 1))) -(net (code 10) (name "Rreg_3v3.boot_cap.pos") - (node (ref RU1) (pin 6)) - (node (ref RC2) (pin 1))) (net (code 11) (name "Rreg_3v3.en_res.b") (node (ref RU1) (pin 5)) (node (ref RR3) (pin 2))) diff --git a/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js b/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js index f188fe4ef..e7b241e9c 100644 --- a/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js +++ b/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js @@ -260,8 +260,8 @@ board.setNetlist([ {name: "Ri2c_chain_0.sda", pads: [["RU2", "5"], ["RR9", "2"], ["RTP5", "1"], ["RU5", "4"], ["RJ4", "3"]]}, {name: "Rfuse.pwr_out", pads: [["RF1", "2"], ["RFB1", "1"]]}, {name: "Rreg_3v3.fb.output", pads: [["RU1", "4"], ["RR1", "2"], ["RR2", "1"]]}, - {name: "Rreg_3v3.boot_cap.neg", pads: [["RU1", "2"], ["RC2", "2"], ["RL1", "1"]]}, {name: "Rreg_3v3.boot_cap.pos", pads: [["RU1", "6"], ["RC2", "1"]]}, + {name: "Rreg_3v3.boot_cap.neg", pads: [["RU1", "2"], ["RC2", "2"], ["RL1", "1"]]}, {name: "Rreg_3v3.en_res.b", pads: [["RU1", "5"], ["RR3", "2"]]}, {name: "Rmcu.program_uart_node.a_tx", pads: [["RU2", "12"], ["RJ3", "3"]]}, {name: "Rmcu.program_uart_node.b_tx", pads: [["RU2", "11"], ["RJ3", "4"]]}, diff --git a/examples/IotDisplay/IotDisplay.net b/examples/IotDisplay/IotDisplay.net index 55308e879..ba9e668a2 100644 --- a/examples/IotDisplay/IotDisplay.net +++ b/examples/IotDisplay/IotDisplay.net @@ -996,13 +996,13 @@ (node (ref U1) (pin 4)) (node (ref R1) (pin 2)) (node (ref R2) (pin 1))) -(net (code 11) (name "reg_3v3.boot_cap.neg") +(net (code 11) (name "reg_3v3.boot_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 12) (name "reg_3v3.boot_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 12) (name "reg_3v3.boot_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 13) (name "reg_3v3.en_res.b") (node (ref U1) (pin 5)) (node (ref R3) (pin 2))) @@ -1085,29 +1085,29 @@ (net (code 35) (name "epd.device.vdd1v8") (node (ref J4) (pin 7)) (node (ref C9) (pin 1))) -(net (code 36) (name "epd.device.vgl") +(net (code 36) (name "epd.device.gdr") + (node (ref J4) (pin 23)) + (node (ref Q6) (pin 1)) + (node (ref R12) (pin 1))) +(net (code 37) (name "epd.device.rese") + (node (ref J4) (pin 22)) + (node (ref Q6) (pin 2)) + (node (ref R11) (pin 1))) +(net (code 38) (name "epd.device.vgl") (node (ref J4) (pin 21)) (node (ref C10) (pin 1))) -(net (code 37) (name "epd.device.vgh") +(net (code 39) (name "epd.device.vgh") (node (ref J4) (pin 20)) (node (ref C11) (pin 1))) -(net (code 38) (name "epd.device.vsh") +(net (code 40) (name "epd.device.vsh") (node (ref J4) (pin 5)) (node (ref C12) (pin 1))) -(net (code 39) (name "epd.device.vsl") +(net (code 41) (name "epd.device.vsl") (node (ref J4) (pin 3)) (node (ref C13) (pin 1))) -(net (code 40) (name "epd.device.vcom") +(net (code 42) (name "epd.device.vcom") (node (ref J4) (pin 1)) (node (ref C14) (pin 1))) -(net (code 41) (name "epd.device.gdr") - (node (ref J4) (pin 23)) - (node (ref Q6) (pin 1)) - (node (ref R12) (pin 1))) -(net (code 42) (name "epd.device.rese") - (node (ref J4) (pin 22)) - (node (ref Q6) (pin 2)) - (node (ref R11) (pin 1))) (net (code 43) (name "epd.boost.pos_out") (node (ref J4) (pin 4)) (node (ref D4) (pin 1)) diff --git a/examples/IotDisplay/IotDisplay.svgpcb.js b/examples/IotDisplay/IotDisplay.svgpcb.js index 91784f10c..57adab43b 100644 --- a/examples/IotDisplay/IotDisplay.svgpcb.js +++ b/examples/IotDisplay/IotDisplay.svgpcb.js @@ -387,8 +387,8 @@ board.setNetlist([ {name: "usb.conn.cc.cc2", pads: [["J1", "B5"]]}, {name: "batt.pwr", pads: [["J2", "2"], ["TP1", "1"], ["Q1", "3"]]}, {name: "reg_3v3.fb.output", pads: [["U1", "4"], ["R1", "2"], ["R2", "1"]]}, - {name: "reg_3v3.boot_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg_3v3.boot_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg_3v3.boot_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg_3v3.en_res.b", pads: [["U1", "5"], ["R3", "2"]]}, {name: "vbat_sense_gate.control", pads: [["Q2", "1"], ["U2", "6"]]}, {name: "vbat_sense_gate.output", pads: [["Q3", "3"], ["R9", "1"]]}, @@ -412,13 +412,13 @@ board.setNetlist([ {name: "mem_gate.control", pads: [["U2", "23"], ["Q5", "1"]]}, {name: "mem_gate.output", pads: [["Q5", "3"], ["J5", "4"], ["U6", "3"], ["U6", "7"], ["U6", "8"], ["C19", "1"]]}, {name: "epd.device.vdd1v8", pads: [["J4", "7"], ["C9", "1"]]}, + {name: "epd.device.gdr", pads: [["J4", "23"], ["Q6", "1"], ["R12", "1"]]}, + {name: "epd.device.rese", pads: [["J4", "22"], ["Q6", "2"], ["R11", "1"]]}, {name: "epd.device.vgl", pads: [["J4", "21"], ["C10", "1"]]}, {name: "epd.device.vgh", pads: [["J4", "20"], ["C11", "1"]]}, {name: "epd.device.vsh", pads: [["J4", "5"], ["C12", "1"]]}, {name: "epd.device.vsl", pads: [["J4", "3"], ["C13", "1"]]}, {name: "epd.device.vcom", pads: [["J4", "1"], ["C14", "1"]]}, - {name: "epd.device.gdr", pads: [["J4", "23"], ["Q6", "1"], ["R12", "1"]]}, - {name: "epd.device.rese", pads: [["J4", "22"], ["Q6", "2"], ["R11", "1"]]}, {name: "epd.boost.pos_out", pads: [["J4", "4"], ["D4", "1"], ["C17", "1"]]}, {name: "epd.boost.neg_out", pads: [["J4", "2"], ["D5", "2"], ["C18", "1"]]}, {name: "epd.boost.inductor.b", pads: [["Q6", "3"], ["L2", "2"], ["D4", "2"], ["C16", "1"]]}, diff --git a/examples/IotFan/IotFan.net b/examples/IotFan/IotFan.net index b7e5ac6b8..0fb84197d 100644 --- a/examples/IotFan/IotFan.net +++ b/examples/IotFan/IotFan.net @@ -1278,13 +1278,13 @@ (node (ref FU1) (pin 4)) (node (ref FR1) (pin 2)) (node (ref FR2) (pin 1))) -(net (code 6) (name "Freg_5v.boot_cap.neg") +(net (code 6) (name "Freg_5v.boot_cap.pos") + (node (ref FU1) (pin 6)) + (node (ref FC2) (pin 1))) +(net (code 7) (name "Freg_5v.boot_cap.neg") (node (ref FU1) (pin 2)) (node (ref FC2) (pin 2)) (node (ref FL1) (pin 1))) -(net (code 7) (name "Freg_5v.boot_cap.pos") - (node (ref FU1) (pin 6)) - (node (ref FC2) (pin 1))) (net (code 8) (name "Freg_5v.en_res.b") (node (ref FU1) (pin 5)) (node (ref FR3) (pin 2))) diff --git a/examples/IotFan/IotFan.svgpcb.js b/examples/IotFan/IotFan.svgpcb.js index 5e1888995..7174179b0 100644 --- a/examples/IotFan/IotFan.svgpcb.js +++ b/examples/IotFan/IotFan.svgpcb.js @@ -472,8 +472,8 @@ board.setNetlist([ {name: "Fv5", pads: [["FR1", "1"], ["FL1", "2"], ["FC4", "1"], ["FTP3", "1"], ["FD1", "1"], ["FU2", "2"], ["FC5", "1"], ["FD4", "2"], ["FC20", "1"], ["FD5", "2"], ["FC21", "1"], ["FD6", "2"], ["FC22", "1"], ["FD7", "2"], ["FC23", "1"], ["FD8", "2"], ["FC24", "1"], ["FD9", "2"], ["FC25", "1"], ["FD10", "2"], ["FC26", "1"], ["FD11", "2"], ["FC27", "1"], ["FD12", "2"], ["FC28", "1"], ["FD13", "2"], ["FC29", "1"], ["FD14", "2"], ["FC30", "1"], ["FD15", "2"], ["FC31", "1"], ["FD16", "2"], ["FC32", "1"], ["FD17", "2"], ["FC33", "1"], ["FD18", "2"], ["FC34", "1"], ["FD19", "2"], ["FC35", "1"], ["FD20", "2"], ["FC36", "1"], ["FD21", "2"], ["FC37", "1"]]}, {name: "Fv3v3", pads: [["FU2", "3"], ["FC6", "1"], ["FTP4", "1"], ["FD2", "1"], ["FU3", "11"], ["FU3", "14"], ["FU3", "17"], ["FU3", "18"], ["FU3", "31"], ["FU3", "32"], ["FC7", "1"], ["FC8", "1"], ["FC9", "1"], ["FC10", "1"], ["FC11", "1"], ["FC12", "1"], ["FC15", "1"], ["FL3", "1"], ["FJ2", "1"], ["FR4", "1"], ["FD3", "2"]]}, {name: "Freg_5v.fb.output", pads: [["FU1", "4"], ["FR1", "2"], ["FR2", "1"]]}, - {name: "Freg_5v.boot_cap.neg", pads: [["FU1", "2"], ["FC2", "2"], ["FL1", "1"]]}, {name: "Freg_5v.boot_cap.pos", pads: [["FU1", "6"], ["FC2", "1"]]}, + {name: "Freg_5v.boot_cap.neg", pads: [["FU1", "2"], ["FC2", "2"], ["FL1", "1"]]}, {name: "Freg_5v.en_res.b", pads: [["FU1", "5"], ["FR3", "2"]]}, {name: "Fmcu.xtal_node.xi", pads: [["FU3", "30"], ["FX1", "1"], ["FC17", "1"]]}, {name: "Fmcu.xtal_node.xo", pads: [["FU3", "29"], ["FX1", "3"], ["FC18", "1"]]}, diff --git a/examples/IotIron/IotIron.net b/examples/IotIron/IotIron.net index 71fc0a2ce..2a973fba6 100644 --- a/examples/IotIron/IotIron.net +++ b/examples/IotIron/IotIron.net @@ -1297,13 +1297,13 @@ (node (ref IU1) (pin 4)) (node (ref IR1) (pin 2)) (node (ref IR2) (pin 1))) -(net (code 11) (name "Ireg_3v3.boot_cap.neg") +(net (code 11) (name "Ireg_3v3.boot_cap.pos") + (node (ref IU1) (pin 6)) + (node (ref IC2) (pin 1))) +(net (code 12) (name "Ireg_3v3.boot_cap.neg") (node (ref IU1) (pin 2)) (node (ref IC2) (pin 2)) (node (ref IL1) (pin 1))) -(net (code 12) (name "Ireg_3v3.boot_cap.pos") - (node (ref IU1) (pin 6)) - (node (ref IC2) (pin 1))) (net (code 13) (name "Ireg_3v3.en_res.b") (node (ref IU1) (pin 5)) (node (ref IR3) (pin 2))) @@ -1357,12 +1357,12 @@ (net (code 26) (name "Ioled.reset") (node (ref IU3) (pin 11)) (node (ref IJ3) (pin 14))) -(net (code 27) (name "Ioled.device.vcomh") - (node (ref IJ3) (pin 27)) - (node (ref IC16) (pin 1))) -(net (code 28) (name "Ioled.device.vcc") +(net (code 27) (name "Ioled.device.vcc") (node (ref IJ3) (pin 28)) (node (ref IC19) (pin 1))) +(net (code 28) (name "Ioled.device.vcomh") + (node (ref IJ3) (pin 27)) + (node (ref IC16) (pin 1))) (net (code 29) (name "Ioled.c1_cap.pos") (node (ref IJ3) (pin 4)) (node (ref IC14) (pin 1))) @@ -1474,14 +1474,14 @@ (node (ref IU3) (pin 12)) (node (ref IR26) (pin 1)) (node (ref IU11) (pin 7))) -(net (code 58) (name "Ipacked_opamp.inn.0") - (node (ref IR21) (pin 2)) - (node (ref IR22) (pin 1)) - (node (ref IU11) (pin 2))) -(net (code 59) (name "Ipacked_opamp.inp.1") +(net (code 58) (name "Ipacked_opamp.inp.1") (node (ref IR25) (pin 2)) (node (ref IR27) (pin 2)) (node (ref IU11) (pin 5))) +(net (code 59) (name "Ipacked_opamp.inn.0") + (node (ref IR21) (pin 2)) + (node (ref IR22) (pin 1)) + (node (ref IU11) (pin 2))) (net (code 60) (name "Ipacked_opamp.inn.1") (node (ref IR24) (pin 2)) (node (ref IR26) (pin 2)) diff --git a/examples/IotIron/IotIron.svgpcb.js b/examples/IotIron/IotIron.svgpcb.js index 4976ad2ab..206fb2a90 100644 --- a/examples/IotIron/IotIron.svgpcb.js +++ b/examples/IotIron/IotIron.svgpcb.js @@ -482,8 +482,8 @@ board.setNetlist([ {name: "Iusb.cc.cc1", pads: [["IJ1", "A5"], ["IU4", "10"], ["IU4", "11"]]}, {name: "Iusb.cc.cc2", pads: [["IJ1", "B5"], ["IU4", "1"], ["IU4", "14"]]}, {name: "Ireg_3v3.fb.output", pads: [["IU1", "4"], ["IR1", "2"], ["IR2", "1"]]}, - {name: "Ireg_3v3.boot_cap.neg", pads: [["IU1", "2"], ["IC2", "2"], ["IL1", "1"]]}, {name: "Ireg_3v3.boot_cap.pos", pads: [["IU1", "6"], ["IC2", "1"]]}, + {name: "Ireg_3v3.boot_cap.neg", pads: [["IU1", "2"], ["IC2", "2"], ["IL1", "1"]]}, {name: "Ireg_3v3.en_res.b", pads: [["IU1", "5"], ["IR3", "2"]]}, {name: "Imcu.program_uart_node.a_tx", pads: [["IU3", "37"], ["IJ2", "3"]]}, {name: "Imcu.program_uart_node.b_tx", pads: [["IU3", "36"], ["IJ2", "4"]]}, @@ -498,8 +498,8 @@ board.setNetlist([ {name: "Ienc.b", pads: [["IU3", "9"], ["ISW1", "B"]]}, {name: "Ienc.sw", pads: [["IU3", "8"], ["ISW1", "S1"]]}, {name: "Ioled.reset", pads: [["IU3", "11"], ["IJ3", "14"]]}, - {name: "Ioled.device.vcomh", pads: [["IJ3", "27"], ["IC16", "1"]]}, {name: "Ioled.device.vcc", pads: [["IJ3", "28"], ["IC19", "1"]]}, + {name: "Ioled.device.vcomh", pads: [["IJ3", "27"], ["IC16", "1"]]}, {name: "Ioled.c1_cap.pos", pads: [["IJ3", "4"], ["IC14", "1"]]}, {name: "Ioled.c1_cap.neg", pads: [["IJ3", "5"], ["IC14", "2"]]}, {name: "Ioled.c2_cap.pos", pads: [["IJ3", "2"], ["IC15", "1"]]}, @@ -529,8 +529,8 @@ board.setNetlist([ {name: "Itp_i.output", pads: [["IU3", "7"], ["IR23", "2"], ["IC30", "1"], ["ITP9", "1"]]}, {name: "Itamp.input_positive", pads: [["IJ5", "3"], ["IR25", "1"], ["ITP10", "1"]]}, {name: "Itamp.output", pads: [["IU3", "12"], ["IR26", "1"], ["IU11", "7"]]}, - {name: "Ipacked_opamp.inn.0", pads: [["IR21", "2"], ["IR22", "1"], ["IU11", "2"]]}, {name: "Ipacked_opamp.inp.1", pads: [["IR25", "2"], ["IR27", "2"], ["IU11", "5"]]}, + {name: "Ipacked_opamp.inn.0", pads: [["IR21", "2"], ["IR22", "1"], ["IU11", "2"]]}, {name: "Ipacked_opamp.inn.1", pads: [["IR24", "2"], ["IR26", "2"], ["IU11", "6"]]} ]) diff --git a/examples/IotKnob/IotKnob.net b/examples/IotKnob/IotKnob.net index b02816e62..e04fa0bcb 100644 --- a/examples/IotKnob/IotKnob.net +++ b/examples/IotKnob/IotKnob.net @@ -1981,12 +1981,12 @@ (net (code 29) (name "Koled.reset") (node (ref KU2) (pin 8)) (node (ref KJ3) (pin 14))) -(net (code 30) (name "Koled.device.vcomh") - (node (ref KJ3) (pin 27)) - (node (ref KC13) (pin 1))) -(net (code 31) (name "Koled.device.vcc") +(net (code 30) (name "Koled.device.vcc") (node (ref KJ3) (pin 28)) (node (ref KC16) (pin 1))) +(net (code 31) (name "Koled.device.vcomh") + (node (ref KJ3) (pin 27)) + (node (ref KC13) (pin 1))) (net (code 32) (name "Koled.c1_cap.pos") (node (ref KJ3) (pin 4)) (node (ref KC11) (pin 1))) diff --git a/examples/IotKnob/IotKnob.svgpcb.js b/examples/IotKnob/IotKnob.svgpcb.js index 5e06a6a1e..862d0b11d 100644 --- a/examples/IotKnob/IotKnob.svgpcb.js +++ b/examples/IotKnob/IotKnob.svgpcb.js @@ -374,8 +374,8 @@ board.setNetlist([ {name: "Kals.dvi_res.b", pads: [["KU4", "5"], ["KR8", "2"], ["KC7", "1"]]}, {name: "Kdist.ic.gpio1", pads: [["KU5", "7"]]}, {name: "Koled.reset", pads: [["KU2", "8"], ["KJ3", "14"]]}, - {name: "Koled.device.vcomh", pads: [["KJ3", "27"], ["KC13", "1"]]}, {name: "Koled.device.vcc", pads: [["KJ3", "28"], ["KC16", "1"]]}, + {name: "Koled.device.vcomh", pads: [["KJ3", "27"], ["KC13", "1"]]}, {name: "Koled.c1_cap.pos", pads: [["KJ3", "4"], ["KC11", "1"]]}, {name: "Koled.c1_cap.neg", pads: [["KJ3", "5"], ["KC11", "2"]]}, {name: "Koled.c2_cap.pos", pads: [["KJ3", "2"], ["KC12", "1"]]}, diff --git a/examples/IotLedDriver/IotLedDriver.net b/examples/IotLedDriver/IotLedDriver.net index f8a8fbf26..57baedfad 100644 --- a/examples/IotLedDriver/IotLedDriver.net +++ b/examples/IotLedDriver/IotLedDriver.net @@ -1050,13 +1050,13 @@ (node (ref LU1) (pin 4)) (node (ref LR1) (pin 2)) (node (ref LR2) (pin 1))) -(net (code 5) (name "Lreg_3v3.boot_cap.neg") +(net (code 5) (name "Lreg_3v3.boot_cap.pos") + (node (ref LU1) (pin 6)) + (node (ref LC2) (pin 1))) +(net (code 6) (name "Lreg_3v3.boot_cap.neg") (node (ref LU1) (pin 2)) (node (ref LC2) (pin 2)) (node (ref LL1) (pin 1))) -(net (code 6) (name "Lreg_3v3.boot_cap.pos") - (node (ref LU1) (pin 6)) - (node (ref LC2) (pin 1))) (net (code 7) (name "Lreg_3v3.en_res.b") (node (ref LU1) (pin 5)) (node (ref LR3) (pin 2))) @@ -1125,68 +1125,68 @@ (node (ref LU2) (pin 13)) (node (ref LU3) (pin 9)) (node (ref LR12) (pin 2))) -(net (code 25) (name "Lled_drv[0].pwm") - (node (ref LU2) (pin 5)) - (node (ref LU4) (pin 2))) -(net (code 26) (name "Lled_drv[0].leda") +(net (code 25) (name "Lled_drv[0].leda") (node (ref LL4) (pin 2)) (node (ref LC23) (pin 1))) -(net (code 27) (name "Lled_drv[0].ledk") +(net (code 26) (name "Lled_drv[0].ledk") (node (ref LU4) (pin 1)) (node (ref LR13) (pin 2))) -(net (code 28) (name "Lled_drv[0].boot_cap.neg") +(net (code 27) (name "Lled_drv[0].pwm") + (node (ref LU2) (pin 5)) + (node (ref LU4) (pin 2))) +(net (code 28) (name "Lled_drv[0].boot_cap.pos") + (node (ref LU4) (pin 6)) + (node (ref LC21) (pin 1))) +(net (code 29) (name "Lled_drv[0].boot_cap.neg") (node (ref LU4) (pin 5)) (node (ref LC21) (pin 2)) (node (ref LL4) (pin 1))) -(net (code 29) (name "Lled_drv[0].boot_cap.pos") - (node (ref LU4) (pin 6)) - (node (ref LC21) (pin 1))) -(net (code 30) (name "Lled_drv[1].pwm") - (node (ref LU2) (pin 8)) - (node (ref LU5) (pin 2))) -(net (code 31) (name "Lled_drv[1].leda") +(net (code 30) (name "Lled_drv[1].leda") (node (ref LL5) (pin 2)) (node (ref LC27) (pin 1))) -(net (code 32) (name "Lled_drv[1].ledk") +(net (code 31) (name "Lled_drv[1].ledk") (node (ref LU5) (pin 1)) (node (ref LR14) (pin 2))) -(net (code 33) (name "Lled_drv[1].boot_cap.neg") +(net (code 32) (name "Lled_drv[1].pwm") + (node (ref LU2) (pin 8)) + (node (ref LU5) (pin 2))) +(net (code 33) (name "Lled_drv[1].boot_cap.pos") + (node (ref LU5) (pin 6)) + (node (ref LC25) (pin 1))) +(net (code 34) (name "Lled_drv[1].boot_cap.neg") (node (ref LU5) (pin 5)) (node (ref LC25) (pin 2)) (node (ref LL5) (pin 1))) -(net (code 34) (name "Lled_drv[1].boot_cap.pos") - (node (ref LU5) (pin 6)) - (node (ref LC25) (pin 1))) -(net (code 35) (name "Lled_drv[2].pwm") - (node (ref LU2) (pin 9)) - (node (ref LU6) (pin 2))) -(net (code 36) (name "Lled_drv[2].leda") +(net (code 35) (name "Lled_drv[2].leda") (node (ref LL6) (pin 2)) (node (ref LC31) (pin 1))) -(net (code 37) (name "Lled_drv[2].ledk") +(net (code 36) (name "Lled_drv[2].ledk") (node (ref LU6) (pin 1)) (node (ref LR15) (pin 2))) -(net (code 38) (name "Lled_drv[2].boot_cap.neg") +(net (code 37) (name "Lled_drv[2].pwm") + (node (ref LU2) (pin 9)) + (node (ref LU6) (pin 2))) +(net (code 38) (name "Lled_drv[2].boot_cap.pos") + (node (ref LU6) (pin 6)) + (node (ref LC29) (pin 1))) +(net (code 39) (name "Lled_drv[2].boot_cap.neg") (node (ref LU6) (pin 5)) (node (ref LC29) (pin 2)) (node (ref LL6) (pin 1))) -(net (code 39) (name "Lled_drv[2].boot_cap.pos") - (node (ref LU6) (pin 6)) - (node (ref LC29) (pin 1))) -(net (code 40) (name "Lled_drv[3].pwm") - (node (ref LU2) (pin 10)) - (node (ref LU7) (pin 2))) -(net (code 41) (name "Lled_drv[3].leda") +(net (code 40) (name "Lled_drv[3].leda") (node (ref LL7) (pin 2)) (node (ref LC35) (pin 1))) -(net (code 42) (name "Lled_drv[3].ledk") +(net (code 41) (name "Lled_drv[3].ledk") (node (ref LU7) (pin 1)) (node (ref LR16) (pin 2))) -(net (code 43) (name "Lled_drv[3].boot_cap.neg") +(net (code 42) (name "Lled_drv[3].pwm") + (node (ref LU2) (pin 10)) + (node (ref LU7) (pin 2))) +(net (code 43) (name "Lled_drv[3].boot_cap.pos") + (node (ref LU7) (pin 6)) + (node (ref LC33) (pin 1))) +(net (code 44) (name "Lled_drv[3].boot_cap.neg") (node (ref LU7) (pin 5)) (node (ref LC33) (pin 2)) - (node (ref LL7) (pin 1))) -(net (code 44) (name "Lled_drv[3].boot_cap.pos") - (node (ref LU7) (pin 6)) - (node (ref LC33) (pin 1)))) + (node (ref LL7) (pin 1)))) ) \ No newline at end of file diff --git a/examples/IotLedDriver/IotLedDriver.svgpcb.js b/examples/IotLedDriver/IotLedDriver.svgpcb.js index 86454111b..55e684daf 100644 --- a/examples/IotLedDriver/IotLedDriver.svgpcb.js +++ b/examples/IotLedDriver/IotLedDriver.svgpcb.js @@ -396,8 +396,8 @@ board.setNetlist([ {name: "Lv12", pads: [["LJ1", "2"], ["LTP1", "1"], ["LU1", "3"], ["LC1", "1"], ["LC3", "1"], ["LR3", "1"], ["LR6", "1"], ["LU4", "4"], ["LC20", "1"], ["LC22", "1"], ["LU5", "4"], ["LC24", "1"], ["LC26", "1"], ["LU6", "4"], ["LC28", "1"], ["LC30", "1"], ["LU7", "4"], ["LC32", "1"], ["LC34", "1"]]}, {name: "Lv3v3", pads: [["LR1", "1"], ["LL1", "2"], ["LC4", "1"], ["LTP3", "1"], ["LD1", "1"], ["LU2", "11"], ["LU2", "14"], ["LU2", "17"], ["LU2", "18"], ["LU2", "31"], ["LU2", "32"], ["LU2", "6"], ["LC5", "1"], ["LC6", "1"], ["LC7", "1"], ["LC8", "1"], ["LC9", "1"], ["LC10", "1"], ["LC13", "1"], ["LL3", "1"], ["LJ2", "1"], ["LR4", "1"], ["LR8", "1"], ["LR9", "1"], ["LR10", "1"], ["LU3", "1"], ["LU3", "11"], ["LU3", "5"], ["LC18", "1"], ["LC19", "1"], ["LR11", "1"], ["LR12", "1"]]}, {name: "Lreg_3v3.fb.output", pads: [["LU1", "4"], ["LR1", "2"], ["LR2", "1"]]}, - {name: "Lreg_3v3.boot_cap.neg", pads: [["LU1", "2"], ["LC2", "2"], ["LL1", "1"]]}, {name: "Lreg_3v3.boot_cap.pos", pads: [["LU1", "6"], ["LC2", "1"]]}, + {name: "Lreg_3v3.boot_cap.neg", pads: [["LU1", "2"], ["LC2", "2"], ["LL1", "1"]]}, {name: "Lreg_3v3.en_res.b", pads: [["LU1", "5"], ["LR3", "2"]]}, {name: "Lmcu.xtal_node.xi", pads: [["LU2", "30"], ["LX1", "1"], ["LC15", "1"]]}, {name: "Lmcu.xtal_node.xo", pads: [["LU2", "29"], ["LX1", "3"], ["LC16", "1"]]}, @@ -416,26 +416,26 @@ board.setNetlist([ {name: "Ltof.ic.gpio1", pads: [["LU3", "7"]]}, {name: "Ltof_pull.i2c.scl", pads: [["LU2", "12"], ["LU3", "10"], ["LR11", "2"]]}, {name: "Ltof_pull.i2c.sda", pads: [["LU2", "13"], ["LU3", "9"], ["LR12", "2"]]}, - {name: "Lled_drv[0].pwm", pads: [["LU2", "5"], ["LU4", "2"]]}, {name: "Lled_drv[0].leda", pads: [["LL4", "2"], ["LC23", "1"]]}, {name: "Lled_drv[0].ledk", pads: [["LU4", "1"], ["LR13", "2"]]}, - {name: "Lled_drv[0].boot_cap.neg", pads: [["LU4", "5"], ["LC21", "2"], ["LL4", "1"]]}, + {name: "Lled_drv[0].pwm", pads: [["LU2", "5"], ["LU4", "2"]]}, {name: "Lled_drv[0].boot_cap.pos", pads: [["LU4", "6"], ["LC21", "1"]]}, - {name: "Lled_drv[1].pwm", pads: [["LU2", "8"], ["LU5", "2"]]}, + {name: "Lled_drv[0].boot_cap.neg", pads: [["LU4", "5"], ["LC21", "2"], ["LL4", "1"]]}, {name: "Lled_drv[1].leda", pads: [["LL5", "2"], ["LC27", "1"]]}, {name: "Lled_drv[1].ledk", pads: [["LU5", "1"], ["LR14", "2"]]}, - {name: "Lled_drv[1].boot_cap.neg", pads: [["LU5", "5"], ["LC25", "2"], ["LL5", "1"]]}, + {name: "Lled_drv[1].pwm", pads: [["LU2", "8"], ["LU5", "2"]]}, {name: "Lled_drv[1].boot_cap.pos", pads: [["LU5", "6"], ["LC25", "1"]]}, - {name: "Lled_drv[2].pwm", pads: [["LU2", "9"], ["LU6", "2"]]}, + {name: "Lled_drv[1].boot_cap.neg", pads: [["LU5", "5"], ["LC25", "2"], ["LL5", "1"]]}, {name: "Lled_drv[2].leda", pads: [["LL6", "2"], ["LC31", "1"]]}, {name: "Lled_drv[2].ledk", pads: [["LU6", "1"], ["LR15", "2"]]}, - {name: "Lled_drv[2].boot_cap.neg", pads: [["LU6", "5"], ["LC29", "2"], ["LL6", "1"]]}, + {name: "Lled_drv[2].pwm", pads: [["LU2", "9"], ["LU6", "2"]]}, {name: "Lled_drv[2].boot_cap.pos", pads: [["LU6", "6"], ["LC29", "1"]]}, - {name: "Lled_drv[3].pwm", pads: [["LU2", "10"], ["LU7", "2"]]}, + {name: "Lled_drv[2].boot_cap.neg", pads: [["LU6", "5"], ["LC29", "2"], ["LL6", "1"]]}, {name: "Lled_drv[3].leda", pads: [["LL7", "2"], ["LC35", "1"]]}, {name: "Lled_drv[3].ledk", pads: [["LU7", "1"], ["LR16", "2"]]}, - {name: "Lled_drv[3].boot_cap.neg", pads: [["LU7", "5"], ["LC33", "2"], ["LL7", "1"]]}, - {name: "Lled_drv[3].boot_cap.pos", pads: [["LU7", "6"], ["LC33", "1"]]} + {name: "Lled_drv[3].pwm", pads: [["LU2", "10"], ["LU7", "2"]]}, + {name: "Lled_drv[3].boot_cap.pos", pads: [["LU7", "6"], ["LC33", "1"]]}, + {name: "Lled_drv[3].boot_cap.neg", pads: [["LU7", "5"], ["LC33", "2"], ["LL7", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/IotRollerBlinds/IotRollerBlinds.net b/examples/IotRollerBlinds/IotRollerBlinds.net index 6ec7c5947..fd2752979 100644 --- a/examples/IotRollerBlinds/IotRollerBlinds.net +++ b/examples/IotRollerBlinds/IotRollerBlinds.net @@ -542,13 +542,13 @@ (node (ref BU1) (pin 4)) (node (ref BR1) (pin 2)) (node (ref BR2) (pin 1))) -(net (code 9) (name "Breg_3v3.boot_cap.neg") +(net (code 9) (name "Breg_3v3.boot_cap.pos") + (node (ref BU1) (pin 6)) + (node (ref BC2) (pin 1))) +(net (code 10) (name "Breg_3v3.boot_cap.neg") (node (ref BU1) (pin 2)) (node (ref BC2) (pin 2)) (node (ref BL1) (pin 1))) -(net (code 10) (name "Breg_3v3.boot_cap.pos") - (node (ref BU1) (pin 6)) - (node (ref BC2) (pin 1))) (net (code 11) (name "Breg_3v3.en_res.b") (node (ref BU1) (pin 5)) (node (ref BR3) (pin 2))) diff --git a/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js b/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js index 499619951..c41d65f2f 100644 --- a/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js +++ b/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js @@ -205,8 +205,8 @@ board.setNetlist([ {name: "Bconn.encb", pads: [["BJ3", "3"], ["BU2", "10"]]}, {name: "Bfuse.pwr_out", pads: [["BF1", "2"], ["BFB1", "1"]]}, {name: "Breg_3v3.fb.output", pads: [["BU1", "4"], ["BR1", "2"], ["BR2", "1"]]}, - {name: "Breg_3v3.boot_cap.neg", pads: [["BU1", "2"], ["BC2", "2"], ["BL1", "1"]]}, {name: "Breg_3v3.boot_cap.pos", pads: [["BU1", "6"], ["BC2", "1"]]}, + {name: "Breg_3v3.boot_cap.neg", pads: [["BU1", "2"], ["BC2", "2"], ["BL1", "1"]]}, {name: "Breg_3v3.en_res.b", pads: [["BU1", "5"], ["BR3", "2"]]}, {name: "Bmcu.program_uart_node.a_tx", pads: [["BU2", "12"], ["BJ4", "3"]]}, {name: "Bmcu.program_uart_node.b_tx", pads: [["BU2", "11"], ["BJ4", "4"]]}, diff --git a/examples/IotThermalCamera/IotThermalCamera.net b/examples/IotThermalCamera/IotThermalCamera.net index c365c7479..74db2ab91 100644 --- a/examples/IotThermalCamera/IotThermalCamera.net +++ b/examples/IotThermalCamera/IotThermalCamera.net @@ -782,13 +782,13 @@ (node (ref TU1) (pin 4)) (node (ref TR3) (pin 2)) (node (ref TR4) (pin 1))) -(net (code 15) (name "Treg_3v3.boot_cap.neg") +(net (code 15) (name "Treg_3v3.boot_cap.pos") + (node (ref TU1) (pin 6)) + (node (ref TC2) (pin 1))) +(net (code 16) (name "Treg_3v3.boot_cap.neg") (node (ref TU1) (pin 2)) (node (ref TC2) (pin 2)) (node (ref TL1) (pin 1))) -(net (code 16) (name "Treg_3v3.boot_cap.pos") - (node (ref TU1) (pin 6)) - (node (ref TC2) (pin 1))) (net (code 17) (name "Treg_3v3.en_res.b") (node (ref TU1) (pin 5)) (node (ref TR5) (pin 2))) @@ -858,21 +858,21 @@ (node (ref TJ3) (pin 24))) (net (code 38) (name "Tcam.device.y.1") (node (ref TJ3) (pin 23))) -(net (code 39) (name "Tflir.spi.sck") +(net (code 39) (name "Tflir.reset") + (node (ref TU5) (pin 34)) + (node (ref TU8) (pin 24))) +(net (code 40) (name "Tflir.shutdown") + (node (ref TU5) (pin 33)) + (node (ref TU8) (pin 23))) +(net (code 41) (name "Tflir.spi.sck") (node (ref TU5) (pin 39)) (node (ref TU8) (pin 13))) -(net (code 40) (name "Tflir.spi.mosi") +(net (code 42) (name "Tflir.spi.mosi") (node (ref TU5) (pin 5)) (node (ref TU8) (pin 11))) -(net (code 41) (name "Tflir.spi.miso") +(net (code 43) (name "Tflir.spi.miso") (node (ref TU5) (pin 4)) (node (ref TU8) (pin 12))) -(net (code 42) (name "Tflir.reset") - (node (ref TU5) (pin 34)) - (node (ref TU8) (pin 24))) -(net (code 43) (name "Tflir.shutdown") - (node (ref TU5) (pin 33)) - (node (ref TU8) (pin 23))) (net (code 44) (name "Tflir.cs") (node (ref TU5) (pin 38)) (node (ref TU8) (pin 14))) diff --git a/examples/IotThermalCamera/IotThermalCamera.svgpcb.js b/examples/IotThermalCamera/IotThermalCamera.svgpcb.js index 0b256e5c5..96f5e45b8 100644 --- a/examples/IotThermalCamera/IotThermalCamera.svgpcb.js +++ b/examples/IotThermalCamera/IotThermalCamera.svgpcb.js @@ -281,8 +281,8 @@ board.setNetlist([ {name: "Tusb.conn.cc.cc1", pads: [["TJ1", "A5"], ["TR1", "2"]]}, {name: "Tusb.conn.cc.cc2", pads: [["TJ1", "B5"], ["TR2", "2"]]}, {name: "Treg_3v3.fb.output", pads: [["TU1", "4"], ["TR3", "2"], ["TR4", "1"]]}, - {name: "Treg_3v3.boot_cap.neg", pads: [["TU1", "2"], ["TC2", "2"], ["TL1", "1"]]}, {name: "Treg_3v3.boot_cap.pos", pads: [["TU1", "6"], ["TC2", "1"]]}, + {name: "Treg_3v3.boot_cap.neg", pads: [["TU1", "2"], ["TC2", "2"], ["TL1", "1"]]}, {name: "Treg_3v3.en_res.b", pads: [["TU1", "5"], ["TR5", "2"]]}, {name: "Tmcu.program_uart_node.a_tx", pads: [["TU5", "37"], ["TJ2", "3"]]}, {name: "Tmcu.program_uart_node.b_tx", pads: [["TU5", "36"], ["TJ2", "4"]]}, @@ -305,11 +305,11 @@ board.setNetlist([ {name: "Tcam.reset", pads: [["TU5", "23"], ["TJ3", "6"], ["TC15", "1"]]}, {name: "Tcam.device.y.0", pads: [["TJ3", "24"]]}, {name: "Tcam.device.y.1", pads: [["TJ3", "23"]]}, + {name: "Tflir.reset", pads: [["TU5", "34"], ["TU8", "24"]]}, + {name: "Tflir.shutdown", pads: [["TU5", "33"], ["TU8", "23"]]}, {name: "Tflir.spi.sck", pads: [["TU5", "39"], ["TU8", "13"]]}, {name: "Tflir.spi.mosi", pads: [["TU5", "5"], ["TU8", "11"]]}, {name: "Tflir.spi.miso", pads: [["TU5", "4"], ["TU8", "12"]]}, - {name: "Tflir.reset", pads: [["TU5", "34"], ["TU8", "24"]]}, - {name: "Tflir.shutdown", pads: [["TU5", "33"], ["TU8", "23"]]}, {name: "Tflir.cs", pads: [["TU5", "38"], ["TU8", "14"]]}, {name: "Tflir.vsync", pads: [["TU5", "7"], ["TU8", "2"]]}, {name: "Tflir.mclk.out", pads: [["TU8", "26"], ["TX1", "3"]]} diff --git a/examples/Keyboard/Keyboard.net b/examples/Keyboard/Keyboard.net index acc9f02c7..571a7cbda 100644 --- a/examples/Keyboard/Keyboard.net +++ b/examples/Keyboard/Keyboard.net @@ -361,7 +361,14 @@ (sheetpath (names "/sw/") (tstamps "/015f00eb/")) (tstamps "062e01ac"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref C1) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -390,13 +397,6 @@ (node (ref X1) (pin 4)) (node (ref C9) (pin 2)) (node (ref C10) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref C1) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6)) @@ -467,10 +467,10 @@ (net (code 17) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 7))) -(net (code 18) (name "mcu.swd.swo") - (node (ref J2) (pin 6))) -(net (code 19) (name "mcu.swd.tdi") +(net (code 18) (name "mcu.swd.tdi") (node (ref J2) (pin 8))) +(net (code 19) (name "mcu.swd.swo") + (node (ref J2) (pin 6))) (net (code 20) (name "sw.d[0,0].cathode") (node (ref SW1) (pin 1)) (node (ref D1) (pin 1))) diff --git a/examples/Keyboard/Keyboard.svgpcb.js b/examples/Keyboard/Keyboard.svgpcb.js index a9fcea86c..0766103df 100644 --- a/examples/Keyboard/Keyboard.svgpcb.js +++ b/examples/Keyboard/Keyboard.svgpcb.js @@ -93,8 +93,8 @@ const C10 = board.add(C_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["C1", "2"], ["C2", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C3", "2"], ["C4", "2"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["X1", "2"], ["X1", "4"], ["C9", "2"], ["C10", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["C1", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["C1", "2"], ["C2", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C3", "2"], ["C4", "2"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["X1", "2"], ["X1", "4"], ["C9", "2"], ["C10", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"], ["U2", "33"], ["R3", "2"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"], ["U2", "32"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, @@ -110,8 +110,8 @@ board.setNetlist([ {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "sw.d[0,0].cathode", pads: [["SW1", "1"], ["D1", "1"]]}, {name: "sw.d[0,1].cathode", pads: [["SW2", "1"], ["D2", "1"]]}, {name: "sw.d[0,2].cathode", pads: [["SW3", "1"], ["D3", "1"]]}, diff --git a/examples/Multimeter/Multimeter.net b/examples/Multimeter/Multimeter.net index d234d0e24..8e196fafc 100644 --- a/examples/Multimeter/Multimeter.net +++ b/examples/Multimeter/Multimeter.net @@ -1507,39 +1507,39 @@ (net (code 23) (name "reg_5v.power_path.switch") (node (ref U2) (pin 5)) (node (ref L1) (pin 2))) -(net (code 24) (name "mcu.pwr_usb") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U5) (pin 32)) - (node (ref C8) (pin 1))) -(net (code 25) (name "mcu.gpio.rgb_red") +(net (code 24) (name "mcu.gpio.rgb_red") (node (ref U5) (pin 4)) (node (ref R10) (pin 2))) -(net (code 26) (name "mcu.gpio.rgb_green") +(net (code 25) (name "mcu.gpio.rgb_green") (node (ref U5) (pin 5)) (node (ref R11) (pin 2))) -(net (code 27) (name "mcu.gpio.rgb_blue") +(net (code 26) (name "mcu.gpio.rgb_blue") (node (ref U5) (pin 6)) (node (ref R12) (pin 2))) -(net (code 28) (name "mcu.gpio.inn_control_0") +(net (code 27) (name "mcu.gpio.inn_control_0") (node (ref U5) (pin 41)) (node (ref U9) (pin 6))) -(net (code 29) (name "mcu.gpio.measure_select_0_0") +(net (code 28) (name "mcu.gpio.measure_select_0_0") (node (ref U5) (pin 42)) (node (ref U10) (pin 6)) (node (ref U11) (pin 6))) -(net (code 30) (name "mcu.gpio.measure_select_1_0") +(net (code 29) (name "mcu.gpio.measure_select_1_0") (node (ref U5) (pin 43)) (node (ref U12) (pin 6))) -(net (code 31) (name "mcu.gpio.driver_select_0_0") +(net (code 30) (name "mcu.gpio.driver_select_0_0") (node (ref U5) (pin 46)) (node (ref U16) (pin 6)) (node (ref U17) (pin 6))) -(net (code 32) (name "mcu.gpio.driver_select_1_0") +(net (code 31) (name "mcu.gpio.driver_select_1_0") (node (ref U5) (pin 44)) (node (ref U18) (pin 6))) +(net (code 32) (name "mcu.pwr_usb") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U5) (pin 32)) + (node (ref C8) (pin 1))) (net (code 33) (name "mcu.swd_node.swdio") (node (ref U5) (pin 51)) (node (ref J2) (pin 10))) @@ -1555,11 +1555,11 @@ (net (code 37) (name "mcu.usb_chain_0.d_N") (node (ref U5) (pin 34)) (node (ref R7) (pin 1))) -(net (code 38) (name "mcu.swd.swo") +(net (code 38) (name "mcu.swd.tdi") + (node (ref J2) (pin 7))) +(net (code 39) (name "mcu.swd.swo") (node (ref U5) (pin 47)) (node (ref J2) (pin 8))) -(net (code 39) (name "mcu.swd.tdi") - (node (ref J2) (pin 7))) (net (code 40) (name "vbatsense.output") (node (ref U5) (pin 9)) (node (ref R8) (pin 2)) @@ -1585,15 +1585,15 @@ (net (code 47) (name "lcd.rs") (node (ref U5) (pin 10)) (node (ref J3) (pin 4))) -(net (code 48) (name "lcd.spi.sck") +(net (code 48) (name "lcd.cs") + (node (ref U5) (pin 17)) + (node (ref J3) (pin 8))) +(net (code 49) (name "lcd.spi.sck") (node (ref U5) (pin 18)) (node (ref J3) (pin 6))) -(net (code 49) (name "lcd.spi.mosi") +(net (code 50) (name "lcd.spi.mosi") (node (ref U5) (pin 19)) (node (ref J3) (pin 5))) -(net (code 50) (name "lcd.cs") - (node (ref U5) (pin 17)) - (node (ref J3) (pin 8))) (net (code 51) (name "lcd.led_res.b") (node (ref J3) (pin 1)) (node (ref R13) (pin 2))) @@ -1639,32 +1639,32 @@ (node (ref R22) (pin 2))) (net (code 64) (name "measure.range.dummy.io") (node (ref U11) (pin 1))) -(net (code 65) (name "adc.spi.sck") +(net (code 65) (name "adc.mclkin") + (node (ref U14) (pin 18))) +(net (code 66) (name "adc.vins.2") + (node (ref U14) (pin 7))) +(net (code 67) (name "adc.vins.3") + (node (ref U14) (pin 8))) +(net (code 68) (name "adc.vins.4") + (node (ref U14) (pin 9))) +(net (code 69) (name "adc.vins.5") + (node (ref U14) (pin 10))) +(net (code 70) (name "adc.vins.6") + (node (ref U14) (pin 11))) +(net (code 71) (name "adc.vins.7") + (node (ref U14) (pin 12))) +(net (code 72) (name "adc.spi.sck") (node (ref U5) (pin 37)) (node (ref U14) (pin 14))) -(net (code 66) (name "adc.spi.mosi") +(net (code 73) (name "adc.spi.mosi") (node (ref U5) (pin 26)) (node (ref U14) (pin 15))) -(net (code 67) (name "adc.spi.miso") +(net (code 74) (name "adc.spi.miso") (node (ref U5) (pin 24)) (node (ref U14) (pin 16))) -(net (code 68) (name "adc.cs") +(net (code 75) (name "adc.cs") (node (ref U5) (pin 39)) (node (ref U14) (pin 13))) -(net (code 69) (name "adc.mclkin") - (node (ref U14) (pin 18))) -(net (code 70) (name "adc.vins.2") - (node (ref U14) (pin 7))) -(net (code 71) (name "adc.vins.3") - (node (ref U14) (pin 8))) -(net (code 72) (name "adc.vins.4") - (node (ref U14) (pin 9))) -(net (code 73) (name "adc.vins.5") - (node (ref U14) (pin 10))) -(net (code 74) (name "adc.vins.6") - (node (ref U14) (pin 11))) -(net (code 75) (name "adc.vins.7") - (node (ref U14) (pin 12))) (net (code 76) (name "adc.ic.avdd") (node (ref U14) (pin 1)) (node (ref R23) (pin 2)) @@ -1686,12 +1686,12 @@ (node (ref U15) (pin 4)) (node (ref U18) (pin 4)) (node (ref U19) (pin 3))) -(net (code 81) (name "driver.fet.gate") - (node (ref Q3) (pin 1)) - (node (ref U19) (pin 4))) -(net (code 82) (name "driver.fet.drain") +(net (code 81) (name "driver.fet.drain") (node (ref Q3) (pin 3)) (node (ref D7) (pin 2))) +(net (code 82) (name "driver.fet.gate") + (node (ref Q3) (pin 1)) + (node (ref U19) (pin 4))) (net (code 83) (name "driver.amp.out") (node (ref U15) (pin 1)) (node (ref U19) (pin 1))) diff --git a/examples/Multimeter/Multimeter.svgpcb.js b/examples/Multimeter/Multimeter.svgpcb.js index 160337fd7..f8aa5c0a2 100644 --- a/examples/Multimeter/Multimeter.svgpcb.js +++ b/examples/Multimeter/Multimeter.svgpcb.js @@ -560,7 +560,6 @@ board.setNetlist([ {name: "gate.pwr_gate.pull_res.b", pads: [["R3", "2"], ["Q1", "1"], ["Q2", "3"], ["D1", "2"]]}, {name: "reg_5v.ic.ce", pads: [["U2", "1"], ["R5", "2"]]}, {name: "reg_5v.power_path.switch", pads: [["U2", "5"], ["L1", "2"]]}, - {name: "mcu.pwr_usb", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U5", "32"], ["C8", "1"]]}, {name: "mcu.gpio.rgb_red", pads: [["U5", "4"], ["R10", "2"]]}, {name: "mcu.gpio.rgb_green", pads: [["U5", "5"], ["R11", "2"]]}, {name: "mcu.gpio.rgb_blue", pads: [["U5", "6"], ["R12", "2"]]}, @@ -569,13 +568,14 @@ board.setNetlist([ {name: "mcu.gpio.measure_select_1_0", pads: [["U5", "43"], ["U12", "6"]]}, {name: "mcu.gpio.driver_select_0_0", pads: [["U5", "46"], ["U16", "6"], ["U17", "6"]]}, {name: "mcu.gpio.driver_select_1_0", pads: [["U5", "44"], ["U18", "6"]]}, + {name: "mcu.pwr_usb", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U5", "32"], ["C8", "1"]]}, {name: "mcu.swd_node.swdio", pads: [["U5", "51"], ["J2", "10"]]}, {name: "mcu.swd_node.swclk", pads: [["U5", "53"], ["J2", "9"]]}, {name: "mcu.reset_node", pads: [["U5", "40"], ["J2", "6"]]}, {name: "mcu.usb_chain_0.d_P", pads: [["U5", "35"], ["R6", "1"]]}, {name: "mcu.usb_chain_0.d_N", pads: [["U5", "34"], ["R7", "1"]]}, - {name: "mcu.swd.swo", pads: [["U5", "47"], ["J2", "8"]]}, {name: "mcu.swd.tdi", pads: [["J2", "7"]]}, + {name: "mcu.swd.swo", pads: [["U5", "47"], ["J2", "8"]]}, {name: "vbatsense.output", pads: [["U5", "9"], ["R8", "2"], ["R9", "1"]]}, {name: "rgb.red_res.a", pads: [["D6", "3"], ["R10", "1"]]}, {name: "rgb.green_res.a", pads: [["D6", "4"], ["R11", "1"]]}, @@ -584,9 +584,9 @@ board.setNetlist([ {name: "sw2.out", pads: [["U5", "3"], ["SW3", "1"]]}, {name: "lcd.reset", pads: [["U5", "8"], ["J3", "3"]]}, {name: "lcd.rs", pads: [["U5", "10"], ["J3", "4"]]}, + {name: "lcd.cs", pads: [["U5", "17"], ["J3", "8"]]}, {name: "lcd.spi.sck", pads: [["U5", "18"], ["J3", "6"]]}, {name: "lcd.spi.mosi", pads: [["U5", "19"], ["J3", "5"]]}, - {name: "lcd.cs", pads: [["U5", "17"], ["J3", "8"]]}, {name: "lcd.led_res.b", pads: [["J3", "1"], ["R13", "2"]]}, {name: "spk_drv.inp_res.b", pads: [["U7", "4"], ["R15", "2"]]}, {name: "spk_drv.inp_cap.pos", pads: [["R15", "1"], ["C13", "1"]]}, @@ -601,10 +601,6 @@ board.setNetlist([ {name: "measure.range.res[1].b", pads: [["U10", "1"], ["R21", "2"]]}, {name: "measure.range.res[2].b", pads: [["U11", "3"], ["R22", "2"]]}, {name: "measure.range.dummy.io", pads: [["U11", "1"]]}, - {name: "adc.spi.sck", pads: [["U5", "37"], ["U14", "14"]]}, - {name: "adc.spi.mosi", pads: [["U5", "26"], ["U14", "15"]]}, - {name: "adc.spi.miso", pads: [["U5", "24"], ["U14", "16"]]}, - {name: "adc.cs", pads: [["U5", "39"], ["U14", "13"]]}, {name: "adc.mclkin", pads: [["U14", "18"]]}, {name: "adc.vins.2", pads: [["U14", "7"]]}, {name: "adc.vins.3", pads: [["U14", "8"]]}, @@ -612,13 +608,17 @@ board.setNetlist([ {name: "adc.vins.5", pads: [["U14", "10"]]}, {name: "adc.vins.6", pads: [["U14", "11"]]}, {name: "adc.vins.7", pads: [["U14", "12"]]}, + {name: "adc.spi.sck", pads: [["U5", "37"], ["U14", "14"]]}, + {name: "adc.spi.mosi", pads: [["U5", "26"], ["U14", "15"]]}, + {name: "adc.spi.miso", pads: [["U5", "24"], ["U14", "16"]]}, + {name: "adc.cs", pads: [["U5", "39"], ["U14", "13"]]}, {name: "adc.ic.avdd", pads: [["U14", "1"], ["R23", "2"], ["C21", "1"], ["C22", "1"]]}, {name: "adc.ic.dvdd", pads: [["U14", "20"], ["R24", "2"], ["C23", "1"], ["C24", "1"]]}, {name: "adc.ic.vrefp", pads: [["U14", "4"], ["C25", "1"]]}, {name: "driver.enable", pads: [["U5", "48"], ["U19", "6"]]}, {name: "driver.fet.source", pads: [["Q3", "2"], ["U15", "4"], ["U18", "4"], ["U19", "3"]]}, - {name: "driver.fet.gate", pads: [["Q3", "1"], ["U19", "4"]]}, {name: "driver.fet.drain", pads: [["Q3", "3"], ["D7", "2"]]}, + {name: "driver.fet.gate", pads: [["Q3", "1"], ["U19", "4"]]}, {name: "driver.amp.out", pads: [["U15", "1"], ["U19", "1"]]}, {name: "driver.range.switch.sw[0_0].com", pads: [["U16", "4"], ["U18", "3"]]}, {name: "driver.range.switch.sw[0_1].com", pads: [["U17", "4"], ["U18", "1"]]}, diff --git a/examples/PcbBot/PcbBot.net b/examples/PcbBot/PcbBot.net index 762691289..28d2051e2 100644 --- a/examples/PcbBot/PcbBot.net +++ b/examples/PcbBot/PcbBot.net @@ -1648,12 +1648,12 @@ (net (code 48) (name "oled.reset") (node (ref U3) (pin 31)) (node (ref J8) (pin 14))) -(net (code 49) (name "oled.device.vcomh") - (node (ref J8) (pin 27)) - (node (ref C16) (pin 1))) -(net (code 50) (name "oled.device.vcc") +(net (code 49) (name "oled.device.vcc") (node (ref J8) (pin 28)) (node (ref C19) (pin 1))) +(net (code 50) (name "oled.device.vcomh") + (node (ref J8) (pin 27)) + (node (ref C16) (pin 1))) (net (code 51) (name "oled.c1_cap.pos") (node (ref J8) (pin 4)) (node (ref C14) (pin 1))) diff --git a/examples/PcbBot/PcbBot.svgpcb.js b/examples/PcbBot/PcbBot.svgpcb.js index 4399f5642..5a237d5d5 100644 --- a/examples/PcbBot/PcbBot.svgpcb.js +++ b/examples/PcbBot/PcbBot.svgpcb.js @@ -590,8 +590,8 @@ board.setNetlist([ {name: "rgb.green_res.a", pads: [["D8", "3"], ["R13", "1"]]}, {name: "rgb.blue_res.a", pads: [["D8", "4"], ["R14", "1"]]}, {name: "oled.reset", pads: [["U3", "31"], ["J8", "14"]]}, - {name: "oled.device.vcomh", pads: [["J8", "27"], ["C16", "1"]]}, {name: "oled.device.vcc", pads: [["J8", "28"], ["C19", "1"]]}, + {name: "oled.device.vcomh", pads: [["J8", "27"], ["C16", "1"]]}, {name: "oled.c1_cap.pos", pads: [["J8", "4"], ["C14", "1"]]}, {name: "oled.c1_cap.neg", pads: [["J8", "5"], ["C14", "2"]]}, {name: "oled.c2_cap.pos", pads: [["J8", "2"], ["C15", "1"]]}, diff --git a/examples/PicoProbe/PicoProbe.net b/examples/PicoProbe/PicoProbe.net index c91920e98..d7e906645 100644 --- a/examples/PicoProbe/PicoProbe.net +++ b/examples/PicoProbe/PicoProbe.net @@ -624,31 +624,31 @@ (net (code 16) (name "Smcu.swd.swo") (node (ref SJ2) (pin 6)) (node (ref SU3) (pin 15))) -(net (code 17) (name "Smcu.ic.qspi.sck") +(net (code 17) (name "Smcu.ic.vreg_vout") + (node (ref SU3) (pin 23)) + (node (ref SU3) (pin 45)) + (node (ref SU3) (pin 50)) + (node (ref SC14) (pin 1)) + (node (ref SC15) (pin 1)) + (node (ref SC16) (pin 1))) +(net (code 18) (name "Smcu.ic.qspi.sck") (node (ref SU3) (pin 52)) (node (ref SU4) (pin 6))) -(net (code 18) (name "Smcu.ic.qspi.mosi") +(net (code 19) (name "Smcu.ic.qspi.mosi") (node (ref SU3) (pin 53)) (node (ref SU4) (pin 5))) -(net (code 19) (name "Smcu.ic.qspi.miso") +(net (code 20) (name "Smcu.ic.qspi.miso") (node (ref SU3) (pin 55)) (node (ref SU4) (pin 2))) -(net (code 20) (name "Smcu.ic.qspi_cs") +(net (code 21) (name "Smcu.ic.qspi_cs") (node (ref SU3) (pin 56)) (node (ref SU4) (pin 1))) -(net (code 21) (name "Smcu.ic.qspi_sd2") +(net (code 22) (name "Smcu.ic.qspi_sd2") (node (ref SU3) (pin 54)) (node (ref SU4) (pin 3))) -(net (code 22) (name "Smcu.ic.qspi_sd3") +(net (code 23) (name "Smcu.ic.qspi_sd3") (node (ref SU3) (pin 51)) (node (ref SU4) (pin 7))) -(net (code 23) (name "Smcu.ic.vreg_vout") - (node (ref SU3) (pin 23)) - (node (ref SU3) (pin 45)) - (node (ref SU3) (pin 50)) - (node (ref SC14) (pin 1)) - (node (ref SC15) (pin 1)) - (node (ref SC16) (pin 1))) (net (code 24) (name "Sled_tgt.signal") (node (ref SU3) (pin 27)) (node (ref SD2) (pin 2))) @@ -671,12 +671,12 @@ (net (code 30) (name "Starget_drv.swdio") (node (ref SU3) (pin 5)) (node (ref SJ3) (pin 2))) -(net (code 31) (name "Starget.swo") - (node (ref SU3) (pin 3)) - (node (ref SJ3) (pin 6))) -(net (code 32) (name "Starget.reset") +(net (code 31) (name "Starget.reset") (node (ref SU3) (pin 7)) (node (ref SJ3) (pin 3))) +(net (code 32) (name "Starget.swo") + (node (ref SU3) (pin 3)) + (node (ref SJ3) (pin 6))) (net (code 33) (name "Sled_target.res.a") (node (ref SD4) (pin 1)) (node (ref SR8) (pin 1))) diff --git a/examples/PicoProbe/PicoProbe.svgpcb.js b/examples/PicoProbe/PicoProbe.svgpcb.js index bd9bdad91..2481b9f39 100644 --- a/examples/PicoProbe/PicoProbe.svgpcb.js +++ b/examples/PicoProbe/PicoProbe.svgpcb.js @@ -228,13 +228,13 @@ board.setNetlist([ {name: "Smcu.usb_chain_0.d_P", pads: [["SU3", "47"], ["SR3", "1"]]}, {name: "Smcu.usb_chain_0.d_N", pads: [["SU3", "46"], ["SR4", "1"]]}, {name: "Smcu.swd.swo", pads: [["SJ2", "6"], ["SU3", "15"]]}, + {name: "Smcu.ic.vreg_vout", pads: [["SU3", "23"], ["SU3", "45"], ["SU3", "50"], ["SC14", "1"], ["SC15", "1"], ["SC16", "1"]]}, {name: "Smcu.ic.qspi.sck", pads: [["SU3", "52"], ["SU4", "6"]]}, {name: "Smcu.ic.qspi.mosi", pads: [["SU3", "53"], ["SU4", "5"]]}, {name: "Smcu.ic.qspi.miso", pads: [["SU3", "55"], ["SU4", "2"]]}, {name: "Smcu.ic.qspi_cs", pads: [["SU3", "56"], ["SU4", "1"]]}, {name: "Smcu.ic.qspi_sd2", pads: [["SU3", "54"], ["SU4", "3"]]}, {name: "Smcu.ic.qspi_sd3", pads: [["SU3", "51"], ["SU4", "7"]]}, - {name: "Smcu.ic.vreg_vout", pads: [["SU3", "23"], ["SU3", "45"], ["SU3", "50"], ["SC14", "1"], ["SC15", "1"], ["SC16", "1"]]}, {name: "Sled_tgt.signal", pads: [["SU3", "27"], ["SD2", "2"]]}, {name: "Sled_tgt.res.a", pads: [["SD2", "1"], ["SR5", "1"]]}, {name: "Sled_usb.signal", pads: [["SU3", "37"], ["SD3", "2"]]}, @@ -242,8 +242,8 @@ board.setNetlist([ {name: "Sen_pull.io", pads: [["SU2", "3"], ["SU3", "17"], ["SR7", "2"]]}, {name: "Starget_drv.swclk", pads: [["SU3", "4"], ["SJ3", "4"]]}, {name: "Starget_drv.swdio", pads: [["SU3", "5"], ["SJ3", "2"]]}, - {name: "Starget.swo", pads: [["SU3", "3"], ["SJ3", "6"]]}, {name: "Starget.reset", pads: [["SU3", "7"], ["SJ3", "3"]]}, + {name: "Starget.swo", pads: [["SU3", "3"], ["SJ3", "6"]]}, {name: "Sled_target.res.a", pads: [["SD4", "1"], ["SR8", "1"]]}, {name: "Starget_sense.output", pads: [["SU3", "40"], ["SR9", "2"], ["SR10", "1"]]} ]) diff --git a/examples/RobotCrawler/RobotCrawler.net b/examples/RobotCrawler/RobotCrawler.net index 06bdb57d6..281ae9681 100644 --- a/examples/RobotCrawler/RobotCrawler.net +++ b/examples/RobotCrawler/RobotCrawler.net @@ -1880,31 +1880,31 @@ (net (code 58) (name "Rmcu_test.swd.swo") (node (ref RJ18) (pin 6)) (node (ref RU8) (pin 27))) -(net (code 59) (name "Rmcu_test.ic.qspi.sck") +(net (code 59) (name "Rmcu_test.ic.vreg_vout") + (node (ref RU8) (pin 23)) + (node (ref RU8) (pin 45)) + (node (ref RU8) (pin 50)) + (node (ref RC30) (pin 1)) + (node (ref RC31) (pin 1)) + (node (ref RC32) (pin 1))) +(net (code 60) (name "Rmcu_test.ic.qspi.sck") (node (ref RU8) (pin 52)) (node (ref RU9) (pin 6))) -(net (code 60) (name "Rmcu_test.ic.qspi.mosi") +(net (code 61) (name "Rmcu_test.ic.qspi.mosi") (node (ref RU8) (pin 53)) (node (ref RU9) (pin 5))) -(net (code 61) (name "Rmcu_test.ic.qspi.miso") +(net (code 62) (name "Rmcu_test.ic.qspi.miso") (node (ref RU8) (pin 55)) (node (ref RU9) (pin 2))) -(net (code 62) (name "Rmcu_test.ic.qspi_cs") +(net (code 63) (name "Rmcu_test.ic.qspi_cs") (node (ref RU8) (pin 56)) (node (ref RU9) (pin 1))) -(net (code 63) (name "Rmcu_test.ic.qspi_sd2") +(net (code 64) (name "Rmcu_test.ic.qspi_sd2") (node (ref RU8) (pin 54)) (node (ref RU9) (pin 3))) -(net (code 64) (name "Rmcu_test.ic.qspi_sd3") +(net (code 65) (name "Rmcu_test.ic.qspi_sd3") (node (ref RU8) (pin 51)) (node (ref RU9) (pin 7))) -(net (code 65) (name "Rmcu_test.ic.vreg_vout") - (node (ref RU8) (pin 23)) - (node (ref RU8) (pin 45)) - (node (ref RU8) (pin 50)) - (node (ref RC30) (pin 1)) - (node (ref RC31) (pin 1)) - (node (ref RC32) (pin 1))) (net (code 66) (name "Rmcu_test.ic.xosc.xtal_in") (node (ref RU8) (pin 20))) (net (code 67) (name "Rmcu_test.ic.xosc.xtal_out") @@ -1940,14 +1940,14 @@ (node (ref RJ19) (pin 29)) (node (ref RJ19) (pin 3)) (node (ref RC33) (pin 1))) -(net (code 78) (name "Roled.device.vp") - (node (ref RJ19) (pin 28)) - (node (ref RJ19) (pin 4)) - (node (ref RC34) (pin 1))) -(net (code 79) (name "Roled.device.vsl") +(net (code 78) (name "Roled.device.vsl") (node (ref RJ19) (pin 2)) (node (ref RJ19) (pin 30)) (node (ref RR13) (pin 1))) +(net (code 79) (name "Roled.device.vp") + (node (ref RJ19) (pin 28)) + (node (ref RJ19) (pin 4)) + (node (ref RC34) (pin 1))) (net (code 80) (name "Roled.iref_res.a") (node (ref RJ19) (pin 6)) (node (ref RR12) (pin 1))) diff --git a/examples/RobotCrawler/RobotCrawler.svgpcb.js b/examples/RobotCrawler/RobotCrawler.svgpcb.js index 1604da248..92b03aad9 100644 --- a/examples/RobotCrawler/RobotCrawler.svgpcb.js +++ b/examples/RobotCrawler/RobotCrawler.svgpcb.js @@ -670,13 +670,13 @@ board.setNetlist([ {name: "Rmcu_test.swd_node.swclk", pads: [["RJ18", "4"], ["RU8", "24"]]}, {name: "Rmcu_test.reset_node", pads: [["RJ18", "3"], ["RU8", "26"]]}, {name: "Rmcu_test.swd.swo", pads: [["RJ18", "6"], ["RU8", "27"]]}, + {name: "Rmcu_test.ic.vreg_vout", pads: [["RU8", "23"], ["RU8", "45"], ["RU8", "50"], ["RC30", "1"], ["RC31", "1"], ["RC32", "1"]]}, {name: "Rmcu_test.ic.qspi.sck", pads: [["RU8", "52"], ["RU9", "6"]]}, {name: "Rmcu_test.ic.qspi.mosi", pads: [["RU8", "53"], ["RU9", "5"]]}, {name: "Rmcu_test.ic.qspi.miso", pads: [["RU8", "55"], ["RU9", "2"]]}, {name: "Rmcu_test.ic.qspi_cs", pads: [["RU8", "56"], ["RU9", "1"]]}, {name: "Rmcu_test.ic.qspi_sd2", pads: [["RU8", "54"], ["RU9", "3"]]}, {name: "Rmcu_test.ic.qspi_sd3", pads: [["RU8", "51"], ["RU9", "7"]]}, - {name: "Rmcu_test.ic.vreg_vout", pads: [["RU8", "23"], ["RU8", "45"], ["RU8", "50"], ["RC30", "1"], ["RC31", "1"], ["RC32", "1"]]}, {name: "Rmcu_test.ic.xosc.xtal_in", pads: [["RU8", "20"]]}, {name: "Rmcu_test.ic.xosc.xtal_out", pads: [["RU8", "21"]]}, {name: "Rled.signal", pads: [["RU6", "33"], ["RD2", "2"]]}, @@ -689,8 +689,8 @@ board.setNetlist([ {name: "Rtest_led.led[3].res.a", pads: [["RD7", "1"], ["RR11", "1"]]}, {name: "Roled.reset", pads: [["RU6", "8"], ["RJ19", "9"]]}, {name: "Roled.device.vcomh", pads: [["RJ19", "29"], ["RJ19", "3"], ["RC33", "1"]]}, - {name: "Roled.device.vp", pads: [["RJ19", "28"], ["RJ19", "4"], ["RC34", "1"]]}, {name: "Roled.device.vsl", pads: [["RJ19", "2"], ["RJ19", "30"], ["RR13", "1"]]}, + {name: "Roled.device.vp", pads: [["RJ19", "28"], ["RJ19", "4"], ["RC34", "1"]]}, {name: "Roled.iref_res.a", pads: [["RJ19", "6"], ["RR12", "1"]]}, {name: "Roled.vsl_res.b", pads: [["RR13", "2"], ["RD8", "2"]]}, {name: "Roled.vsl_d1.cathode", pads: [["RD8", "1"], ["RD9", "2"]]}, diff --git a/examples/RobotDriver/RobotDriver.net b/examples/RobotDriver/RobotDriver.net index 8358c06a1..d2acc76ff 100644 --- a/examples/RobotDriver/RobotDriver.net +++ b/examples/RobotDriver/RobotDriver.net @@ -1194,28 +1194,28 @@ (node (ref J4) (pin 5))) (net (code 22) (name "tof.elt[2].ic.gpio1") (node (ref J5) (pin 5))) -(net (code 23) (name "lcd.spi.sck") +(net (code 23) (name "lcd.reset") + (node (ref U3) (pin 12)) + (node (ref J6) (pin 9))) +(net (code 24) (name "lcd.spi.sck") (node (ref U3) (pin 9)) (node (ref J6) (pin 11))) -(net (code 24) (name "lcd.spi.mosi") +(net (code 25) (name "lcd.spi.mosi") (node (ref U3) (pin 8)) (node (ref J6) (pin 12))) -(net (code 25) (name "lcd.cs") +(net (code 26) (name "lcd.cs") (node (ref U3) (pin 13)) (node (ref J6) (pin 8))) -(net (code 26) (name "lcd.reset") - (node (ref U3) (pin 12)) - (node (ref J6) (pin 9))) (net (code 27) (name "lcd.dc") (node (ref U3) (pin 10)) (node (ref J6) (pin 10))) -(net (code 28) (name "lcd.device.vcomh") - (node (ref J6) (pin 14)) - (node (ref C9) (pin 1))) -(net (code 29) (name "lcd.device.vcc") +(net (code 28) (name "lcd.device.vcc") (node (ref J6) (pin 15)) (node (ref C12) (pin 1)) (node (ref C13) (pin 1))) +(net (code 29) (name "lcd.device.vcomh") + (node (ref J6) (pin 14)) + (node (ref C9) (pin 1))) (net (code 30) (name "lcd.c1_cap.pos") (node (ref J6) (pin 3)) (node (ref C7) (pin 1))) diff --git a/examples/RobotDriver/RobotDriver.svgpcb.js b/examples/RobotDriver/RobotDriver.svgpcb.js index 5ea8f8371..41710b5d2 100644 --- a/examples/RobotDriver/RobotDriver.svgpcb.js +++ b/examples/RobotDriver/RobotDriver.svgpcb.js @@ -439,13 +439,13 @@ board.setNetlist([ {name: "tof.elt[0].ic.gpio1", pads: [["J3", "5"]]}, {name: "tof.elt[1].ic.gpio1", pads: [["J4", "5"]]}, {name: "tof.elt[2].ic.gpio1", pads: [["J5", "5"]]}, + {name: "lcd.reset", pads: [["U3", "12"], ["J6", "9"]]}, {name: "lcd.spi.sck", pads: [["U3", "9"], ["J6", "11"]]}, {name: "lcd.spi.mosi", pads: [["U3", "8"], ["J6", "12"]]}, {name: "lcd.cs", pads: [["U3", "13"], ["J6", "8"]]}, - {name: "lcd.reset", pads: [["U3", "12"], ["J6", "9"]]}, {name: "lcd.dc", pads: [["U3", "10"], ["J6", "10"]]}, - {name: "lcd.device.vcomh", pads: [["J6", "14"], ["C9", "1"]]}, {name: "lcd.device.vcc", pads: [["J6", "15"], ["C12", "1"], ["C13", "1"]]}, + {name: "lcd.device.vcomh", pads: [["J6", "14"], ["C9", "1"]]}, {name: "lcd.c1_cap.pos", pads: [["J6", "3"], ["C7", "1"]]}, {name: "lcd.c1_cap.neg", pads: [["J6", "4"], ["C7", "2"]]}, {name: "lcd.c2_cap.pos", pads: [["J6", "1"], ["C8", "1"]]}, diff --git a/examples/SwdDebugger/SwdDebugger.net b/examples/SwdDebugger/SwdDebugger.net index b4bc69a1e..9d8fcbbcd 100644 --- a/examples/SwdDebugger/SwdDebugger.net +++ b/examples/SwdDebugger/SwdDebugger.net @@ -599,11 +599,11 @@ (net (code 13) (name "Smcu.reset_node") (node (ref SJ2) (pin 10)) (node (ref SU3) (pin 7))) -(net (code 14) (name "Smcu.swd.swo") +(net (code 14) (name "Smcu.swd.tdi") + (node (ref SJ2) (pin 8))) +(net (code 15) (name "Smcu.swd.swo") (node (ref SJ2) (pin 6)) (node (ref SU3) (pin 39))) -(net (code 15) (name "Smcu.swd.tdi") - (node (ref SJ2) (pin 8))) (net (code 16) (name "Sled_tgt.signal") (node (ref SU3) (pin 30)) (node (ref SD2) (pin 2))) @@ -623,28 +623,28 @@ (net (code 21) (name "Starget_drv.swclk_in") (node (ref SU3) (pin 26)) (node (ref SR7) (pin 1))) -(net (code 22) (name "Starget_drv.swdio_out") +(net (code 22) (name "Starget_drv.swdio_in") + (node (ref SU3) (pin 25)) + (node (ref SR9) (pin 1))) +(net (code 23) (name "Starget_drv.swdio_out") (node (ref SU3) (pin 27)) (node (ref SR8) (pin 1)) (node (ref SR9) (pin 2))) -(net (code 23) (name "Starget_drv.swdio_in") - (node (ref SU3) (pin 25)) - (node (ref SR9) (pin 1))) -(net (code 24) (name "Starget_drv.swo_out") +(net (code 24) (name "Starget_drv.reset_out") + (node (ref SR10) (pin 2)) + (node (ref SJ3) (pin 10))) +(net (code 25) (name "Starget_drv.swo_out") (node (ref SU3) (pin 31)) (node (ref SR11) (pin 1))) -(net (code 25) (name "Starget_drv.swd.swdio") +(net (code 26) (name "Starget_drv.swd.swdio") (node (ref SR8) (pin 2)) (node (ref SJ3) (pin 2))) -(net (code 26) (name "Starget_drv.swd.swclk") +(net (code 27) (name "Starget_drv.swd.swclk") (node (ref SR7) (pin 2)) (node (ref SJ3) (pin 4))) -(net (code 27) (name "Starget_drv.swo_in") +(net (code 28) (name "Starget_drv.swo_in") (node (ref SR11) (pin 2)) (node (ref SJ3) (pin 6))) -(net (code 28) (name "Starget_drv.reset_out") - (node (ref SR10) (pin 2)) - (node (ref SJ3) (pin 10))) (net (code 29) (name "Sreset_pull.io") (node (ref SU3) (pin 18)) (node (ref SR10) (pin 1)) diff --git a/examples/SwdDebugger/SwdDebugger.svgpcb.js b/examples/SwdDebugger/SwdDebugger.svgpcb.js index 96225ed89..64728d0e8 100644 --- a/examples/SwdDebugger/SwdDebugger.svgpcb.js +++ b/examples/SwdDebugger/SwdDebugger.svgpcb.js @@ -220,21 +220,21 @@ board.setNetlist([ {name: "Smcu.swd_node.swdio", pads: [["SJ2", "2"], ["SU3", "34"]]}, {name: "Smcu.swd_node.swclk", pads: [["SJ2", "4"], ["SU3", "37"]]}, {name: "Smcu.reset_node", pads: [["SJ2", "10"], ["SU3", "7"]]}, - {name: "Smcu.swd.swo", pads: [["SJ2", "6"], ["SU3", "39"]]}, {name: "Smcu.swd.tdi", pads: [["SJ2", "8"]]}, + {name: "Smcu.swd.swo", pads: [["SJ2", "6"], ["SU3", "39"]]}, {name: "Sled_tgt.signal", pads: [["SU3", "30"], ["SD2", "2"]]}, {name: "Sled_tgt.res.a", pads: [["SD2", "1"], ["SR4", "1"]]}, {name: "Sled_usb.signal", pads: [["SU3", "42"], ["SD3", "2"]]}, {name: "Sled_usb.res.a", pads: [["SD3", "1"], ["SR5", "1"]]}, {name: "Sen_pull.io", pads: [["SU2", "3"], ["SU3", "28"], ["SR6", "2"]]}, {name: "Starget_drv.swclk_in", pads: [["SU3", "26"], ["SR7", "1"]]}, - {name: "Starget_drv.swdio_out", pads: [["SU3", "27"], ["SR8", "1"], ["SR9", "2"]]}, {name: "Starget_drv.swdio_in", pads: [["SU3", "25"], ["SR9", "1"]]}, + {name: "Starget_drv.swdio_out", pads: [["SU3", "27"], ["SR8", "1"], ["SR9", "2"]]}, + {name: "Starget_drv.reset_out", pads: [["SR10", "2"], ["SJ3", "10"]]}, {name: "Starget_drv.swo_out", pads: [["SU3", "31"], ["SR11", "1"]]}, {name: "Starget_drv.swd.swdio", pads: [["SR8", "2"], ["SJ3", "2"]]}, {name: "Starget_drv.swd.swclk", pads: [["SR7", "2"], ["SJ3", "4"]]}, {name: "Starget_drv.swo_in", pads: [["SR11", "2"], ["SJ3", "6"]]}, - {name: "Starget_drv.reset_out", pads: [["SR10", "2"], ["SJ3", "10"]]}, {name: "Sreset_pull.io", pads: [["SU3", "18"], ["SR10", "1"], ["SR12", "2"], ["SSW1", "1"]]}, {name: "Starget.tdi", pads: [["SJ3", "8"]]}, {name: "Sled_target.res.a", pads: [["SD4", "1"], ["SR13", "1"]]}, diff --git a/examples/TestBlinkyArray/TestBlinkyArray.net b/examples/TestBlinkyArray/TestBlinkyArray.net index f8d0fb7ba..91b283ea2 100644 --- a/examples/TestBlinkyArray/TestBlinkyArray.net +++ b/examples/TestBlinkyArray/TestBlinkyArray.net @@ -325,7 +325,16 @@ (sheetpath (names "/led/led[3]/") (tstamps "/02750136/07eb0221/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -352,15 +361,6 @@ (node (ref R7) (pin 2)) (node (ref R8) (pin 2)) (node (ref R9) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -386,13 +386,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.gpio.led_0") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) diff --git a/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js b/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js index 5bbd44f97..55aa3fd2d 100644 --- a/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js +++ b/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js @@ -137,16 +137,16 @@ const R9 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["U2", "2"], ["C5", "1"], ["C6", "1"], ["J2", "1"], ["R5", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.gpio.led_0", pads: [["U2", "26"], ["D1", "2"]]}, {name: "mcu.gpio.led_1", pads: [["U2", "27"], ["D2", "2"]]}, {name: "mcu.gpio.led_2", pads: [["U2", "28"], ["D3", "2"]]}, diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net index 34fced0cf..08679db52 100644 --- a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net +++ b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net @@ -94,12 +94,12 @@ (net (code 3) (name "bat.cell[2].pwr") (node (ref U3) (pin 1)) (node (ref U4) (pin 2))) -(net (code 4) (name "mcu.pwr_vin") - (node (ref U4) (pin 1))) -(net (code 5) (name "mcu.gnd") +(net (code 4) (name "mcu.gnd") (node (ref U1) (pin 2)) (node (ref U5) (pin 13)) (node (ref R1) (pin 2))) +(net (code 5) (name "mcu.pwr_vin") + (node (ref U4) (pin 1))) (net (code 6) (name "mcu.pwr_out") (node (ref U5) (pin 12))) (net (code 7) (name "mcu.vusb_out") diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js index a364b4bc0..5d2283d4f 100644 --- a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js +++ b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js @@ -40,8 +40,8 @@ board.setNetlist([ {name: "bat.cell[0].pwr", pads: [["U1", "1"], ["U2", "2"]]}, {name: "bat.cell[1].pwr", pads: [["U2", "1"], ["U3", "2"]]}, {name: "bat.cell[2].pwr", pads: [["U3", "1"], ["U4", "2"]]}, - {name: "mcu.pwr_vin", pads: [["U4", "1"]]}, {name: "mcu.gnd", pads: [["U1", "2"], ["U5", "13"], ["R1", "2"]]}, + {name: "mcu.pwr_vin", pads: [["U4", "1"]]}, {name: "mcu.pwr_out", pads: [["U5", "12"]]}, {name: "mcu.vusb_out", pads: [["U5", "14"]]}, {name: "led.signal", pads: [["U5", "7"], ["D1", "2"]]}, diff --git a/examples/TestBlinkyChain/TestBlinkyChain.net b/examples/TestBlinkyChain/TestBlinkyChain.net index 69175e361..ffec1ef38 100644 --- a/examples/TestBlinkyChain/TestBlinkyChain.net +++ b/examples/TestBlinkyChain/TestBlinkyChain.net @@ -337,7 +337,16 @@ (sheetpath (names "/led[3]/") (tstamps "/07eb0221/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -369,15 +378,6 @@ (node (ref R6) (pin 2)) (node (ref R7) (pin 2)) (node (ref R8) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -410,13 +410,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -426,10 +426,10 @@ (net (code 13) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 7))) -(net (code 14) (name "mcu.swd.swo") - (node (ref J2) (pin 6))) -(net (code 15) (name "mcu.swd.tdi") +(net (code 14) (name "mcu.swd.tdi") (node (ref J2) (pin 8))) +(net (code 15) (name "mcu.swd.swo") + (node (ref J2) (pin 6))) (net (code 16) (name "mcu.ic.osc.xtal_in") (node (ref U2) (pin 5))) (net (code 17) (name "mcu.ic.osc.xtal_out") diff --git a/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js b/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js index e460d483d..c0b033df7 100644 --- a/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js +++ b/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js @@ -142,21 +142,21 @@ const R8 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["J2", "1"], ["U2", "1"], ["U2", "24"], ["U2", "36"], ["U2", "48"], ["U2", "9"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["C10", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.ic.osc.xtal_in", pads: [["U2", "5"]]}, {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, diff --git a/examples/TestBlinkyComplete/TestBlinkyComplete.net b/examples/TestBlinkyComplete/TestBlinkyComplete.net index 4c0e610d5..d2a1c470c 100644 --- a/examples/TestBlinkyComplete/TestBlinkyComplete.net +++ b/examples/TestBlinkyComplete/TestBlinkyComplete.net @@ -253,7 +253,16 @@ (sheetpath (names "/led/") (tstamps "/02750136/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -281,15 +290,6 @@ (node (ref C9) (pin 2)) (node (ref C10) (pin 2)) (node (ref R5) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -322,13 +322,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -338,10 +338,10 @@ (net (code 13) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 7))) -(net (code 14) (name "mcu.swd.swo") - (node (ref J2) (pin 6))) -(net (code 15) (name "mcu.swd.tdi") +(net (code 14) (name "mcu.swd.tdi") (node (ref J2) (pin 8))) +(net (code 15) (name "mcu.swd.swo") + (node (ref J2) (pin 6))) (net (code 16) (name "mcu.ic.osc.xtal_in") (node (ref U2) (pin 5))) (net (code 17) (name "mcu.ic.osc.xtal_out") diff --git a/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js b/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js index ac5e9d05d..e916563f7 100644 --- a/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js +++ b/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js @@ -107,21 +107,21 @@ const R5 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["R5", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["R5", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["J2", "1"], ["U2", "1"], ["U2", "24"], ["U2", "36"], ["U2", "48"], ["U2", "9"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["C10", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.ic.osc.xtal_in", pads: [["U2", "5"]]}, {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "led.signal", pads: [["U2", "10"], ["D1", "2"]]}, diff --git a/examples/TestBlinkyExpanded/TestBlinkyExpanded.net b/examples/TestBlinkyExpanded/TestBlinkyExpanded.net index 69175e361..ffec1ef38 100644 --- a/examples/TestBlinkyExpanded/TestBlinkyExpanded.net +++ b/examples/TestBlinkyExpanded/TestBlinkyExpanded.net @@ -337,7 +337,16 @@ (sheetpath (names "/led[3]/") (tstamps "/07eb0221/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -369,15 +378,6 @@ (node (ref R6) (pin 2)) (node (ref R7) (pin 2)) (node (ref R8) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -410,13 +410,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -426,10 +426,10 @@ (net (code 13) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 7))) -(net (code 14) (name "mcu.swd.swo") - (node (ref J2) (pin 6))) -(net (code 15) (name "mcu.swd.tdi") +(net (code 14) (name "mcu.swd.tdi") (node (ref J2) (pin 8))) +(net (code 15) (name "mcu.swd.swo") + (node (ref J2) (pin 6))) (net (code 16) (name "mcu.ic.osc.xtal_in") (node (ref U2) (pin 5))) (net (code 17) (name "mcu.ic.osc.xtal_out") diff --git a/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js b/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js index e460d483d..c0b033df7 100644 --- a/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js +++ b/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js @@ -142,21 +142,21 @@ const R8 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["J2", "1"], ["U2", "1"], ["U2", "24"], ["U2", "36"], ["U2", "48"], ["U2", "9"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["C10", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.ic.osc.xtal_in", pads: [["U2", "5"]]}, {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, diff --git a/examples/TestBlinkyImplicit/TestBlinkyImplicit.net b/examples/TestBlinkyImplicit/TestBlinkyImplicit.net index 69175e361..ffec1ef38 100644 --- a/examples/TestBlinkyImplicit/TestBlinkyImplicit.net +++ b/examples/TestBlinkyImplicit/TestBlinkyImplicit.net @@ -337,7 +337,16 @@ (sheetpath (names "/led[3]/") (tstamps "/07eb0221/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -369,15 +378,6 @@ (node (ref R6) (pin 2)) (node (ref R7) (pin 2)) (node (ref R8) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -410,13 +410,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -426,10 +426,10 @@ (net (code 13) (name "mcu.reset_node") (node (ref J2) (pin 10)) (node (ref U2) (pin 7))) -(net (code 14) (name "mcu.swd.swo") - (node (ref J2) (pin 6))) -(net (code 15) (name "mcu.swd.tdi") +(net (code 14) (name "mcu.swd.tdi") (node (ref J2) (pin 8))) +(net (code 15) (name "mcu.swd.swo") + (node (ref J2) (pin 6))) (net (code 16) (name "mcu.ic.osc.xtal_in") (node (ref U2) (pin 5))) (net (code 17) (name "mcu.ic.osc.xtal_out") diff --git a/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js b/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js index e460d483d..c0b033df7 100644 --- a/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js +++ b/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js @@ -142,21 +142,21 @@ const R8 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["J2", "3"], ["J2", "5"], ["J2", "9"], ["U2", "23"], ["U2", "35"], ["U2", "44"], ["U2", "47"], ["U2", "8"], ["C5", "2"], ["C6", "2"], ["C7", "2"], ["C8", "2"], ["C9", "2"], ["C10", "2"], ["SW1", "2"], ["R5", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["J2", "1"], ["U2", "1"], ["U2", "24"], ["U2", "36"], ["U2", "48"], ["U2", "9"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["C10", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.swd.tdi", pads: [["J2", "8"]]}, + {name: "mcu.swd.swo", pads: [["J2", "6"]]}, {name: "mcu.ic.osc.xtal_in", pads: [["U2", "5"]]}, {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, diff --git a/examples/TestBlinkyMicro/TestBlinkyMicro.net b/examples/TestBlinkyMicro/TestBlinkyMicro.net index df3156e76..67c0fb768 100644 --- a/examples/TestBlinkyMicro/TestBlinkyMicro.net +++ b/examples/TestBlinkyMicro/TestBlinkyMicro.net @@ -325,7 +325,16 @@ (sheetpath (names "/led[3]/") (tstamps "/07eb0221/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -352,15 +361,6 @@ (node (ref R7) (pin 2)) (node (ref R8) (pin 2)) (node (ref R9) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -386,13 +386,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) diff --git a/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js b/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js index e25a65003..0ed24c902 100644 --- a/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js +++ b/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js @@ -137,16 +137,16 @@ const R9 = board.add(R_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["U2", "2"], ["C5", "1"], ["C6", "1"], ["J2", "1"], ["R5", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U2", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U2", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U2", "3"], ["R5", "2"], ["C7", "1"]]}, diff --git a/examples/TestBlinkyPacked/TestBlinkyPacked.net b/examples/TestBlinkyPacked/TestBlinkyPacked.net index 3f131b91b..389124056 100644 --- a/examples/TestBlinkyPacked/TestBlinkyPacked.net +++ b/examples/TestBlinkyPacked/TestBlinkyPacked.net @@ -289,7 +289,16 @@ (sheetpath (names "/") (tstamps "/")) (tstamps "0efc0349"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -316,15 +325,6 @@ (node (ref RN1) (pin 6)) (node (ref RN1) (pin 7)) (node (ref RN1) (pin 8))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -350,13 +350,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.gpio.led_0") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) diff --git a/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js b/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js index 73f18d48d..025d0e5eb 100644 --- a/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js +++ b/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js @@ -122,16 +122,16 @@ const RN1 = board.add(R_Array_Concave_4x0603, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["RN1", "5"], ["RN1", "6"], ["RN1", "7"], ["RN1", "8"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["RN1", "5"], ["RN1", "6"], ["RN1", "7"], ["RN1", "8"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["U2", "2"], ["C5", "1"], ["C6", "1"], ["J2", "1"], ["R5", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.gpio.led_0", pads: [["U2", "26"], ["D1", "2"]]}, {name: "mcu.gpio.led_1", pads: [["U2", "27"], ["D2", "2"]]}, {name: "mcu.gpio.led_2", pads: [["U2", "28"], ["D3", "2"]]}, diff --git a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net index a1838f849..1596bfb3c 100644 --- a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net +++ b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net @@ -349,7 +349,16 @@ (sheetpath (names "/mag/") (tstamps "/02730136/")) (tstamps "025e0135"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -378,15 +387,6 @@ (node (ref R9) (pin 2)) (node (ref U3) (pin 3)) (node (ref C8) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -414,13 +414,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) diff --git a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js index 46e27dd19..02f07254f 100644 --- a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js +++ b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js @@ -147,16 +147,16 @@ const C8 = board.add(C_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"], ["U3", "3"], ["C8", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"], ["U3", "3"], ["C8", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["U2", "2"], ["C5", "1"], ["C6", "1"], ["J2", "1"], ["R5", "1"], ["U3", "1"], ["C8", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U2", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U2", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U2", "3"], ["R5", "2"], ["C7", "1"]]}, diff --git a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net index 0c5ef2985..500b4f809 100644 --- a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net +++ b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net @@ -349,7 +349,16 @@ (sheetpath (names "/mag/") (tstamps "/02730136/")) (tstamps "025e0135"))) (nets -(net (code 1) (name "usb.gnd") +(net (code 1) (name "usb.pwr") + (node (ref J1) (pin A4)) + (node (ref J1) (pin A9)) + (node (ref J1) (pin B4)) + (node (ref J1) (pin B9)) + (node (ref U1) (pin 3)) + (node (ref U1) (pin 5)) + (node (ref C1) (pin 1)) + (node (ref C3) (pin 1))) +(net (code 2) (name "usb.gnd") (node (ref J1) (pin A1)) (node (ref J1) (pin A12)) (node (ref J1) (pin B1)) @@ -378,15 +387,6 @@ (node (ref R9) (pin 2)) (node (ref U3) (pin 3)) (node (ref C8) (pin 2))) -(net (code 2) (name "usb.pwr") - (node (ref J1) (pin A4)) - (node (ref J1) (pin A9)) - (node (ref J1) (pin B4)) - (node (ref J1) (pin B9)) - (node (ref U1) (pin 3)) - (node (ref U1) (pin 5)) - (node (ref C1) (pin 1)) - (node (ref C3) (pin 1))) (net (code 3) (name "usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6))) @@ -414,13 +414,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.neg") +(net (code 9) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 10) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 10) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) diff --git a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js index 46e27dd19..02f07254f 100644 --- a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js +++ b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js @@ -147,16 +147,16 @@ const C8 = board.add(C_0603_1608Metric, { }) board.setNetlist([ - {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"], ["U3", "3"], ["C8", "2"]]}, {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U1", "3"], ["U1", "5"], ["C1", "1"], ["C3", "1"]]}, + {name: "usb.gnd", pads: [["J1", "A1"], ["J1", "A12"], ["J1", "B1"], ["J1", "B12"], ["J1", "S1"], ["R1", "1"], ["R2", "1"], ["U1", "1"], ["R4", "2"], ["C1", "2"], ["C3", "2"], ["C4", "2"], ["U2", "1"], ["U2", "15"], ["U2", "38"], ["U2", "39"], ["C5", "2"], ["C6", "2"], ["J2", "4"], ["SW1", "2"], ["C7", "2"], ["SW2", "2"], ["R6", "2"], ["R7", "2"], ["R8", "2"], ["R9", "2"], ["U3", "3"], ["C8", "2"]]}, {name: "usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"]]}, {name: "usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"]]}, {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.pwr_out", pads: [["R3", "1"], ["L1", "2"], ["C4", "1"], ["U2", "2"], ["C5", "1"], ["C6", "1"], ["J2", "1"], ["R5", "1"], ["U3", "1"], ["C8", "1"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U2", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U2", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U2", "3"], ["R5", "2"], ["C7", "1"]]}, diff --git a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net index 462ca1ce9..2a74b281f 100644 --- a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net +++ b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net @@ -374,13 +374,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 7) (name "reg.vbst_cap.neg") +(net (code 7) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 8) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 8) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 9) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) diff --git a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js index d42036c66..6d06b4b6d 100644 --- a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js +++ b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js @@ -153,8 +153,8 @@ board.setNetlist([ {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U2", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U2", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U2", "3"], ["R5", "2"], ["C7", "1"]]}, diff --git a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net index a25b51468..b70ce82fc 100644 --- a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net +++ b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net @@ -374,13 +374,13 @@ (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 7) (name "reg.vbst_cap.neg") +(net (code 7) (name "reg.vbst_cap.pos") + (node (ref U1) (pin 6)) + (node (ref C2) (pin 1))) +(net (code 8) (name "reg.vbst_cap.neg") (node (ref U1) (pin 2)) (node (ref C2) (pin 2)) (node (ref L1) (pin 1))) -(net (code 8) (name "reg.vbst_cap.pos") - (node (ref U1) (pin 6)) - (node (ref C2) (pin 1))) (net (code 9) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) diff --git a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js index d42036c66..6d06b4b6d 100644 --- a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js +++ b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js @@ -153,8 +153,8 @@ board.setNetlist([ {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "reg.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U2", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U2", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U2", "3"], ["R5", "2"], ["C7", "1"]]}, diff --git a/examples/TofArray/TofArray.net b/examples/TofArray/TofArray.net index 319f19937..63876d132 100644 --- a/examples/TofArray/TofArray.net +++ b/examples/TofArray/TofArray.net @@ -1131,11 +1131,11 @@ (net (code 37) (name "mcu.reset_node") (node (ref J3) (pin 6)) (node (ref U2) (pin 7))) -(net (code 38) (name "mcu.swd.swo") +(net (code 38) (name "mcu.swd.tdi") + (node (ref J3) (pin 7))) +(net (code 39) (name "mcu.swd.swo") (node (ref J3) (pin 8)) (node (ref U2) (pin 39))) -(net (code 39) (name "mcu.swd.tdi") - (node (ref J3) (pin 7))) (net (code 40) (name "tof.elt[0].ic.gpio1") (node (ref U3) (pin 7))) (net (code 41) (name "tof.elt[1].ic.gpio1") diff --git a/examples/TofArray/TofArray.svgpcb.js b/examples/TofArray/TofArray.svgpcb.js index d57de9265..e89a6929f 100644 --- a/examples/TofArray/TofArray.svgpcb.js +++ b/examples/TofArray/TofArray.svgpcb.js @@ -399,8 +399,8 @@ board.setNetlist([ {name: "mcu.swd_node.swdio", pads: [["J3", "10"], ["U2", "34"]]}, {name: "mcu.swd_node.swclk", pads: [["J3", "9"], ["U2", "37"]]}, {name: "mcu.reset_node", pads: [["J3", "6"], ["U2", "7"]]}, - {name: "mcu.swd.swo", pads: [["J3", "8"], ["U2", "39"]]}, {name: "mcu.swd.tdi", pads: [["J3", "7"]]}, + {name: "mcu.swd.swo", pads: [["J3", "8"], ["U2", "39"]]}, {name: "tof.elt[0].ic.gpio1", pads: [["U3", "7"]]}, {name: "tof.elt[1].ic.gpio1", pads: [["U4", "7"]]}, {name: "tof.elt[2].ic.gpio1", pads: [["U5", "7"]]}, diff --git a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net index a5ab46f15..23c24b726 100644 --- a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net +++ b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net @@ -556,20 +556,20 @@ (node (ref FU2) (pin 6)) (node (ref FC13) (pin 1)) (node (ref FR4) (pin 1))) -(net (code 19) (name "Fft232.ic.vphy") +(net (code 19) (name "Fft232.ic.vcccore") + (node (ref FU1) (pin 38)) + (node (ref FC5) (pin 1))) +(net (code 20) (name "Fft232.ic.vcca") + (node (ref FU1) (pin 37)) + (node (ref FC6) (pin 1))) +(net (code 21) (name "Fft232.ic.vphy") (node (ref FU1) (pin 3)) (node (ref FFB2) (pin 2)) (node (ref FC3) (pin 1))) -(net (code 20) (name "Fft232.ic.vpll") +(net (code 22) (name "Fft232.ic.vpll") (node (ref FU1) (pin 8)) (node (ref FFB3) (pin 2)) (node (ref FC4) (pin 1))) -(net (code 21) (name "Fft232.ic.vcccore") - (node (ref FU1) (pin 38)) - (node (ref FC5) (pin 1))) -(net (code 22) (name "Fft232.ic.vcca") - (node (ref FU1) (pin 37)) - (node (ref FC6) (pin 1))) (net (code 23) (name "Fft232.ic.adbus.3") (node (ref FU1) (pin 16))) (net (code 24) (name "Fft232.ic.adbus.5") @@ -619,12 +619,12 @@ (net (code 38) (name "Fled2.res.a") (node (ref FD4) (pin 1)) (node (ref FR8) (pin 1))) -(net (code 39) (name "Fout.cs") +(net (code 39) (name "Fout.pwr") + (node (ref FJ2) (pin 1))) +(net (code 40) (name "Fout.cs") (node (ref FU1) (pin 17)) (node (ref FJ2) (pin 2))) -(net (code 40) (name "Fout.reset") +(net (code 41) (name "Fout.reset") (node (ref FU1) (pin 20)) - (node (ref FJ2) (pin 10))) -(net (code 41) (name "Fout.pwr") - (node (ref FJ2) (pin 1)))) + (node (ref FJ2) (pin 10)))) ) \ No newline at end of file diff --git a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js index 242fb3066..a503f874e 100644 --- a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js +++ b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js @@ -205,10 +205,10 @@ board.setNetlist([ {name: "Fft232.acbus.9", pads: [["FU1", "33"]]}, {name: "Fft232.ic.vregin", pads: [["FU1", "40"], ["FFB1", "2"], ["FC1", "1"], ["FC2", "1"]]}, {name: "Fft232.ic.vccd", pads: [["FU1", "12"], ["FU1", "24"], ["FU1", "34"], ["FU1", "39"], ["FU1", "46"], ["FFB2", "1"], ["FFB3", "1"], ["FC7", "1"], ["FC8", "1"], ["FC9", "1"], ["FC10", "1"], ["FU2", "6"], ["FC13", "1"], ["FR4", "1"]]}, - {name: "Fft232.ic.vphy", pads: [["FU1", "3"], ["FFB2", "2"], ["FC3", "1"]]}, - {name: "Fft232.ic.vpll", pads: [["FU1", "8"], ["FFB3", "2"], ["FC4", "1"]]}, {name: "Fft232.ic.vcccore", pads: [["FU1", "38"], ["FC5", "1"]]}, {name: "Fft232.ic.vcca", pads: [["FU1", "37"], ["FC6", "1"]]}, + {name: "Fft232.ic.vphy", pads: [["FU1", "3"], ["FFB2", "2"], ["FC3", "1"]]}, + {name: "Fft232.ic.vpll", pads: [["FU1", "8"], ["FFB3", "2"], ["FC4", "1"]]}, {name: "Fft232.ic.adbus.3", pads: [["FU1", "16"]]}, {name: "Fft232.ic.adbus.5", pads: [["FU1", "18"]]}, {name: "Fft232.ic.adbus.6", pads: [["FU1", "19"]]}, @@ -225,9 +225,9 @@ board.setNetlist([ {name: "Fled1.res.a", pads: [["FD3", "1"], ["FR7", "1"]]}, {name: "Fled2.signal", pads: [["FU1", "28"], ["FD4", "2"]]}, {name: "Fled2.res.a", pads: [["FD4", "1"], ["FR8", "1"]]}, + {name: "Fout.pwr", pads: [["FJ2", "1"]]}, {name: "Fout.cs", pads: [["FU1", "17"], ["FJ2", "2"]]}, - {name: "Fout.reset", pads: [["FU1", "20"], ["FJ2", "10"]]}, - {name: "Fout.pwr", pads: [["FJ2", "1"]]} + {name: "Fout.reset", pads: [["FU1", "20"], ["FJ2", "10"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/UsbKey/UsbKey.net b/examples/UsbKey/UsbKey.net index cc72b10b9..fa59c827e 100644 --- a/examples/UsbKey/UsbKey.net +++ b/examples/UsbKey/UsbKey.net @@ -245,10 +245,10 @@ (net (code 7) (name "mcu.swd_node.swclk") (node (ref J2) (pin 4)) (node (ref U2) (pin 24))) -(net (code 8) (name "mcu.swd.reset") - (node (ref J2) (pin 3))) -(net (code 9) (name "mcu.swd.swo") +(net (code 8) (name "mcu.swd.swo") (node (ref J2) (pin 6))) +(net (code 9) (name "mcu.swd.reset") + (node (ref J2) (pin 3))) (net (code 10) (name "mcu.ic.nrst") (node (ref U2) (pin 4))) (net (code 11) (name "rgb.signals.red") diff --git a/examples/UsbKey/UsbKey.svgpcb.js b/examples/UsbKey/UsbKey.svgpcb.js index 959081171..3536c11d8 100644 --- a/examples/UsbKey/UsbKey.svgpcb.js +++ b/examples/UsbKey/UsbKey.svgpcb.js @@ -94,8 +94,8 @@ board.setNetlist([ {name: "usb.usb.dm", pads: [["J1", "2"], ["U2", "21"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "23"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "24"]]}, - {name: "mcu.swd.reset", pads: [["J2", "3"]]}, {name: "mcu.swd.swo", pads: [["J2", "6"]]}, + {name: "mcu.swd.reset", pads: [["J2", "3"]]}, {name: "mcu.ic.nrst", pads: [["U2", "4"]]}, {name: "rgb.signals.red", pads: [["U2", "7"], ["R1", "2"]]}, {name: "rgb.signals.green", pads: [["U2", "8"], ["R2", "2"]]}, diff --git a/examples/UsbSourceMeasure/UsbSourceMeasure.net b/examples/UsbSourceMeasure/UsbSourceMeasure.net index d0700223b..4292991a4 100644 --- a/examples/UsbSourceMeasure/UsbSourceMeasure.net +++ b/examples/UsbSourceMeasure/UsbSourceMeasure.net @@ -4331,13 +4331,13 @@ (node (ref U2) (pin 4)) (node (ref R4) (pin 2)) (node (ref R5) (pin 1))) -(net (code 24) (name "reg_v5.boot_cap.neg") +(net (code 24) (name "reg_v5.boot_cap.pos") + (node (ref U2) (pin 6)) + (node (ref C6) (pin 1))) +(net (code 25) (name "reg_v5.boot_cap.neg") (node (ref U2) (pin 2)) (node (ref C6) (pin 2)) (node (ref L1) (pin 1))) -(net (code 25) (name "reg_v5.boot_cap.pos") - (node (ref U2) (pin 6)) - (node (ref C6) (pin 1))) (net (code 26) (name "reg_v5.en_res.b") (node (ref U2) (pin 5)) (node (ref R6) (pin 2))) @@ -4345,13 +4345,13 @@ (node (ref U3) (pin 4)) (node (ref R7) (pin 2)) (node (ref R8) (pin 1))) -(net (code 28) (name "reg_3v3.boot_cap.neg") +(net (code 28) (name "reg_3v3.boot_cap.pos") + (node (ref U3) (pin 6)) + (node (ref C10) (pin 1))) +(net (code 29) (name "reg_3v3.boot_cap.neg") (node (ref U3) (pin 2)) (node (ref C10) (pin 2)) (node (ref L2) (pin 1))) -(net (code 29) (name "reg_3v3.boot_cap.pos") - (node (ref U3) (pin 6)) - (node (ref C10) (pin 1))) (net (code 30) (name "reg_3v3.en_res.b") (node (ref U3) (pin 5)) (node (ref R9) (pin 2))) @@ -4433,30 +4433,30 @@ (node (ref FB2) (pin 2)) (node (ref U11) (pin 4)) (node (ref U11) (pin 5))) -(net (code 50) (name "reg_vcontroln.cf.neg") - (node (ref U11) (pin 3)) - (node (ref C44) (pin 2))) -(net (code 51) (name "reg_vcontroln.cf.pos") +(net (code 50) (name "reg_vcontroln.cf.pos") (node (ref U11) (pin 6)) (node (ref C44) (pin 1))) -(net (code 52) (name "control.tp_int") - (node (ref C52) (pin 1)) - (node (ref C53) (pin 1)) - (node (ref J3) (pin 1)) - (node (ref U39) (pin 3)) - (node (ref U42) (pin 1))) -(net (code 53) (name "control.high_gate_ctl") +(net (code 51) (name "reg_vcontroln.cf.neg") + (node (ref U11) (pin 3)) + (node (ref C44) (pin 2))) +(net (code 52) (name "control.high_gate_ctl") (node (ref U15) (pin 3)) (node (ref U29) (pin 11))) -(net (code 54) (name "control.low_gate_ctl") +(net (code 53) (name "control.low_gate_ctl") (node (ref U16) (pin 3)) (node (ref U29) (pin 12))) -(net (code 55) (name "control.limit_source") +(net (code 54) (name "control.limit_source") (node (ref U12) (pin 4)) (node (ref U26) (pin 22))) -(net (code 56) (name "control.limit_sink") +(net (code 55) (name "control.limit_sink") (node (ref U13) (pin 4)) (node (ref U26) (pin 23))) +(net (code 56) (name "control.tp_int") + (node (ref C52) (pin 1)) + (node (ref C53) (pin 1)) + (node (ref J3) (pin 1)) + (node (ref U39) (pin 3)) + (node (ref U42) (pin 1))) (net (code 57) (name "control.drive") (node (ref R23) (pin 1)) (node (ref R37) (pin 1)) @@ -4569,14 +4569,14 @@ (net (code 84) (name "control.isense.ranges[2].pwr_sw.res.a") (node (ref U22) (pin 2)) (node (ref R58) (pin 1))) -(net (code 85) (name "control.ifilt.outp") - (node (ref R59) (pin 2)) - (node (ref C63) (pin 1)) - (node (ref U24) (pin 4))) -(net (code 86) (name "control.ifilt.outn") +(net (code 85) (name "control.ifilt.outn") (node (ref R60) (pin 2)) (node (ref C63) (pin 2)) (node (ref U24) (pin 1))) +(net (code 86) (name "control.ifilt.outp") + (node (ref R59) (pin 2)) + (node (ref C63) (pin 1)) + (node (ref U24) (pin 4))) (net (code 87) (name "control.vmeas.output") (node (ref U23) (pin 7)) (node (ref Q9) (pin 2))) @@ -4703,14 +4703,14 @@ (node (ref U30) (pin 4)) (node (ref U31) (pin 1)) (node (ref R80) (pin 2))) -(net (code 118) (name "conv_ovp.comp.inp") - (node (ref U30) (pin 1)) - (node (ref R77) (pin 2)) - (node (ref R78) (pin 1))) -(net (code 119) (name "conv_ovp.comp.inn") +(net (code 118) (name "conv_ovp.comp.inn") (node (ref U30) (pin 3)) (node (ref R75) (pin 2)) (node (ref R76) (pin 1))) +(net (code 119) (name "conv_ovp.comp.inp") + (node (ref U30) (pin 1)) + (node (ref R77) (pin 2)) + (node (ref R78) (pin 1))) (net (code 120) (name "conv_latch.out") (node (ref U6) (pin 3)) (node (ref U7) (pin 3)) @@ -4840,14 +4840,14 @@ (node (ref R26) (pin 1)) (node (ref U37) (pin 6)) (node (ref C97) (pin 1))) -(net (code 160) (name "dac.out2") - (node (ref R29) (pin 1)) - (node (ref U37) (pin 8)) - (node (ref C99) (pin 1))) -(net (code 161) (name "dac.out1") +(net (code 160) (name "dac.out1") (node (ref R32) (pin 1)) (node (ref U37) (pin 7)) (node (ref C98) (pin 1))) +(net (code 161) (name "dac.out2") + (node (ref R29) (pin 1)) + (node (ref U37) (pin 8)) + (node (ref C99) (pin 1))) (net (code 162) (name "dac.out3") (node (ref R30) (pin 1)) (node (ref U37) (pin 9)) @@ -4860,31 +4860,31 @@ (node (ref C95) (pin 1)) (node (ref C96) (pin 1)) (node (ref FB3) (pin 2))) -(net (code 165) (name "adc.spi.sck") +(net (code 165) (name "adc.mclkin") + (node (ref U26) (pin 20)) + (node (ref U38) (pin 18))) +(net (code 166) (name "adc.vins.3") + (node (ref U38) (pin 8))) +(net (code 167) (name "adc.vins.4") + (node (ref U38) (pin 9))) +(net (code 168) (name "adc.vins.5") + (node (ref U38) (pin 10))) +(net (code 169) (name "adc.vins.6") + (node (ref U38) (pin 11))) +(net (code 170) (name "adc.vins.7") + (node (ref U38) (pin 12))) +(net (code 171) (name "adc.spi.sck") (node (ref U26) (pin 17)) (node (ref U38) (pin 14))) -(net (code 166) (name "adc.spi.mosi") +(net (code 172) (name "adc.spi.mosi") (node (ref U26) (pin 18)) (node (ref U38) (pin 15))) -(net (code 167) (name "adc.spi.miso") +(net (code 173) (name "adc.spi.miso") (node (ref U26) (pin 19)) (node (ref U38) (pin 16))) -(net (code 168) (name "adc.cs") +(net (code 174) (name "adc.cs") (node (ref U26) (pin 15)) (node (ref U38) (pin 13))) -(net (code 169) (name "adc.mclkin") - (node (ref U26) (pin 20)) - (node (ref U38) (pin 18))) -(net (code 170) (name "adc.vins.3") - (node (ref U38) (pin 8))) -(net (code 171) (name "adc.vins.4") - (node (ref U38) (pin 9))) -(net (code 172) (name "adc.vins.5") - (node (ref U38) (pin 10))) -(net (code 173) (name "adc.vins.6") - (node (ref U38) (pin 11))) -(net (code 174) (name "adc.vins.7") - (node (ref U38) (pin 12))) (net (code 175) (name "adc.ic.avdd") (node (ref U38) (pin 1)) (node (ref R88) (pin 2)) @@ -4916,13 +4916,13 @@ (node (ref D12) (pin 1)) (node (ref J14) (pin 1)) (node (ref J15) (pin 2))) -(net (code 181) (name "vimeas_amps.inn.0") +(net (code 181) (name "vimeas_amps.inp.1") + (node (ref R36) (pin 2)) + (node (ref U39) (pin 5))) +(net (code 182) (name "vimeas_amps.inn.0") (node (ref R37) (pin 2)) (node (ref R38) (pin 1)) (node (ref U39) (pin 2))) -(net (code 182) (name "vimeas_amps.inp.1") - (node (ref R36) (pin 2)) - (node (ref U39) (pin 5))) (net (code 183) (name "cv_amps.inp.1") (node (ref R26) (pin 2)) (node (ref R27) (pin 2)) @@ -4947,28 +4947,28 @@ (node (ref R33) (pin 2)) (node (ref C48) (pin 1)) (node (ref U41) (pin 3))) -(net (code 187) (name "ci_amps.out.0") - (node (ref D9) (pin 1)) - (node (ref U13) (pin 3)) - (node (ref U41) (pin 1))) -(net (code 188) (name "ci_amps.inp.1") +(net (code 187) (name "ci_amps.inp.1") (node (ref R30) (pin 2)) (node (ref R31) (pin 2)) (node (ref C47) (pin 1)) (node (ref U41) (pin 5))) +(net (code 188) (name "ci_amps.out.0") + (node (ref D9) (pin 1)) + (node (ref U13) (pin 3)) + (node (ref U41) (pin 1))) (net (code 189) (name "ci_amps.out.1") (node (ref D8) (pin 2)) (node (ref U12) (pin 1)) (node (ref U41) (pin 7))) -(net (code 190) (name "cintref_amps.inn.0") +(net (code 190) (name "cintref_amps.inp.1") + (node (ref R23) (pin 2)) + (node (ref R25) (pin 2)) + (node (ref U42) (pin 5))) +(net (code 191) (name "cintref_amps.inn.0") (node (ref R34) (pin 2)) (node (ref C52) (pin 2)) (node (ref R35) (pin 1)) (node (ref U42) (pin 2))) -(net (code 191) (name "cintref_amps.inp.1") - (node (ref R23) (pin 2)) - (node (ref R25) (pin 2)) - (node (ref U42) (pin 5))) (net (code 192) (name "cintref_amps.inn.1") (node (ref R22) (pin 2)) (node (ref R24) (pin 2)) diff --git a/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js b/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js index bf5b8bd7f..48d7d04c6 100644 --- a/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js +++ b/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js @@ -1625,12 +1625,12 @@ board.setNetlist([ {name: "ramp.div.center", pads: [["Q1", "4"], ["C2", "2"], ["C3", "2"], ["R2", "2"], ["R3", "1"]]}, {name: "ramp.ctl_fet.drain", pads: [["R3", "2"], ["Q2", "3"]]}, {name: "reg_v5.fb.output", pads: [["U2", "4"], ["R4", "2"], ["R5", "1"]]}, - {name: "reg_v5.boot_cap.neg", pads: [["U2", "2"], ["C6", "2"], ["L1", "1"]]}, {name: "reg_v5.boot_cap.pos", pads: [["U2", "6"], ["C6", "1"]]}, + {name: "reg_v5.boot_cap.neg", pads: [["U2", "2"], ["C6", "2"], ["L1", "1"]]}, {name: "reg_v5.en_res.b", pads: [["U2", "5"], ["R6", "2"]]}, {name: "reg_3v3.fb.output", pads: [["U3", "4"], ["R7", "2"], ["R8", "1"]]}, - {name: "reg_3v3.boot_cap.neg", pads: [["U3", "2"], ["C10", "2"], ["L2", "1"]]}, {name: "reg_3v3.boot_cap.pos", pads: [["U3", "6"], ["C10", "1"]]}, + {name: "reg_3v3.boot_cap.neg", pads: [["U3", "2"], ["C10", "2"], ["L2", "1"]]}, {name: "reg_3v3.en_res.b", pads: [["U3", "5"], ["R9", "2"]]}, {name: "reg_v12.fb.output", pads: [["U4", "3"], ["R10", "2"], ["R11", "1"], ["C16", "2"]]}, {name: "reg_v12.power_path.switch", pads: [["U4", "1"], ["L3", "2"], ["D3", "2"]]}, @@ -1651,13 +1651,13 @@ board.setNetlist([ {name: "reg_vcontrol.fb.output", pads: [["U10", "3"], ["R20", "2"], ["R21", "1"], ["C43", "2"]]}, {name: "reg_vcontrol.power_path.switch", pads: [["U10", "1"], ["L5", "2"], ["D7", "2"]]}, {name: "filt_vcontroln.pwr_out", pads: [["FB2", "2"], ["U11", "4"], ["U11", "5"]]}, - {name: "reg_vcontroln.cf.neg", pads: [["U11", "3"], ["C44", "2"]]}, {name: "reg_vcontroln.cf.pos", pads: [["U11", "6"], ["C44", "1"]]}, - {name: "control.tp_int", pads: [["C52", "1"], ["C53", "1"], ["J3", "1"], ["U39", "3"], ["U42", "1"]]}, + {name: "reg_vcontroln.cf.neg", pads: [["U11", "3"], ["C44", "2"]]}, {name: "control.high_gate_ctl", pads: [["U15", "3"], ["U29", "11"]]}, {name: "control.low_gate_ctl", pads: [["U16", "3"], ["U29", "12"]]}, {name: "control.limit_source", pads: [["U12", "4"], ["U26", "22"]]}, {name: "control.limit_sink", pads: [["U13", "4"], ["U26", "23"]]}, + {name: "control.tp_int", pads: [["C52", "1"], ["C53", "1"], ["J3", "1"], ["U39", "3"], ["U42", "1"]]}, {name: "control.drive", pads: [["R23", "1"], ["R37", "1"], ["R39", "1"], ["U39", "1"]]}, {name: "control.outa", pads: [["R22", "1"], ["R51", "1"], ["U39", "6"], ["U39", "7"]]}, {name: "control.meas_v", pads: [["R27", "1"], ["Q10", "2"], ["J11", "1"], ["R91", "1"]]}, @@ -1686,8 +1686,8 @@ board.setNetlist([ {name: "control.isense.ranges[1].pwr_sw.res.a", pads: [["U20", "2"], ["R56", "1"]]}, {name: "control.isense.ranges[2].isense.pwr_out", pads: [["R57", "2"], ["U21", "1"], ["U22", "3"]]}, {name: "control.isense.ranges[2].pwr_sw.res.a", pads: [["U22", "2"], ["R58", "1"]]}, - {name: "control.ifilt.outp", pads: [["R59", "2"], ["C63", "1"], ["U24", "4"]]}, {name: "control.ifilt.outn", pads: [["R60", "2"], ["C63", "2"], ["U24", "1"]]}, + {name: "control.ifilt.outp", pads: [["R59", "2"], ["C63", "1"], ["U24", "4"]]}, {name: "control.vmeas.output", pads: [["U23", "7"], ["Q9", "2"]]}, {name: "control.vmeas.rg.a", pads: [["U23", "2"], ["R61", "1"]]}, {name: "control.vmeas.rg.b", pads: [["U23", "3"], ["R61", "2"]]}, @@ -1719,8 +1719,8 @@ board.setNetlist([ {name: "boost_rc.input", pads: [["U26", "11"], ["R74", "1"]]}, {name: "boost_rc.output", pads: [["U7", "2"], ["R74", "2"], ["C80", "1"]]}, {name: "conv_ovp.output", pads: [["U30", "4"], ["U31", "1"], ["R80", "2"]]}, - {name: "conv_ovp.comp.inp", pads: [["U30", "1"], ["R77", "2"], ["R78", "1"]]}, {name: "conv_ovp.comp.inn", pads: [["U30", "3"], ["R75", "2"], ["R76", "1"]]}, + {name: "conv_ovp.comp.inp", pads: [["U30", "1"], ["R77", "2"], ["R78", "1"]]}, {name: "conv_latch.out", pads: [["U6", "3"], ["U7", "3"], ["U29", "7"], ["U31", "6"], ["U31", "7"]]}, {name: "conv_latch.ic.out2", pads: [["U31", "2"], ["U31", "3"]]}, {name: "conv_en_pull.io", pads: [["U29", "6"], ["U31", "5"], ["R79", "2"]]}, @@ -1761,38 +1761,38 @@ board.setNetlist([ {name: "spk_drv.out.a", pads: [["U36", "9"], ["J9", "1"]]}, {name: "spk_drv.out.b", pads: [["U36", "10"], ["J9", "2"]]}, {name: "dac.out0", pads: [["R26", "1"], ["U37", "6"], ["C97", "1"]]}, - {name: "dac.out2", pads: [["R29", "1"], ["U37", "8"], ["C99", "1"]]}, {name: "dac.out1", pads: [["R32", "1"], ["U37", "7"], ["C98", "1"]]}, + {name: "dac.out2", pads: [["R29", "1"], ["U37", "8"], ["C99", "1"]]}, {name: "dac.out3", pads: [["R30", "1"], ["U37", "9"], ["C100", "1"]]}, {name: "dac.rdy", pads: [["U37", "5"]]}, {name: "dac_ferrite.pwr_out", pads: [["U37", "1"], ["U37", "4"], ["C95", "1"], ["C96", "1"], ["FB3", "2"]]}, - {name: "adc.spi.sck", pads: [["U26", "17"], ["U38", "14"]]}, - {name: "adc.spi.mosi", pads: [["U26", "18"], ["U38", "15"]]}, - {name: "adc.spi.miso", pads: [["U26", "19"], ["U38", "16"]]}, - {name: "adc.cs", pads: [["U26", "15"], ["U38", "13"]]}, {name: "adc.mclkin", pads: [["U26", "20"], ["U38", "18"]]}, {name: "adc.vins.3", pads: [["U38", "8"]]}, {name: "adc.vins.4", pads: [["U38", "9"]]}, {name: "adc.vins.5", pads: [["U38", "10"]]}, {name: "adc.vins.6", pads: [["U38", "11"]]}, {name: "adc.vins.7", pads: [["U38", "12"]]}, + {name: "adc.spi.sck", pads: [["U26", "17"], ["U38", "14"]]}, + {name: "adc.spi.mosi", pads: [["U26", "18"], ["U38", "15"]]}, + {name: "adc.spi.miso", pads: [["U26", "19"], ["U38", "16"]]}, + {name: "adc.cs", pads: [["U26", "15"], ["U38", "13"]]}, {name: "adc.ic.avdd", pads: [["U38", "1"], ["R88", "2"], ["C101", "1"], ["C102", "1"]]}, {name: "adc.ic.dvdd", pads: [["U38", "20"], ["R89", "2"], ["C103", "1"], ["C104", "1"]]}, {name: "vcen_rc.output", pads: [["U38", "7"], ["R90", "2"], ["C106", "1"]]}, {name: "mv_rc.output", pads: [["U38", "5"], ["R91", "2"], ["C107", "1"]]}, {name: "mi_rc.output", pads: [["U38", "6"], ["R92", "2"], ["C108", "1"]]}, {name: "outp.port", pads: [["R36", "1"], ["U18", "6"], ["U20", "4"], ["U22", "4"], ["R64", "1"], ["D12", "1"], ["J14", "1"], ["J15", "2"]]}, - {name: "vimeas_amps.inn.0", pads: [["R37", "2"], ["R38", "1"], ["U39", "2"]]}, {name: "vimeas_amps.inp.1", pads: [["R36", "2"], ["U39", "5"]]}, + {name: "vimeas_amps.inn.0", pads: [["R37", "2"], ["R38", "1"], ["U39", "2"]]}, {name: "cv_amps.inp.1", pads: [["R26", "2"], ["R27", "2"], ["C46", "1"], ["R29", "2"], ["U40", "5"]]}, {name: "cv_amps.inn.1", pads: [["R28", "2"], ["D8", "1"], ["D9", "2"], ["U12", "3"], ["U13", "1"], ["U14", "3"], ["U40", "6"], ["U41", "2"], ["U41", "6"]]}, {name: "cv_amps.out.1", pads: [["R28", "1"], ["U40", "7"]]}, {name: "ci_amps.inp.0", pads: [["R32", "2"], ["R33", "2"], ["C48", "1"], ["U41", "3"]]}, - {name: "ci_amps.out.0", pads: [["D9", "1"], ["U13", "3"], ["U41", "1"]]}, {name: "ci_amps.inp.1", pads: [["R30", "2"], ["R31", "2"], ["C47", "1"], ["U41", "5"]]}, + {name: "ci_amps.out.0", pads: [["D9", "1"], ["U13", "3"], ["U41", "1"]]}, {name: "ci_amps.out.1", pads: [["D8", "2"], ["U12", "1"], ["U41", "7"]]}, - {name: "cintref_amps.inn.0", pads: [["R34", "2"], ["C52", "2"], ["R35", "1"], ["U42", "2"]]}, {name: "cintref_amps.inp.1", pads: [["R23", "2"], ["R25", "2"], ["U42", "5"]]}, + {name: "cintref_amps.inn.0", pads: [["R34", "2"], ["C52", "2"], ["R35", "1"], ["U42", "2"]]}, {name: "cintref_amps.inn.1", pads: [["R22", "2"], ["R24", "2"], ["U42", "6"]]}, {name: "cintref_amps.out.1", pads: [["R24", "1"], ["U14", "1"], ["U42", "7"]]} ]) diff --git a/examples/UsbUart/UsbUart.net b/examples/UsbUart/UsbUart.net index 9740646ef..e7a892778 100644 --- a/examples/UsbUart/UsbUart.net +++ b/examples/UsbUart/UsbUart.net @@ -270,17 +270,17 @@ (net (code 7) (name "Uusb_uart.conn.cc.cc2") (node (ref UJ1) (pin B5)) (node (ref UR2) (pin 2))) -(net (code 8) (name "Uusbconv.nsuspend") +(net (code 8) (name "Uusbconv.suspend") + (node (ref UU1) (pin 12))) +(net (code 9) (name "Uusbconv.nsuspend") (node (ref UU1) (pin 11)) (node (ref UD2) (pin 2))) -(net (code 9) (name "Uusbconv.uart.tx") +(net (code 10) (name "Uusbconv.uart.tx") (node (ref UU1) (pin 26)) (node (ref UJ2) (pin 1))) -(net (code 10) (name "Uusbconv.uart.rx") +(net (code 11) (name "Uusbconv.uart.rx") (node (ref UU1) (pin 25)) (node (ref UJ2) (pin 2))) -(net (code 11) (name "Uusbconv.suspend") - (node (ref UU1) (pin 12))) (net (code 12) (name "Uusbconv.ri") (node (ref UU1) (pin 2))) (net (code 13) (name "Uusbconv.dcd") diff --git a/examples/UsbUart/UsbUart.svgpcb.js b/examples/UsbUart/UsbUart.svgpcb.js index a40873c7b..7d8373b24 100644 --- a/examples/UsbUart/UsbUart.svgpcb.js +++ b/examples/UsbUart/UsbUart.svgpcb.js @@ -99,10 +99,10 @@ board.setNetlist([ {name: "Uusb_chain_0.d_N", pads: [["UJ1", "A7"], ["UJ1", "B7"], ["UU1", "5"], ["UU2", "1"]]}, {name: "Uusb_uart.conn.cc.cc1", pads: [["UJ1", "A5"], ["UR1", "2"]]}, {name: "Uusb_uart.conn.cc.cc2", pads: [["UJ1", "B5"], ["UR2", "2"]]}, + {name: "Uusbconv.suspend", pads: [["UU1", "12"]]}, {name: "Uusbconv.nsuspend", pads: [["UU1", "11"], ["UD2", "2"]]}, {name: "Uusbconv.uart.tx", pads: [["UU1", "26"], ["UJ2", "1"]]}, {name: "Uusbconv.uart.rx", pads: [["UU1", "25"], ["UJ2", "2"]]}, - {name: "Uusbconv.suspend", pads: [["UU1", "12"]]}, {name: "Uusbconv.ri", pads: [["UU1", "2"]]}, {name: "Uusbconv.dcd", pads: [["UU1", "1"]]}, {name: "Uusbconv.dtr", pads: [["UU1", "28"]]}, From bd82c97e873bccdca48d6eff7bc55c5e5aa16a0f Mon Sep 17 00:00:00 2001 From: Richard Lin Date: Sun, 15 Mar 2026 18:47:57 -0700 Subject: [PATCH 3/3] Update NetlistGenerator.py --- edg/electronics_model/NetlistGenerator.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/edg/electronics_model/NetlistGenerator.py b/edg/electronics_model/NetlistGenerator.py index 734c46a2c..6cba40370 100644 --- a/edg/electronics_model/NetlistGenerator.py +++ b/edg/electronics_model/NetlistGenerator.py @@ -89,8 +89,6 @@ def __init__(self, design: CompiledDesign): def process_blocklike( self, path: TransformUtil.Path, block: Union[edgir.Link, edgir.LinkArray, edgir.HierarchyBlock] ) -> None: - self.path_traverse_order.append(path) - # TODO may need rethought to support multi-board assemblies scope = self.scopes[path] # including footprint and exports, and everything within a link internal_scope = scope # for internal blocks @@ -245,14 +243,17 @@ def connect_ports( @override def visit_block(self, context: TransformUtil.TransformContext, block: edgir.BlockTypes) -> None: + self.path_traverse_order.append(context.path) self.process_blocklike(context.path, block) @override def visit_link(self, context: TransformUtil.TransformContext, link: edgir.Link) -> None: + self.path_traverse_order.append(context.path) self.process_blocklike(context.path, link) @override def visit_linkarray(self, context: TransformUtil.TransformContext, link: edgir.LinkArray) -> None: + self.path_traverse_order.append(context.path) self.process_blocklike(context.path, link) @override