diff --git a/edg/electronics_model/NetlistGenerator.py b/edg/electronics_model/NetlistGenerator.py index 6cba40370..c0c1037a9 100644 --- a/edg/electronics_model/NetlistGenerator.py +++ b/edg/electronics_model/NetlistGenerator.py @@ -261,7 +261,7 @@ def visit_portlike(self, context: TransformUtil.TransformContext, port: edgir.Po self.path_traverse_order.append(context.path) @staticmethod - def name_net(net: Iterable[TransformUtil.Path]) -> TransformUtil.Path: + def name_net(net: Iterable[TransformUtil.Path], path_ordering: Dict[TransformUtil.Path, int]) -> TransformUtil.Path: """Names a net based on all the paths of ports and links that are part of the net.""" # higher criteria are preferred, True or larger number is preferred CRITERIA: List[Callable[[TransformUtil.Path], Union[bool, int]]] = [ @@ -271,6 +271,9 @@ def name_net(net: Iterable[TransformUtil.Path]) -> TransformUtil.Path: lambda pin: len(pin.links), # prefer longer link paths lambda pin: -len(pin.ports), # prefer shorter (or no) port lengths lambda pin: not (pin.ports and pin.ports[-1].isnumeric()), # disprefer number-only ports + lambda pin: -path_ordering.get( + pin.port_component(must_have_port=False), len(path_ordering) + ), # prefer earlier paths ] def pin_name_goodness(pin1: TransformUtil.Path, pin2: TransformUtil.Path) -> int: @@ -292,7 +295,6 @@ def pin_name_goodness(pin1: TransformUtil.Path, pin2: TransformUtil.Path) -> int return 0 best_path = sorted(net, key=cmp_to_key(pin_name_goodness))[0] - return best_path def scope_to_netlist(self, scope: BoardScope) -> Netlist: @@ -324,7 +326,7 @@ def scope_to_netlist(self, scope: BoardScope) -> Netlist: raise InvalidPackingException(f"packed pins {connected1}, {connected2} not connected") named_nets = sorted( - [(self.name_net(net), net) for net in nets], + [(self.name_net(net, path_ordering), net) for net in nets], key=lambda pair: path_ordering[pair[0].port_component(must_have_port=False)], ) diff --git a/edg/electronics_model/test_netlist_naming.py b/edg/electronics_model/test_netlist_naming.py new file mode 100644 index 000000000..3539dc7b6 --- /dev/null +++ b/edg/electronics_model/test_netlist_naming.py @@ -0,0 +1,16 @@ +import unittest + +from ..core import TransformUtil +from .NetlistGenerator import NetlistTransform + + +class NetlistNameTestCase(unittest.TestCase): + def test_net_name_ordering(self) -> None: + path_block = TransformUtil.Path.empty().append_block("block") + path_link = TransformUtil.Path.empty().append_link("link") + path_porta = TransformUtil.Path.empty().append_block("block").append_port("a") + path_portb = TransformUtil.Path.empty().append_block("block").append_port("a") + order = {path_block: 0, path_link: 1, path_porta: 2, path_portb: 3} + self.assertEqual(NetlistTransform.name_net([path_block, path_portb, path_porta, path_link], order), path_link) + self.assertEqual(NetlistTransform.name_net([path_block, path_portb, path_porta], order), path_block) + self.assertEqual(NetlistTransform.name_net([path_portb, path_porta], order), path_porta) diff --git a/examples/BasicKeyboard/BasicKeyboard.net b/examples/BasicKeyboard/BasicKeyboard.net index 089710820..694f022ef 100644 --- a/examples/BasicKeyboard/BasicKeyboard.net +++ b/examples/BasicKeyboard/BasicKeyboard.net @@ -185,22 +185,22 @@ (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") +(net (code 9) (name "sw.sw[0,0].sw") (node (ref SW1) (pin 1)) (node (ref D1) (pin 1))) -(net (code 10) (name "sw.d[0,1].cathode") +(net (code 10) (name "sw.sw[0,1].sw") (node (ref SW2) (pin 1)) (node (ref D2) (pin 1))) -(net (code 11) (name "sw.d[0,2].cathode") +(net (code 11) (name "sw.sw[0,2].sw") (node (ref SW3) (pin 1)) (node (ref D3) (pin 1))) -(net (code 12) (name "sw.d[1,0].cathode") +(net (code 12) (name "sw.sw[1,0].sw") (node (ref SW4) (pin 1)) (node (ref D4) (pin 1))) -(net (code 13) (name "sw.d[1,1].cathode") +(net (code 13) (name "sw.sw[1,1].sw") (node (ref SW5) (pin 1)) (node (ref D5) (pin 1))) -(net (code 14) (name "sw.d[1,2].cathode") +(net (code 14) (name "sw.sw[1,2].sw") (node (ref SW6) (pin 1)) (node (ref D6) (pin 1)))) ) \ No newline at end of file diff --git a/examples/BasicKeyboard/BasicKeyboard.svgpcb.js b/examples/BasicKeyboard/BasicKeyboard.svgpcb.js index 15d92a7d3..055e7e1f9 100644 --- a/examples/BasicKeyboard/BasicKeyboard.svgpcb.js +++ b/examples/BasicKeyboard/BasicKeyboard.svgpcb.js @@ -16,12 +16,12 @@ board.setNetlist([ {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"]]}, - {name: "sw.d[0,2].cathode", pads: [["SW3", "1"], ["D3", "1"]]}, - {name: "sw.d[1,0].cathode", pads: [["SW4", "1"], ["D4", "1"]]}, - {name: "sw.d[1,1].cathode", pads: [["SW5", "1"], ["D5", "1"]]}, - {name: "sw.d[1,2].cathode", pads: [["SW6", "1"], ["D6", "1"]]} + {name: "sw.sw[0,0].sw", pads: [["SW1", "1"], ["D1", "1"]]}, + {name: "sw.sw[0,1].sw", pads: [["SW2", "1"], ["D2", "1"]]}, + {name: "sw.sw[0,2].sw", pads: [["SW3", "1"], ["D3", "1"]]}, + {name: "sw.sw[1,0].sw", pads: [["SW4", "1"], ["D4", "1"]]}, + {name: "sw.sw[1,1].sw", pads: [["SW5", "1"], ["D5", "1"]]}, + {name: "sw.sw[1,2].sw", pads: [["SW6", "1"], ["D6", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/BldcController/BldcController.net b/examples/BldcController/BldcController.net index 1a5226aed..d27f6d90c 100644 --- a/examples/BldcController/BldcController.net +++ b/examples/BldcController/BldcController.net @@ -948,92 +948,92 @@ (node (ref U7) (pin 2)) (node (ref C11) (pin 2)) (node (ref R27) (pin 2))) -(net (code 4) (name "mcu.gpio.bldc_en_1") +(net (code 4) (name "mcu.gpio.hall_u") + (node (ref U1) (pin 23)) + (node (ref J3) (pin 2)) + (node (ref R8) (pin 2)) + (node (ref TP4) (pin 1))) +(net (code 5) (name "mcu.gpio.hall_v") + (node (ref U1) (pin 24)) + (node (ref J3) (pin 3)) + (node (ref R9) (pin 2)) + (node (ref TP5) (pin 1))) +(net (code 6) (name "mcu.gpio.hall_w") + (node (ref U1) (pin 25)) + (node (ref J3) (pin 4)) + (node (ref R10) (pin 2)) + (node (ref TP6) (pin 1))) +(net (code 7) (name "mcu.gpio.bldc_en_1") (node (ref U1) (pin 12)) (node (ref U4) (pin 26)) (node (ref TP10) (pin 1))) -(net (code 5) (name "mcu.gpio.bldc_en_2") +(net (code 8) (name "mcu.gpio.bldc_en_2") (node (ref U1) (pin 14)) (node (ref U4) (pin 24)) (node (ref TP11) (pin 1))) -(net (code 6) (name "mcu.gpio.bldc_en_3") +(net (code 9) (name "mcu.gpio.bldc_en_3") (node (ref U1) (pin 17)) (node (ref U4) (pin 22)) (node (ref TP12) (pin 1))) -(net (code 7) (name "mcu.gpio.bldc_in_1") +(net (code 10) (name "mcu.gpio.bldc_in_1") (node (ref U1) (pin 11)) (node (ref U4) (pin 27)) (node (ref TP13) (pin 1))) -(net (code 8) (name "mcu.gpio.bldc_in_2") +(net (code 11) (name "mcu.gpio.bldc_in_2") (node (ref U1) (pin 13)) (node (ref U4) (pin 25)) (node (ref TP14) (pin 1))) -(net (code 9) (name "mcu.gpio.bldc_in_3") +(net (code 12) (name "mcu.gpio.bldc_in_3") (node (ref U1) (pin 15)) (node (ref U4) (pin 23)) (node (ref TP15) (pin 1))) -(net (code 10) (name "motor_pwr.pwr") +(net (code 13) (name "motor_pwr.pwr") (node (ref J1) (pin 2)) (node (ref R11) (pin 1)) (node (ref R13) (pin 1)) (node (ref U3) (pin 7)) (node (ref C2) (pin 1)) (node (ref R15) (pin 1))) -(net (code 11) (name "sw1.out") +(net (code 14) (name "sw1.out") (node (ref U1) (pin 20)) (node (ref SW1) (pin 1))) -(net (code 12) (name "ledr.signal") +(net (code 15) (name "ledr.signal") (node (ref U1) (pin 16)) (node (ref D1) (pin 2))) -(net (code 13) (name "ledr.res.a") +(net (code 16) (name "ledr.package.k") (node (ref D1) (pin 1)) (node (ref R1) (pin 1))) -(net (code 14) (name "ledg.signal") +(net (code 17) (name "ledg.signal") (node (ref U1) (pin 7)) (node (ref D2) (pin 2))) -(net (code 15) (name "ledg.res.a") +(net (code 18) (name "ledg.package.k") (node (ref D2) (pin 1)) (node (ref R2) (pin 1))) -(net (code 16) (name "ledb.signal") +(net (code 19) (name "ledb.signal") (node (ref U1) (pin 3)) (node (ref D3) (pin 2))) -(net (code 17) (name "ledb.res.a") +(net (code 20) (name "ledb.package.k") (node (ref D3) (pin 1)) (node (ref R3) (pin 1))) -(net (code 18) (name "i2c_pull.i2c.scl") +(net (code 21) (name "i2c_pull.i2c.scl") (node (ref U1) (pin 22)) (node (ref R4) (pin 2)) (node (ref TP1) (pin 1)) (node (ref J2) (pin 4))) -(net (code 19) (name "i2c_pull.i2c.sda") +(net (code 22) (name "i2c_pull.i2c.sda") (node (ref U1) (pin 21)) (node (ref R5) (pin 2)) (node (ref TP2) (pin 1)) (node (ref J2) (pin 3))) -(net (code 20) (name "ref_div.output") +(net (code 23) (name "ref_div.output") (node (ref R6) (pin 2)) (node (ref R7) (pin 1)) (node (ref U2) (pin 1))) -(net (code 21) (name "ref_buf.output") +(net (code 24) (name "ref_buf.output") (node (ref U2) (pin 3)) (node (ref U2) (pin 4)) (node (ref TP3) (pin 1)) (node (ref R17) (pin 1))) -(net (code 22) (name "hall.phases.u") - (node (ref U1) (pin 23)) - (node (ref J3) (pin 2)) - (node (ref R8) (pin 2)) - (node (ref TP4) (pin 1))) -(net (code 23) (name "hall.phases.v") - (node (ref U1) (pin 24)) - (node (ref J3) (pin 3)) - (node (ref R9) (pin 2)) - (node (ref TP5) (pin 1))) -(net (code 24) (name "hall.phases.w") - (node (ref U1) (pin 25)) - (node (ref J3) (pin 4)) - (node (ref R10) (pin 2)) - (node (ref TP6) (pin 1))) (net (code 25) (name "vsense.output") (node (ref U1) (pin 6)) (node (ref R11) (pin 2)) @@ -1053,14 +1053,14 @@ (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)) - (node (ref R16) (pin 2))) -(net (code 29) (name "isense.amp.r2.b") +(net (code 28) (name "isense.amp.amp.inp") (node (ref U3) (pin 3)) (node (ref R15) (pin 2)) (node (ref R17) (pin 2))) +(net (code 29) (name "isense.amp.amp.inn") + (node (ref U3) (pin 2)) + (node (ref R14) (pin 2)) + (node (ref R16) (pin 2))) (net (code 30) (name "isense_clamp.signal_out") (node (ref U1) (pin 5)) (node (ref R18) (pin 2))) @@ -1084,15 +1084,15 @@ (node (ref U4) (pin 15)) (node (ref U4) (pin 17)) (node (ref C6) (pin 1))) -(net (code 37) (name "bldc_drv.cp_cap.pos") - (node (ref U4) (pin 2)) - (node (ref C7) (pin 1))) -(net (code 38) (name "bldc_drv.cp_cap.neg") - (node (ref U4) (pin 1)) - (node (ref C7) (pin 2))) -(net (code 39) (name "bldc_drv.vcp_cap.pos") +(net (code 37) (name "bldc_drv.ic.vcp") (node (ref U4) (pin 3)) (node (ref C8) (pin 1))) +(net (code 38) (name "bldc_drv.ic.cpl") + (node (ref U4) (pin 1)) + (node (ref C7) (pin 2))) +(net (code 39) (name "bldc_drv.ic.cph") + (node (ref U4) (pin 2)) + (node (ref C7) (pin 1))) (net (code 40) (name "curr_amp[1].input") (node (ref U4) (pin 6)) (node (ref R19) (pin 2)) @@ -1102,7 +1102,7 @@ (node (ref U5) (pin 4)) (node (ref R22) (pin 1)) (node (ref TP16) (pin 1))) -(net (code 42) (name "curr_amp[1].r2.a") +(net (code 42) (name "curr_amp[1].amp.inn") (node (ref U5) (pin 3)) (node (ref R22) (pin 2)) (node (ref R23) (pin 1))) @@ -1115,7 +1115,7 @@ (node (ref U6) (pin 4)) (node (ref R24) (pin 1)) (node (ref TP17) (pin 1))) -(net (code 45) (name "curr_amp[2].r2.a") +(net (code 45) (name "curr_amp[2].amp.inn") (node (ref U6) (pin 3)) (node (ref R24) (pin 2)) (node (ref R25) (pin 1))) @@ -1128,7 +1128,7 @@ (node (ref U7) (pin 4)) (node (ref R26) (pin 1)) (node (ref TP18) (pin 1))) -(net (code 48) (name "curr_amp[3].r2.a") +(net (code 48) (name "curr_amp[3].amp.inn") (node (ref U7) (pin 3)) (node (ref R26) (pin 2)) (node (ref R27) (pin 1)))) diff --git a/examples/BldcController/BldcController.svgpcb.js b/examples/BldcController/BldcController.svgpcb.js index 3c385bb8e..9072e5863 100644 --- a/examples/BldcController/BldcController.svgpcb.js +++ b/examples/BldcController/BldcController.svgpcb.js @@ -375,6 +375,9 @@ board.setNetlist([ {name: "vusb", pads: [["U1", "26"], ["J3", "1"]]}, {name: "v3v3", pads: [["U1", "2"], ["R4", "1"], ["R5", "1"], ["J2", "2"], ["R6", "1"], ["U2", "5"], ["C1", "1"], ["R8", "1"], ["R9", "1"], ["R10", "1"], ["U5", "5"], ["C9", "1"], ["U6", "5"], ["C10", "1"], ["U7", "5"], ["C11", "1"]]}, {name: "gnd", pads: [["U1", "4"], ["J1", "1"], ["SW1", "2"], ["R1", "2"], ["R2", "2"], ["R3", "2"], ["J2", "1"], ["R7", "2"], ["U2", "2"], ["C1", "2"], ["J3", "5"], ["R12", "2"], ["U3", "4"], ["C2", "2"], ["U4", "12"], ["U4", "13"], ["U4", "14"], ["U4", "19"], ["U4", "20"], ["U4", "21"], ["U4", "28"], ["U4", "29"], ["C3", "2"], ["C4", "2"], ["C5", "2"], ["C6", "2"], ["R19", "1"], ["R20", "1"], ["R21", "1"], ["U5", "2"], ["C9", "2"], ["R23", "2"], ["U6", "2"], ["C10", "2"], ["R25", "2"], ["U7", "2"], ["C11", "2"], ["R27", "2"]]}, + {name: "mcu.gpio.hall_u", pads: [["U1", "23"], ["J3", "2"], ["R8", "2"], ["TP4", "1"]]}, + {name: "mcu.gpio.hall_v", pads: [["U1", "24"], ["J3", "3"], ["R9", "2"], ["TP5", "1"]]}, + {name: "mcu.gpio.hall_w", pads: [["U1", "25"], ["J3", "4"], ["R10", "2"], ["TP6", "1"]]}, {name: "mcu.gpio.bldc_en_1", pads: [["U1", "12"], ["U4", "26"], ["TP10", "1"]]}, {name: "mcu.gpio.bldc_en_2", pads: [["U1", "14"], ["U4", "24"], ["TP11", "1"]]}, {name: "mcu.gpio.bldc_en_3", pads: [["U1", "17"], ["U4", "22"], ["TP12", "1"]]}, @@ -384,23 +387,20 @@ board.setNetlist([ {name: "motor_pwr.pwr", pads: [["J1", "2"], ["R11", "1"], ["R13", "1"], ["U3", "7"], ["C2", "1"], ["R15", "1"]]}, {name: "sw1.out", pads: [["U1", "20"], ["SW1", "1"]]}, {name: "ledr.signal", pads: [["U1", "16"], ["D1", "2"]]}, - {name: "ledr.res.a", pads: [["D1", "1"], ["R1", "1"]]}, + {name: "ledr.package.k", pads: [["D1", "1"], ["R1", "1"]]}, {name: "ledg.signal", pads: [["U1", "7"], ["D2", "2"]]}, - {name: "ledg.res.a", pads: [["D2", "1"], ["R2", "1"]]}, + {name: "ledg.package.k", pads: [["D2", "1"], ["R2", "1"]]}, {name: "ledb.signal", pads: [["U1", "3"], ["D3", "2"]]}, - {name: "ledb.res.a", pads: [["D3", "1"], ["R3", "1"]]}, + {name: "ledb.package.k", pads: [["D3", "1"], ["R3", "1"]]}, {name: "i2c_pull.i2c.scl", pads: [["U1", "22"], ["R4", "2"], ["TP1", "1"], ["J2", "4"]]}, {name: "i2c_pull.i2c.sda", pads: [["U1", "21"], ["R5", "2"], ["TP2", "1"], ["J2", "3"]]}, {name: "ref_div.output", pads: [["R6", "2"], ["R7", "1"], ["U2", "1"]]}, {name: "ref_buf.output", pads: [["U2", "3"], ["U2", "4"], ["TP3", "1"], ["R17", "1"]]}, - {name: "hall.phases.u", pads: [["U1", "23"], ["J3", "2"], ["R8", "2"], ["TP4", "1"]]}, - {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.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.amp.amp.inp", pads: [["U3", "3"], ["R15", "2"], ["R17", "2"]]}, + {name: "isense.amp.amp.inn", pads: [["U3", "2"], ["R14", "2"], ["R16", "2"]]}, {name: "isense_clamp.signal_out", pads: [["U1", "5"], ["R18", "2"]]}, {name: "bldc_drv.nreset", pads: [["U1", "18"], ["U4", "16"]]}, {name: "bldc_drv.nfault", pads: [["U1", "19"], ["U4", "18"], ["TP9", "1"]]}, @@ -408,18 +408,18 @@ board.setNetlist([ {name: "bldc_drv.outs.2", pads: [["U4", "8"], ["J4", "2"]]}, {name: "bldc_drv.outs.3", pads: [["U4", "9"], ["J4", "3"]]}, {name: "bldc_drv.ic.v3p3", pads: [["U4", "15"], ["U4", "17"], ["C6", "1"]]}, - {name: "bldc_drv.cp_cap.pos", pads: [["U4", "2"], ["C7", "1"]]}, - {name: "bldc_drv.cp_cap.neg", pads: [["U4", "1"], ["C7", "2"]]}, - {name: "bldc_drv.vcp_cap.pos", pads: [["U4", "3"], ["C8", "1"]]}, + {name: "bldc_drv.ic.vcp", pads: [["U4", "3"], ["C8", "1"]]}, + {name: "bldc_drv.ic.cpl", pads: [["U4", "1"], ["C7", "2"]]}, + {name: "bldc_drv.ic.cph", pads: [["U4", "2"], ["C7", "1"]]}, {name: "curr_amp[1].input", pads: [["U4", "6"], ["R19", "2"], ["U5", "1"]]}, {name: "curr_amp[1].output", pads: [["U1", "10"], ["U5", "4"], ["R22", "1"], ["TP16", "1"]]}, - {name: "curr_amp[1].r2.a", pads: [["U5", "3"], ["R22", "2"], ["R23", "1"]]}, + {name: "curr_amp[1].amp.inn", pads: [["U5", "3"], ["R22", "2"], ["R23", "1"]]}, {name: "curr_amp[2].input", pads: [["U4", "7"], ["R20", "2"], ["U6", "1"]]}, {name: "curr_amp[2].output", pads: [["U1", "9"], ["U6", "4"], ["R24", "1"], ["TP17", "1"]]}, - {name: "curr_amp[2].r2.a", pads: [["U6", "3"], ["R24", "2"], ["R25", "1"]]}, + {name: "curr_amp[2].amp.inn", pads: [["U6", "3"], ["R24", "2"], ["R25", "1"]]}, {name: "curr_amp[3].input", pads: [["U4", "10"], ["R21", "2"], ["U7", "1"]]}, {name: "curr_amp[3].output", pads: [["U1", "8"], ["U7", "4"], ["R26", "1"], ["TP18", "1"]]}, - {name: "curr_amp[3].r2.a", pads: [["U7", "3"], ["R26", "2"], ["R27", "1"]]} + {name: "curr_amp[3].amp.inn", pads: [["U7", "3"], ["R26", "2"], ["R27", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/BleJoystick/BleJoystick.net b/examples/BleJoystick/BleJoystick.net index 67392bc1c..efc7be9ed 100644 --- a/examples/BleJoystick/BleJoystick.net +++ b/examples/BleJoystick/BleJoystick.net @@ -656,111 +656,111 @@ (net (code 6) (name "Jusb.usb.dm") (node (ref JJ2) (pin A7)) (node (ref JJ2) (pin B7))) -(net (code 7) (name "Jmp2722.pwr_out") +(net (code 7) (name "Jusb.cc.cc1") + (node (ref JJ2) (pin A5)) + (node (ref JU1) (pin 1))) +(net (code 8) (name "Jusb.cc.cc2") + (node (ref JJ2) (pin B5)) + (node (ref JU1) (pin 22))) +(net (code 9) (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 8) (name "Jmp2722.vrntc") +(net (code 10) (name "Jmp2722.vrntc") (node (ref JU1) (pin 7)) (node (ref JR1) (pin 1))) -(net (code 9) (name "Jmp2722.int") +(net (code 11) (name "Jmp2722.ntc1") + (node (ref JU1) (pin 10)) + (node (ref JR1) (pin 2)) + (node (ref JR2) (pin 1))) +(net (code 12) (name "Jmp2722.rst") + (node (ref JU1) (pin 17)) + (node (ref JU3) (pin 5)) + (node (ref JU4) (pin 1))) +(net (code 13) (name "Jmp2722.int") (node (ref JU1) (pin 8))) -(net (code 10) (name "Jmp2722.stat") +(net (code 14) (name "Jmp2722.stat") (node (ref JU1) (pin 11))) -(net (code 11) (name "Jmp2722.pg") +(net (code 15) (name "Jmp2722.pg") (node (ref JU1) (pin 9))) -(net (code 12) (name "Jmp2722.usb.dp") +(net (code 16) (name "Jmp2722.i2c.scl") + (node (ref JU1) (pin 16)) + (node (ref JU3) (pin 4)) + (node (ref JR13) (pin 2))) +(net (code 17) (name "Jmp2722.i2c.sda") + (node (ref JU1) (pin 15)) + (node (ref JU3) (pin 14)) + (node (ref JR14) (pin 2))) +(net (code 18) (name "Jmp2722.usb.dp") (node (ref JU1) (pin 21))) -(net (code 13) (name "Jmp2722.usb.dm") +(net (code 19) (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") +(net (code 20) (name "Jmp2722.ic.sw") + (node (ref JU1) (pin 4)) + (node (ref JC1) (pin 2)) + (node (ref JL1) (pin 1))) +(net (code 21) (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.pos") +(net (code 22) (name "Jmp2722.ic.bst") (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 20) (name "Jfake_ntc.output") - (node (ref JU1) (pin 10)) - (node (ref JR1) (pin 2)) - (node (ref JR2) (pin 1))) -(net (code 21) (name "Jmcu.program_uart_node.a_tx") +(net (code 23) (name "Jmp2722.ic.vcc") + (node (ref JU1) (pin 19)) + (node (ref JC4) (pin 1))) +(net (code 24) (name "Jmcu.program_uart_node.a_tx") (node (ref JU3) (pin 12)) (node (ref JJ3) (pin 3))) -(net (code 22) (name "Jmcu.program_uart_node.b_tx") +(net (code 25) (name "Jmcu.program_uart_node.b_tx") (node (ref JU3) (pin 11)) (node (ref JJ3) (pin 4))) -(net (code 23) (name "Jmcu.program_en_node") +(net (code 26) (name "Jmcu.program_en_node") (node (ref JU3) (pin 2)) (node (ref JJ3) (pin 6)) (node (ref JR3) (pin 2)) (node (ref JC11) (pin 1))) -(net (code 24) (name "Jmcu.program_boot_node") +(net (code 27) (name "Jmcu.program_boot_node") (node (ref JU3) (pin 8)) (node (ref JJ3) (pin 2)) (node (ref JSW1) (pin 1)) (node (ref JR10) (pin 2))) -(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") +(net (code 28) (name "Jstick.ax1") (node (ref JU4) (pin 4)) (node (ref JR4) (pin 1))) -(net (code 27) (name "Jstick.ax2") +(net (code 29) (name "Jstick.ax2") (node (ref JU4) (pin 7)) (node (ref JR6) (pin 1))) -(net (code 28) (name "Jax1_div.output") +(net (code 30) (name "Jax1_div.output") (node (ref JU3) (pin 3)) (node (ref JR4) (pin 2)) (node (ref JR5) (pin 1))) -(net (code 29) (name "Jax2_div.output") +(net (code 31) (name "Jax2_div.output") (node (ref JU3) (pin 15)) (node (ref JR6) (pin 2)) (node (ref JR7) (pin 1))) -(net (code 30) (name "Jtrig.out") +(net (code 32) (name "Jtrig.out") (node (ref JU5) (pin 2)) (node (ref JR8) (pin 1))) -(net (code 31) (name "Jtrig_div.output") +(net (code 33) (name "Jtrig_div.output") (node (ref JU3) (pin 17)) (node (ref JR8) (pin 2)) (node (ref JR9) (pin 1))) -(net (code 32) (name "Jsw[0].out") +(net (code 34) (name "Jsw[0].out") (node (ref JU3) (pin 10)) (node (ref JSW2) (pin 1))) -(net (code 33) (name "Jsw[1].out") +(net (code 35) (name "Jsw[1].out") (node (ref JU3) (pin 13)) (node (ref JSW3) (pin 1))) -(net (code 34) (name "Jsw[2].out") +(net (code 36) (name "Jsw[2].out") (node (ref JU3) (pin 6)) (node (ref JSW4) (pin 1))) -(net (code 35) (name "Jledr.res.a") +(net (code 37) (name "Jledr.package.k") (node (ref JD2) (pin 1)) (node (ref JR10) (pin 1))) -(net (code 36) (name "Jvbat_sense.output") +(net (code 38) (name "Jvbat_sense.output") (node (ref JU3) (pin 18)) (node (ref JR11) (pin 2)) - (node (ref JR12) (pin 1))) -(net (code 37) (name "Ji2c_pull.i2c.scl") - (node (ref JU1) (pin 16)) - (node (ref JU3) (pin 4)) - (node (ref JR13) (pin 2))) -(net (code 38) (name "Ji2c_pull.i2c.sda") - (node (ref JU1) (pin 15)) - (node (ref JU3) (pin 14)) - (node (ref JR14) (pin 2)))) + (node (ref JR12) (pin 1)))) ) \ No newline at end of file diff --git a/examples/BleJoystick/BleJoystick.svgpcb.js b/examples/BleJoystick/BleJoystick.svgpcb.js index cc9a9370f..a55425b99 100644 --- a/examples/BleJoystick/BleJoystick.svgpcb.js +++ b/examples/BleJoystick/BleJoystick.svgpcb.js @@ -248,25 +248,27 @@ 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: "Jusb.cc.cc1", pads: [["JJ2", "A5"], ["JU1", "1"]]}, + {name: "Jusb.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.ntc1", pads: [["JU1", "10"], ["JR1", "2"], ["JR2", "1"]]}, + {name: "Jmp2722.rst", pads: [["JU1", "17"], ["JU3", "5"], ["JU4", "1"]]}, {name: "Jmp2722.int", pads: [["JU1", "8"]]}, {name: "Jmp2722.stat", pads: [["JU1", "11"]]}, {name: "Jmp2722.pg", pads: [["JU1", "9"]]}, + {name: "Jmp2722.i2c.scl", pads: [["JU1", "16"], ["JU3", "4"], ["JR13", "2"]]}, + {name: "Jmp2722.i2c.sda", pads: [["JU1", "15"], ["JU3", "14"], ["JR14", "2"]]}, {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.sw", pads: [["JU1", "4"], ["JC1", "2"], ["JL1", "1"]]}, {name: "Jmp2722.ic.pmid", pads: [["JU1", "3"], ["JC2", "1"]]}, + {name: "Jmp2722.ic.bst", pads: [["JU1", "6"], ["JC1", "1"]]}, {name: "Jmp2722.ic.vcc", pads: [["JU1", "19"], ["JC4", "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: "Jax1_div.output", pads: [["JU3", "3"], ["JR4", "2"], ["JR5", "1"]]}, @@ -276,10 +278,8 @@ board.setNetlist([ {name: "Jsw[0].out", pads: [["JU3", "10"], ["JSW2", "1"]]}, {name: "Jsw[1].out", pads: [["JU3", "13"], ["JSW3", "1"]]}, {name: "Jsw[2].out", pads: [["JU3", "6"], ["JSW4", "1"]]}, - {name: "Jledr.res.a", pads: [["JD2", "1"], ["JR10", "1"]]}, - {name: "Jvbat_sense.output", pads: [["JU3", "18"], ["JR11", "2"], ["JR12", "1"]]}, - {name: "Ji2c_pull.i2c.scl", pads: [["JU1", "16"], ["JU3", "4"], ["JR13", "2"]]}, - {name: "Ji2c_pull.i2c.sda", pads: [["JU1", "15"], ["JU3", "14"], ["JR14", "2"]]} + {name: "Jledr.package.k", pads: [["JD2", "1"], ["JR10", "1"]]}, + {name: "Jvbat_sense.output", pads: [["JU3", "18"], ["JR11", "2"], ["JR12", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/CanAdapter/CanAdapter.net b/examples/CanAdapter/CanAdapter.net index 76465b8f5..bd5265517 100644 --- a/examples/CanAdapter/CanAdapter.net +++ b/examples/CanAdapter/CanAdapter.net @@ -418,60 +418,60 @@ (net (code 4) (name "Oobd.pwr") (node (ref OU1) (pin 16)) (node (ref OFB1) (pin 1))) -(net (code 5) (name "Oreg_3v3.fb.output") +(net (code 5) (name "Oobd.can.canh") + (node (ref OU1) (pin 6)) + (node (ref OU4) (pin 7))) +(net (code 6) (name "Oobd.can.canl") + (node (ref OU1) (pin 14)) + (node (ref OU4) (pin 6))) +(net (code 7) (name "Oreg_3v3.ic.sw") + (node (ref OU2) (pin 2)) + (node (ref OC2) (pin 2)) + (node (ref OL1) (pin 1))) +(net (code 8) (name "Oreg_3v3.ic.fb") (node (ref OU2) (pin 4)) (node (ref OR1) (pin 2)) (node (ref OR2) (pin 1))) -(net (code 6) (name "Oreg_3v3.boot_cap.pos") +(net (code 9) (name "Oreg_3v3.ic.boot") (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 8) (name "Oreg_3v3.en_res.b") +(net (code 10) (name "Oreg_3v3.ic.en") (node (ref OU2) (pin 5)) (node (ref OR3) (pin 2))) -(net (code 9) (name "Omcu.program_uart_node.a_tx") +(net (code 11) (name "Omcu.program_uart_node.a_tx") (node (ref OU3) (pin 12)) (node (ref OJ1) (pin 3))) -(net (code 10) (name "Omcu.program_uart_node.b_tx") +(net (code 12) (name "Omcu.program_uart_node.b_tx") (node (ref OU3) (pin 11)) (node (ref OJ1) (pin 4))) -(net (code 11) (name "Omcu.program_en_node") +(net (code 13) (name "Omcu.program_en_node") (node (ref OU3) (pin 2)) (node (ref OJ1) (pin 6)) (node (ref OR4) (pin 2)) (node (ref OC7) (pin 1))) -(net (code 12) (name "Omcu.program_boot_node") +(net (code 14) (name "Omcu.program_boot_node") (node (ref OU3) (pin 8)) (node (ref OJ1) (pin 2)) (node (ref OR5) (pin 2))) -(net (code 13) (name "Ocan.controller.txd") +(net (code 15) (name "Ocan.controller.txd") (node (ref OU3) (pin 6)) (node (ref OU4) (pin 1))) -(net (code 14) (name "Ocan.controller.rxd") +(net (code 16) (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") +(net (code 17) (name "Oledr.package.k") (node (ref OD2) (pin 1)) (node (ref OR5) (pin 1))) (net (code 18) (name "Oledg.signal") (node (ref OU3) (pin 13)) (node (ref OD3) (pin 2))) -(net (code 19) (name "Oledg.res.a") +(net (code 19) (name "Oledg.package.k") (node (ref OD3) (pin 1)) (node (ref OR6) (pin 1))) (net (code 20) (name "Oledw.signal") (node (ref OU3) (pin 14)) (node (ref OD4) (pin 2))) -(net (code 21) (name "Oledw.res.a") +(net (code 21) (name "Oledw.package.k") (node (ref OD4) (pin 1)) (node (ref OR7) (pin 1))) (net (code 22) (name "Ovobd_sense.output") diff --git a/examples/CanAdapter/CanAdapter.svgpcb.js b/examples/CanAdapter/CanAdapter.svgpcb.js index 1736cb591..286c469ef 100644 --- a/examples/CanAdapter/CanAdapter.svgpcb.js +++ b/examples/CanAdapter/CanAdapter.svgpcb.js @@ -161,23 +161,23 @@ board.setNetlist([ {name: "Ovobd", pads: [["OFB1", "2"], ["OU2", "3"], ["OC1", "1"], ["OC3", "1"], ["OR3", "1"], ["OR8", "1"]]}, {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.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: "Oobd.can.canh", pads: [["OU1", "6"], ["OU4", "7"]]}, + {name: "Oobd.can.canl", pads: [["OU1", "14"], ["OU4", "6"]]}, + {name: "Oreg_3v3.ic.sw", pads: [["OU2", "2"], ["OC2", "2"], ["OL1", "1"]]}, + {name: "Oreg_3v3.ic.fb", pads: [["OU2", "4"], ["OR1", "2"], ["OR2", "1"]]}, + {name: "Oreg_3v3.ic.boot", pads: [["OU2", "6"], ["OC2", "1"]]}, + {name: "Oreg_3v3.ic.en", 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.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: "Oledr.package.k", pads: [["OD2", "1"], ["OR5", "1"]]}, {name: "Oledg.signal", pads: [["OU3", "13"], ["OD3", "2"]]}, - {name: "Oledg.res.a", pads: [["OD3", "1"], ["OR6", "1"]]}, + {name: "Oledg.package.k", pads: [["OD3", "1"], ["OR6", "1"]]}, {name: "Oledw.signal", pads: [["OU3", "14"], ["OD4", "2"]]}, - {name: "Oledw.res.a", pads: [["OD4", "1"], ["OR7", "1"]]}, + {name: "Oledw.package.k", pads: [["OD4", "1"], ["OR7", "1"]]}, {name: "Ovobd_sense.output", pads: [["OU3", "3"], ["OR8", "2"], ["OR9", "1"]]} ]) diff --git a/examples/Datalogger/Datalogger.net b/examples/Datalogger/Datalogger.net index 3b817bd7b..a620b4b71 100644 --- a/examples/Datalogger/Datalogger.net +++ b/examples/Datalogger/Datalogger.net @@ -1444,23 +1444,23 @@ (node (ref U1) (pin 1)) (node (ref U10) (pin 15)) (node (ref C31) (pin 1))) -(net (code 10) (name "pwr_5v.fb.output") +(net (code 10) (name "pwr_5v.ic.sw") + (node (ref U2) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 11) (name "pwr_5v.ic.fb") (node (ref U2) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 11) (name "pwr_5v.vbst_cap.pos") +(net (code 12) (name "pwr_5v.ic.vbst") (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 13) (name "buffer.sc_out") (node (ref Q1) (pin 2)) (node (ref D1) (pin 2)) (node (ref C6) (pin 1)) (node (ref R29) (pin 1))) -(net (code 14) (name "buffer.fet.source") +(net (code 14) (name "buffer.sense.b") (node (ref R5) (pin 2)) (node (ref Q1) (pin 3)) (node (ref U3) (pin 4))) @@ -1556,7 +1556,7 @@ (node (ref U6) (pin 1)) (node (ref U6) (pin 3)) (node (ref C23) (pin 1))) -(net (code 42) (name "can.transceiver.can_pwr") +(net (code 42) (name "can.reg.pwr_out") (node (ref U6) (pin 5)) (node (ref C24) (pin 1)) (node (ref U8) (pin 8)) @@ -1573,12 +1573,12 @@ (net (code 46) (name "sd.cs") (node (ref U5) (pin 11)) (node (ref J5) (pin 1))) -(net (code 47) (name "sd.wp") - (node (ref J5) (pin 11))) -(net (code 48) (name "cd_pull.io") +(net (code 47) (name "sd.cd") (node (ref U5) (pin 16)) (node (ref J5) (pin 10)) (node (ref R10) (pin 2))) +(net (code 48) (name "sd.wp") + (node (ref J5) (pin 11))) (net (code 49) (name "xbee.data.tx") (node (ref U5) (pin 50)) (node (ref U9) (pin 2))) @@ -1590,7 +1590,7 @@ (net (code 52) (name "xbee.associate") (node (ref U9) (pin 15)) (node (ref D2) (pin 2))) -(net (code 53) (name "xbee_assoc.res.a") +(net (code 53) (name "xbee_assoc.package.k") (node (ref D2) (pin 1)) (node (ref R11) (pin 1))) (net (code 54) (name "rtc.spi.sck") @@ -1631,45 +1631,45 @@ (net (code 65) (name "eink.cs") (node (ref U5) (pin 4)) (node (ref U11) (pin 13))) -(net (code 66) (name "eink.ic.vslr") +(net (code 66) (name "eink.ic.gdr") + (node (ref U11) (pin 23)) + (node (ref Q2) (pin 1))) +(net (code 67) (name "eink.ic.rese") + (node (ref U11) (pin 22)) + (node (ref Q2) (pin 2)) + (node (ref R13) (pin 1))) +(net (code 68) (name "eink.ic.vslr") (node (ref U11) (pin 21)) (node (ref C36) (pin 1))) -(net (code 67) (name "eink.ic.vdhr") +(net (code 69) (name "eink.ic.vdhr") (node (ref U11) (pin 20)) (node (ref C37) (pin 1))) -(net (code 68) (name "eink.ic.vddd") +(net (code 70) (name "eink.ic.vddd") (node (ref U11) (pin 7)) (node (ref C38) (pin 1))) -(net (code 69) (name "eink.ic.vdh") +(net (code 71) (name "eink.ic.vdh") (node (ref U11) (pin 5)) (node (ref C39) (pin 1))) -(net (code 70) (name "eink.ic.vgh") +(net (code 72) (name "eink.ic.vgh") (node (ref U11) (pin 4)) (node (ref C40) (pin 1)) (node (ref D3) (pin 1))) -(net (code 71) (name "eink.ic.vdl") +(net (code 73) (name "eink.ic.vdl") (node (ref U11) (pin 3)) (node (ref C41) (pin 1))) -(net (code 72) (name "eink.ic.vgl") +(net (code 74) (name "eink.ic.vgl") (node (ref U11) (pin 2)) (node (ref C42) (pin 1)) (node (ref D4) (pin 2))) -(net (code 73) (name "eink.ic.vcom") +(net (code 75) (name "eink.ic.vcom") (node (ref U11) (pin 1)) (node (ref C43) (pin 1))) -(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") +(net (code 76) (name "eink.boost_sw.drain") (node (ref Q2) (pin 3)) (node (ref L2) (pin 2)) (node (ref C33) (pin 1)) (node (ref D3) (pin 2))) -(net (code 77) (name "eink.vgl_dio.cathode") +(net (code 77) (name "eink.boot_cap.neg") (node (ref C33) (pin 2)) (node (ref D4) (pin 1)) (node (ref D5) (pin 2))) @@ -1685,31 +1685,31 @@ (net (code 81) (name "ext.rts") (node (ref U5) (pin 59)) (node (ref U12) (pin 6))) -(net (code 82) (name "rgb1.red_res.a") +(net (code 82) (name "rgb1.package.k_red") (node (ref D6) (pin 3)) (node (ref R14) (pin 1))) -(net (code 83) (name "rgb1.green_res.a") +(net (code 83) (name "rgb1.package.k_green") (node (ref D6) (pin 4)) (node (ref R15) (pin 1))) -(net (code 84) (name "rgb1.blue_res.a") +(net (code 84) (name "rgb1.package.k_blue") (node (ref D6) (pin 1)) (node (ref R16) (pin 1))) -(net (code 85) (name "rgb2.red_res.a") +(net (code 85) (name "rgb2.package.k_red") (node (ref D7) (pin 3)) (node (ref R17) (pin 1))) -(net (code 86) (name "rgb2.green_res.a") +(net (code 86) (name "rgb2.package.k_green") (node (ref D7) (pin 4)) (node (ref R18) (pin 1))) -(net (code 87) (name "rgb2.blue_res.a") +(net (code 87) (name "rgb2.package.k_blue") (node (ref D7) (pin 1)) (node (ref R19) (pin 1))) -(net (code 88) (name "rgb3.red_res.a") +(net (code 88) (name "rgb3.package.k_red") (node (ref D8) (pin 3)) (node (ref R20) (pin 1))) -(net (code 89) (name "rgb3.green_res.a") +(net (code 89) (name "rgb3.package.k_green") (node (ref D8) (pin 4)) (node (ref R21) (pin 1))) -(net (code 90) (name "rgb3.blue_res.a") +(net (code 90) (name "rgb3.package.k_blue") (node (ref D8) (pin 1)) (node (ref R22) (pin 1))) (net (code 91) (name "sw1.out") diff --git a/examples/Datalogger/Datalogger.svgpcb.js b/examples/Datalogger/Datalogger.svgpcb.js index 19ace087a..7d284c4de 100644 --- a/examples/Datalogger/Datalogger.svgpcb.js +++ b/examples/Datalogger/Datalogger.svgpcb.js @@ -541,11 +541,11 @@ board.setNetlist([ {name: "usb_conn.conn.cc.cc1", pads: [["J2", "A5"], ["R1", "2"]]}, {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.pos", pads: [["U2", "6"], ["C2", "1"]]}, - {name: "pwr_5v.vbst_cap.neg", pads: [["U2", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "pwr_5v.ic.sw", pads: [["U2", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "pwr_5v.ic.fb", pads: [["U2", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "pwr_5v.ic.vbst", pads: [["U2", "6"], ["C2", "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.sense.b", pads: [["R5", "2"], ["Q1", "3"], ["U3", "4"]]}, {name: "buffer.fet.gate", pads: [["Q1", "1"], ["U3", "1"]]}, {name: "buffer.set.output", pads: [["R6", "2"], ["R7", "1"], ["U3", "3"]]}, {name: "mcu.gpio.rgb1_red", pads: [["U5", "31"], ["R14", "2"]]}, @@ -573,18 +573,18 @@ board.setNetlist([ {name: "can.conn.pwr", pads: [["J4", "2"], ["F1", "1"]]}, {name: "can.conn.gnd", pads: [["J4", "3"], ["U6", "2"], ["C23", "2"], ["C24", "2"], ["U7", "3"], ["U8", "5"], ["C26", "2"]]}, {name: "can.can_fuse.pwr_out", pads: [["F1", "2"], ["U6", "1"], ["U6", "3"], ["C23", "1"]]}, - {name: "can.transceiver.can_pwr", pads: [["U6", "5"], ["C24", "1"], ["U8", "8"], ["C26", "1"]]}, + {name: "can.reg.pwr_out", pads: [["U6", "5"], ["C24", "1"], ["U8", "8"], ["C26", "1"]]}, {name: "sd.spi.sck", pads: [["U5", "17"], ["J5", "5"]]}, {name: "sd.spi.mosi", pads: [["U5", "15"], ["J5", "2"]]}, {name: "sd.spi.miso", pads: [["U5", "19"], ["J5", "7"]]}, {name: "sd.cs", pads: [["U5", "11"], ["J5", "1"]]}, + {name: "sd.cd", pads: [["U5", "16"], ["J5", "10"], ["R10", "2"]]}, {name: "sd.wp", pads: [["J5", "11"]]}, - {name: "cd_pull.io", pads: [["U5", "16"], ["J5", "10"], ["R10", "2"]]}, {name: "xbee.data.tx", pads: [["U5", "50"], ["U9", "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: "xbee_assoc.package.k", 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"]]}, {name: "rtc.spi.miso", pads: [["U5", "7"], ["U10", "3"]]}, @@ -597,6 +597,8 @@ board.setNetlist([ {name: "eink.reset", pads: [["U5", "2"], ["U11", "15"]]}, {name: "eink.dc", pads: [["U5", "3"], ["U11", "14"]]}, {name: "eink.cs", pads: [["U5", "4"], ["U11", "13"]]}, + {name: "eink.ic.gdr", pads: [["U11", "23"], ["Q2", "1"]]}, + {name: "eink.ic.rese", pads: [["U11", "22"], ["Q2", "2"], ["R13", "1"]]}, {name: "eink.ic.vslr", pads: [["U11", "21"], ["C36", "1"]]}, {name: "eink.ic.vdhr", pads: [["U11", "20"], ["C37", "1"]]}, {name: "eink.ic.vddd", pads: [["U11", "7"], ["C38", "1"]]}, @@ -605,23 +607,21 @@ 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.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: "eink.boost_sw.drain", pads: [["Q2", "3"], ["L2", "2"], ["C33", "1"], ["D3", "2"]]}, + {name: "eink.boot_cap.neg", pads: [["C33", "2"], ["D4", "1"], ["D5", "2"]]}, {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"]]}, - {name: "rgb1.green_res.a", pads: [["D6", "4"], ["R15", "1"]]}, - {name: "rgb1.blue_res.a", pads: [["D6", "1"], ["R16", "1"]]}, - {name: "rgb2.red_res.a", pads: [["D7", "3"], ["R17", "1"]]}, - {name: "rgb2.green_res.a", pads: [["D7", "4"], ["R18", "1"]]}, - {name: "rgb2.blue_res.a", pads: [["D7", "1"], ["R19", "1"]]}, - {name: "rgb3.red_res.a", pads: [["D8", "3"], ["R20", "1"]]}, - {name: "rgb3.green_res.a", pads: [["D8", "4"], ["R21", "1"]]}, - {name: "rgb3.blue_res.a", pads: [["D8", "1"], ["R22", "1"]]}, + {name: "rgb1.package.k_red", pads: [["D6", "3"], ["R14", "1"]]}, + {name: "rgb1.package.k_green", pads: [["D6", "4"], ["R15", "1"]]}, + {name: "rgb1.package.k_blue", pads: [["D6", "1"], ["R16", "1"]]}, + {name: "rgb2.package.k_red", pads: [["D7", "3"], ["R17", "1"]]}, + {name: "rgb2.package.k_green", pads: [["D7", "4"], ["R18", "1"]]}, + {name: "rgb2.package.k_blue", pads: [["D7", "1"], ["R19", "1"]]}, + {name: "rgb3.package.k_red", pads: [["D8", "3"], ["R20", "1"]]}, + {name: "rgb3.package.k_green", pads: [["D8", "4"], ["R21", "1"]]}, + {name: "rgb3.package.k_blue", pads: [["D8", "1"], ["R22", "1"]]}, {name: "sw1.out", pads: [["U5", "33"], ["SW1", "1"], ["R23", "2"]]}, {name: "sw2.out", pads: [["U5", "23"], ["SW2", "1"], ["R24", "2"]]}, {name: "v12sense.output", pads: [["U5", "10"], ["R25", "2"], ["R26", "1"]]}, diff --git a/examples/DeskController/DeskController.net b/examples/DeskController/DeskController.net index 801348b7d..5a4d73961 100644 --- a/examples/DeskController/DeskController.net +++ b/examples/DeskController/DeskController.net @@ -1055,70 +1055,70 @@ (node (ref DU2) (pin 8)) (node (ref DJ2) (pin 2)) (node (ref DD8) (pin 2))) -(net (code 22) (name "Dsw.d[0,0].cathode") +(net (code 22) (name "Dsw.sw[0,0].sw") (node (ref DSW1) (pin 1)) (node (ref DD2) (pin 1))) -(net (code 23) (name "Dsw.d[0,1].cathode") +(net (code 23) (name "Dsw.sw[0,1].sw") (node (ref DSW2) (pin 1)) (node (ref DD3) (pin 1))) -(net (code 24) (name "Dsw.d[0,2].cathode") +(net (code 24) (name "Dsw.sw[0,2].sw") (node (ref DSW3) (pin 1)) (node (ref DD4) (pin 1))) -(net (code 25) (name "Dsw.d[1,0].cathode") +(net (code 25) (name "Dsw.sw[1,0].sw") (node (ref DSW4) (pin 1)) (node (ref DD5) (pin 1))) -(net (code 26) (name "Dsw.d[1,1].cathode") +(net (code 26) (name "Dsw.sw[1,1].sw") (node (ref DSW5) (pin 1)) (node (ref DD6) (pin 1))) -(net (code 27) (name "Dsw.d[1,2].cathode") +(net (code 27) (name "Dsw.sw[1,2].sw") (node (ref DSW6) (pin 1)) (node (ref DD7) (pin 1))) -(net (code 28) (name "Dledr.res.a") +(net (code 28) (name "Dledr.package.k") (node (ref DD8) (pin 1)) (node (ref DR4) (pin 1))) (net (code 29) (name "Doled.reset") (node (ref DU2) (pin 16)) (node (ref DJ3) (pin 17))) -(net (code 30) (name "Doled.device.vcc") +(net (code 30) (name "Doled.i2c.scl") + (node (ref DU2) (pin 17)) + (node (ref DJ3) (pin 13)) + (node (ref DR6) (pin 2))) +(net (code 31) (name "Doled.i2c.sda") + (node (ref DU2) (pin 18)) + (node (ref DJ3) (pin 11)) + (node (ref DJ3) (pin 12)) + (node (ref DR7) (pin 2))) +(net (code 32) (name "Doled.device.vcc") (node (ref DJ3) (pin 3)) (node (ref DC11) (pin 1))) -(net (code 31) (name "Doled.device.vcomh") +(net (code 33) (name "Doled.device.iref") + (node (ref DJ3) (pin 5)) + (node (ref DR5) (pin 1))) +(net (code 34) (name "Doled.device.vcomh") (node (ref DJ3) (pin 4)) (node (ref DC8) (pin 1))) -(net (code 32) (name "Doled.c1_cap.pos") +(net (code 35) (name "Doled.device.c1p") (node (ref DJ3) (pin 27)) (node (ref DC6) (pin 1))) -(net (code 33) (name "Doled.c1_cap.neg") +(net (code 36) (name "Doled.device.c1n") (node (ref DJ3) (pin 26)) (node (ref DC6) (pin 2))) -(net (code 34) (name "Doled.c2_cap.pos") +(net (code 37) (name "Doled.device.c2p") (node (ref DJ3) (pin 29)) (node (ref DC7) (pin 1))) -(net (code 35) (name "Doled.c2_cap.neg") +(net (code 38) (name "Doled.device.c2n") (node (ref DJ3) (pin 28)) (node (ref DC7) (pin 2))) -(net (code 36) (name "Doled.iref_res.a") - (node (ref DJ3) (pin 5)) - (node (ref DR5) (pin 1))) -(net (code 37) (name "Di2c_pull.i2c.scl") - (node (ref DU2) (pin 17)) - (node (ref DJ3) (pin 13)) - (node (ref DR6) (pin 2))) -(net (code 38) (name "Di2c_pull.i2c.sda") - (node (ref DU2) (pin 18)) - (node (ref DJ3) (pin 11)) - (node (ref DJ3) (pin 12)) - (node (ref DR7) (pin 2))) -(net (code 39) (name "Dspk_drv.inp_res.b") +(net (code 39) (name "Dspk_drv.ic.inp") (node (ref DU4) (pin 4)) (node (ref DR10) (pin 2))) -(net (code 40) (name "Dspk_drv.inp_cap.pos") - (node (ref DR10) (pin 1)) - (node (ref DC15) (pin 1))) -(net (code 41) (name "Dspk_drv.inn_res.b") +(net (code 40) (name "Dspk_drv.ic.inn") (node (ref DU4) (pin 3)) (node (ref DR11) (pin 2))) -(net (code 42) (name "Dspk_drv.inn_cap.pos") +(net (code 41) (name "Dspk_drv.inp_res.a") + (node (ref DR10) (pin 1)) + (node (ref DC15) (pin 1))) +(net (code 42) (name "Dspk_drv.inn_res.a") (node (ref DR11) (pin 1)) (node (ref DC16) (pin 1))) (net (code 43) (name "Dnpx_shift.lv_io") diff --git a/examples/DeskController/DeskController.svgpcb.js b/examples/DeskController/DeskController.svgpcb.js index ba4136d36..3cd89eaba 100644 --- a/examples/DeskController/DeskController.svgpcb.js +++ b/examples/DeskController/DeskController.svgpcb.js @@ -334,27 +334,27 @@ board.setNetlist([ {name: "Dmcu.program_uart_node.b_tx", pads: [["DU2", "11"], ["DJ2", "4"]]}, {name: "Dmcu.program_en_node", pads: [["DU2", "2"], ["DJ2", "6"], ["DR3", "2"], ["DC5", "1"]]}, {name: "Dmcu.program_boot_node", pads: [["DU2", "8"], ["DJ2", "2"], ["DD8", "2"]]}, - {name: "Dsw.d[0,0].cathode", pads: [["DSW1", "1"], ["DD2", "1"]]}, - {name: "Dsw.d[0,1].cathode", pads: [["DSW2", "1"], ["DD3", "1"]]}, - {name: "Dsw.d[0,2].cathode", pads: [["DSW3", "1"], ["DD4", "1"]]}, - {name: "Dsw.d[1,0].cathode", pads: [["DSW4", "1"], ["DD5", "1"]]}, - {name: "Dsw.d[1,1].cathode", pads: [["DSW5", "1"], ["DD6", "1"]]}, - {name: "Dsw.d[1,2].cathode", pads: [["DSW6", "1"], ["DD7", "1"]]}, - {name: "Dledr.res.a", pads: [["DD8", "1"], ["DR4", "1"]]}, + {name: "Dsw.sw[0,0].sw", pads: [["DSW1", "1"], ["DD2", "1"]]}, + {name: "Dsw.sw[0,1].sw", pads: [["DSW2", "1"], ["DD3", "1"]]}, + {name: "Dsw.sw[0,2].sw", pads: [["DSW3", "1"], ["DD4", "1"]]}, + {name: "Dsw.sw[1,0].sw", pads: [["DSW4", "1"], ["DD5", "1"]]}, + {name: "Dsw.sw[1,1].sw", pads: [["DSW5", "1"], ["DD6", "1"]]}, + {name: "Dsw.sw[1,2].sw", pads: [["DSW6", "1"], ["DD7", "1"]]}, + {name: "Dledr.package.k", pads: [["DD8", "1"], ["DR4", "1"]]}, {name: "Doled.reset", pads: [["DU2", "16"], ["DJ3", "17"]]}, + {name: "Doled.i2c.scl", pads: [["DU2", "17"], ["DJ3", "13"], ["DR6", "2"]]}, + {name: "Doled.i2c.sda", pads: [["DU2", "18"], ["DJ3", "11"], ["DJ3", "12"], ["DR7", "2"]]}, {name: "Doled.device.vcc", pads: [["DJ3", "3"], ["DC11", "1"]]}, + {name: "Doled.device.iref", pads: [["DJ3", "5"], ["DR5", "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"]]}, - {name: "Doled.c2_cap.neg", pads: [["DJ3", "28"], ["DC7", "2"]]}, - {name: "Doled.iref_res.a", pads: [["DJ3", "5"], ["DR5", "1"]]}, - {name: "Di2c_pull.i2c.scl", pads: [["DU2", "17"], ["DJ3", "13"], ["DR6", "2"]]}, - {name: "Di2c_pull.i2c.sda", pads: [["DU2", "18"], ["DJ3", "11"], ["DJ3", "12"], ["DR7", "2"]]}, - {name: "Dspk_drv.inp_res.b", pads: [["DU4", "4"], ["DR10", "2"]]}, - {name: "Dspk_drv.inp_cap.pos", pads: [["DR10", "1"], ["DC15", "1"]]}, - {name: "Dspk_drv.inn_res.b", pads: [["DU4", "3"], ["DR11", "2"]]}, - {name: "Dspk_drv.inn_cap.pos", pads: [["DR11", "1"], ["DC16", "1"]]}, + {name: "Doled.device.c1p", pads: [["DJ3", "27"], ["DC6", "1"]]}, + {name: "Doled.device.c1n", pads: [["DJ3", "26"], ["DC6", "2"]]}, + {name: "Doled.device.c2p", pads: [["DJ3", "29"], ["DC7", "1"]]}, + {name: "Doled.device.c2n", pads: [["DJ3", "28"], ["DC7", "2"]]}, + {name: "Dspk_drv.ic.inp", pads: [["DU4", "4"], ["DR10", "2"]]}, + {name: "Dspk_drv.ic.inn", pads: [["DU4", "3"], ["DR11", "2"]]}, + {name: "Dspk_drv.inp_res.a", pads: [["DR10", "1"], ["DC15", "1"]]}, + {name: "Dspk_drv.inn_res.a", pads: [["DR11", "1"], ["DC16", "1"]]}, {name: "Dnpx_shift.lv_io", pads: [["DU2", "6"], ["DQ3", "2"]]}, {name: "Dnpx_shift.hv_io", pads: [["DQ3", "3"], ["DR12", "2"], ["DTP5", "1"], ["DD9", "4"]]}, {name: "Dnpx.dout", pads: [["DD14", "2"]]}, diff --git a/examples/EspLora/EspLora.net b/examples/EspLora/EspLora.net index 01f392fd7..3d595e19d 100644 --- a/examples/EspLora/EspLora.net +++ b/examples/EspLora/EspLora.net @@ -1430,112 +1430,112 @@ (net (code 13) (name "Lledr.signal") (node (ref LU2) (pin 34)) (node (ref LD2) (pin 2))) -(net (code 14) (name "Lledr.res.a") +(net (code 14) (name "Lledr.package.k") (node (ref LD2) (pin 1)) (node (ref LR4) (pin 1))) (net (code 15) (name "Lledg.signal") (node (ref LU2) (pin 35)) (node (ref LD3) (pin 2))) -(net (code 16) (name "Lledg.res.a") +(net (code 16) (name "Lledg.package.k") (node (ref LD3) (pin 1)) (node (ref LR5) (pin 1))) (net (code 17) (name "Lledb.signal") (node (ref LU2) (pin 39)) (node (ref LD4) (pin 2))) -(net (code 18) (name "Lledb.res.a") +(net (code 18) (name "Lledb.package.k") (node (ref LD4) (pin 1)) (node (ref LR6) (pin 1))) -(net (code 19) (name "Llora.busy") +(net (code 19) (name "Llora.reset") + (node (ref LU2) (pin 12)) + (node (ref LU4) (pin 15)) + (node (ref LTP8) (pin 1))) +(net (code 20) (name "Llora.spi.sck") + (node (ref LU2) (pin 5)) + (node (ref LU4) (pin 18)) + (node (ref LTP4) (pin 1))) +(net (code 21) (name "Llora.spi.mosi") + (node (ref LU2) (pin 6)) + (node (ref LU4) (pin 17)) + (node (ref LTP5) (pin 1))) +(net (code 22) (name "Llora.spi.miso") + (node (ref LU2) (pin 15)) + (node (ref LU4) (pin 16)) + (node (ref LTP6) (pin 1))) +(net (code 23) (name "Llora.cs") + (node (ref LU2) (pin 7)) + (node (ref LU4) (pin 19)) + (node (ref LTP7) (pin 1))) +(net (code 24) (name "Llora.irq") + (node (ref LU2) (pin 31)) + (node (ref LU4) (pin 13)) + (node (ref LTP9) (pin 1))) +(net (code 25) (name "Llora.busy") (node (ref LU2) (pin 33)) (node (ref LU4) (pin 14)) (node (ref LTP10) (pin 1))) -(net (code 20) (name "Llora.ic.vreg") +(net (code 26) (name "Llora.ic.vreg") (node (ref LU4) (pin 7)) (node (ref LC6) (pin 1)) (node (ref LL1) (pin 2))) -(net (code 21) (name "Llora.ic.rfo") +(net (code 27) (name "Llora.ic.dcc_sw") + (node (ref LU4) (pin 9)) + (node (ref LL1) (pin 1))) +(net (code 28) (name "Llora.ic.xtal.xtal_in") + (node (ref LU4) (pin 3)) + (node (ref LX1) (pin 1))) +(net (code 29) (name "Llora.ic.xtal.xtal_out") + (node (ref LU4) (pin 4)) + (node (ref LX1) (pin 3))) +(net (code 30) (name "Llora.ic.rfi_p") + (node (ref LU4) (pin 21)) + (node (ref LL5) (pin 2)) + (node (ref LC16) (pin 1))) +(net (code 31) (name "Llora.ic.rfi_n") + (node (ref LU4) (pin 22)) + (node (ref LL5) (pin 1)) + (node (ref LC15) (pin 2))) +(net (code 32) (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") +(net (code 33) (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") - (node (ref LU4) (pin 3)) - (node (ref LX1) (pin 1))) -(net (code 25) (name "Llora.xtal.crystal.xtal_out") - (node (ref LU4) (pin 4)) - (node (ref LX1) (pin 3))) -(net (code 26) (name "Llora.dcc_l.a") - (node (ref LU4) (pin 9)) - (node (ref LL1) (pin 1))) -(net (code 27) (name "Llora.rf_sw.ctrl") +(net (code 34) (name "Llora.ic.dio2") (node (ref LU4) (pin 12)) (node (ref LR8) (pin 1))) -(net (code 28) (name "Llora.rf_sw.vdd_res.b") - (node (ref LU5) (pin 6)) - (node (ref LR7) (pin 2))) -(net (code 29) (name "Llora.rf_sw.ctrl_res.b") - (node (ref LU5) (pin 4)) - (node (ref LR8) (pin 2))) -(net (code 30) (name "Llora.tx_dcblock.pos") +(net (code 35) (name "Llora.ic.dio3") + (node (ref LU4) (pin 6))) +(net (code 36) (name "Llora.rf_sw.rf1") (node (ref LU5) (pin 1)) (node (ref LC11) (pin 1))) -(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") +(net (code 37) (name "Llora.rf_sw.rf2") + (node (ref LU5) (pin 3)) + (node (ref LC15) (pin 1))) +(net (code 38) (name "Llora.rf_sw.rfc") (node (ref LU5) (pin 5)) (node (ref LC12) (pin 2))) -(net (code 33) (name "Llora.tx_pi.output") +(net (code 39) (name "Llora.rf_sw.ic.vdd") + (node (ref LU5) (pin 6)) + (node (ref LR7) (pin 2))) +(net (code 40) (name "Llora.rf_sw.ic.ctrl") + (node (ref LU5) (pin 4)) + (node (ref LR8) (pin 2))) +(net (code 41) (name "Llora.tx_dcblock.neg") (node (ref LC11) (pin 2)) (node (ref LC14) (pin 1)) (node (ref LL4) (pin 2))) -(net (code 34) (name "Llora.balun.input") - (node (ref LU5) (pin 3)) - (node (ref LC15) (pin 1))) -(net (code 35) (name "Llora.balun.rfi_n") - (node (ref LU4) (pin 22)) - (node (ref LL5) (pin 1)) - (node (ref LC15) (pin 2))) -(net (code 36) (name "Llora.balun.rfi_p") - (node (ref LU4) (pin 21)) - (node (ref LL5) (pin 2)) - (node (ref LC16) (pin 1))) -(net (code 37) (name "Llora.ant_pi.output") +(net (code 42) (name "Llora.rfc_dcblock.pos") + (node (ref LC12) (pin 1)) + (node (ref LC17) (pin 1)) + (node (ref LL6) (pin 1))) +(net (code 43) (name "Llora.ant_pi.output") (node (ref LC18) (pin 1)) (node (ref LL6) (pin 2)) (node (ref LJ3) (pin 1))) -(net (code 38) (name "Ltp_lora_spi.io.sck") - (node (ref LU2) (pin 5)) - (node (ref LU4) (pin 18)) - (node (ref LTP4) (pin 1))) -(net (code 39) (name "Ltp_lora_spi.io.mosi") - (node (ref LU2) (pin 6)) - (node (ref LU4) (pin 17)) - (node (ref LTP5) (pin 1))) -(net (code 40) (name "Ltp_lora_spi.io.miso") - (node (ref LU2) (pin 15)) - (node (ref LU4) (pin 16)) - (node (ref LTP6) (pin 1))) -(net (code 41) (name "Ltp_lora_cs.io") - (node (ref LU2) (pin 7)) - (node (ref LU4) (pin 19)) - (node (ref LTP7) (pin 1))) -(net (code 42) (name "Ltp_lora_rst.io") - (node (ref LU2) (pin 12)) - (node (ref LU4) (pin 15)) - (node (ref LTP8) (pin 1))) -(net (code 43) (name "Ltp_lora_dio.io") - (node (ref LU2) (pin 31)) - (node (ref LU4) (pin 13)) - (node (ref LTP9) (pin 1))) (net (code 44) (name "Li2c_pull.i2c.scl") (node (ref LU2) (pin 10)) (node (ref LR9) (pin 2)) @@ -1549,31 +1549,31 @@ (node (ref LJ4) (pin 19)) (node (ref LJ4) (pin 20)) (node (ref LU8) (pin 5))) -(net (code 46) (name "Loled.device.vcc") +(net (code 46) (name "Loled.reset") + (node (ref LJ4) (pin 14)) + (node (ref LU7) (pin 2)) + (node (ref LR12) (pin 2))) +(net (code 47) (name "Loled.device.vcc") (node (ref LJ4) (pin 28)) (node (ref LC24) (pin 1))) -(net (code 47) (name "Loled.device.vcomh") +(net (code 48) (name "Loled.device.iref") + (node (ref LJ4) (pin 26)) + (node (ref LR11) (pin 1))) +(net (code 49) (name "Loled.device.vcomh") (node (ref LJ4) (pin 27)) (node (ref LC21) (pin 1))) -(net (code 48) (name "Loled.c1_cap.pos") +(net (code 50) (name "Loled.device.c1p") (node (ref LJ4) (pin 4)) (node (ref LC19) (pin 1))) -(net (code 49) (name "Loled.c1_cap.neg") +(net (code 51) (name "Loled.device.c1n") (node (ref LJ4) (pin 5)) (node (ref LC19) (pin 2))) -(net (code 50) (name "Loled.c2_cap.pos") +(net (code 52) (name "Loled.device.c2p") (node (ref LJ4) (pin 2)) (node (ref LC20) (pin 1))) -(net (code 51) (name "Loled.c2_cap.neg") +(net (code 53) (name "Loled.device.c2n") (node (ref LJ4) (pin 3)) (node (ref LC20) (pin 2))) -(net (code 52) (name "Loled.iref_res.a") - (node (ref LJ4) (pin 26)) - (node (ref LR11) (pin 1))) -(net (code 53) (name "Loled_rst.nreset") - (node (ref LJ4) (pin 14)) - (node (ref LU7) (pin 2)) - (node (ref LR12) (pin 2))) (net (code 54) (name "Lsd.spi.sck") (node (ref LU2) (pin 22)) (node (ref LJ5) (pin 5))) @@ -1627,33 +1627,33 @@ (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))) -(net (code 70) (name "Lnfc.rx.rrx2.b") - (node (ref LR14) (pin 2)) - (node (ref LC37) (pin 1))) -(net (code 71) (name "Lnfc.emc.out1") +(net (code 69) (name "Lnfc.rx.in1") (node (ref LR13) (pin 1)) (node (ref LL7) (pin 2)) (node (ref LC38) (pin 1)) (node (ref LC40) (pin 1))) -(net (code 72) (name "Lnfc.emc.out2") +(net (code 70) (name "Lnfc.rx.in2") (node (ref LR14) (pin 1)) (node (ref LL8) (pin 2)) (node (ref LC39) (pin 1)) (node (ref LC41) (pin 1))) -(net (code 73) (name "Lnfc.damp.ant1") +(net (code 71) (name "Lnfc.rx.rrx1.b") + (node (ref LR13) (pin 2)) + (node (ref LC36) (pin 1))) +(net (code 72) (name "Lnfc.rx.rrx2.b") + (node (ref LR14) (pin 2)) + (node (ref LC37) (pin 1))) +(net (code 73) (name "Lnfc.ant.ant1") (node (ref LANT1) (pin 1)) (node (ref LR15) (pin 2))) -(net (code 74) (name "Lnfc.damp.ant2") +(net (code 74) (name "Lnfc.ant.ant2") (node (ref LANT1) (pin 2)) (node (ref LR16) (pin 2))) -(net (code 75) (name "Lnfc.match.out1") +(net (code 75) (name "Lnfc.damp.in1") (node (ref LR15) (pin 1)) (node (ref LC40) (pin 2)) (node (ref LC42) (pin 1))) -(net (code 76) (name "Lnfc.match.out2") +(net (code 76) (name "Lnfc.damp.in2") (node (ref LR16) (pin 1)) (node (ref LC41) (pin 2)) (node (ref LC43) (pin 1))) diff --git a/examples/EspLora/EspLora.svgpcb.js b/examples/EspLora/EspLora.svgpcb.js index 616985652..323552ec8 100644 --- a/examples/EspLora/EspLora.svgpcb.js +++ b/examples/EspLora/EspLora.svgpcb.js @@ -540,46 +540,46 @@ board.setNetlist([ {name: "Lmcu.program_en_node", pads: [["LU2", "3"], ["LJ2", "6"], ["LR3", "2"], ["LC5", "1"]]}, {name: "Lmcu.program_boot_node", pads: [["LU2", "27"], ["LJ2", "2"], ["LSW1", "1"]]}, {name: "Lledr.signal", pads: [["LU2", "34"], ["LD2", "2"]]}, - {name: "Lledr.res.a", pads: [["LD2", "1"], ["LR4", "1"]]}, + {name: "Lledr.package.k", pads: [["LD2", "1"], ["LR4", "1"]]}, {name: "Lledg.signal", pads: [["LU2", "35"], ["LD3", "2"]]}, - {name: "Lledg.res.a", pads: [["LD3", "1"], ["LR5", "1"]]}, + {name: "Lledg.package.k", pads: [["LD3", "1"], ["LR5", "1"]]}, {name: "Lledb.signal", pads: [["LU2", "39"], ["LD4", "2"]]}, - {name: "Lledb.res.a", pads: [["LD4", "1"], ["LR6", "1"]]}, + {name: "Lledb.package.k", pads: [["LD4", "1"], ["LR6", "1"]]}, + {name: "Llora.reset", pads: [["LU2", "12"], ["LU4", "15"], ["LTP8", "1"]]}, + {name: "Llora.spi.sck", pads: [["LU2", "5"], ["LU4", "18"], ["LTP4", "1"]]}, + {name: "Llora.spi.mosi", pads: [["LU2", "6"], ["LU4", "17"], ["LTP5", "1"]]}, + {name: "Llora.spi.miso", pads: [["LU2", "15"], ["LU4", "16"], ["LTP6", "1"]]}, + {name: "Llora.cs", pads: [["LU2", "7"], ["LU4", "19"], ["LTP7", "1"]]}, + {name: "Llora.irq", pads: [["LU2", "31"], ["LU4", "13"], ["LTP9", "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.dcc_sw", pads: [["LU4", "9"], ["LL1", "1"]]}, + {name: "Llora.ic.xtal.xtal_in", pads: [["LU4", "3"], ["LX1", "1"]]}, + {name: "Llora.ic.xtal.xtal_out", pads: [["LU4", "4"], ["LX1", "3"]]}, + {name: "Llora.ic.rfi_p", pads: [["LU4", "21"], ["LL5", "2"], ["LC16", "1"]]}, + {name: "Llora.ic.rfi_n", pads: [["LU4", "22"], ["LL5", "1"], ["LC15", "2"]]}, {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.dio2", pads: [["LU4", "12"], ["LR8", "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"]]}, - {name: "Llora.dcc_l.a", pads: [["LU4", "9"], ["LL1", "1"]]}, - {name: "Llora.rf_sw.ctrl", pads: [["LU4", "12"], ["LR8", "1"]]}, - {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.rf_sw.rf1", pads: [["LU5", "1"], ["LC11", "1"]]}, + {name: "Llora.rf_sw.rf2", pads: [["LU5", "3"], ["LC15", "1"]]}, + {name: "Llora.rf_sw.rfc", pads: [["LU5", "5"], ["LC12", "2"]]}, + {name: "Llora.rf_sw.ic.vdd", pads: [["LU5", "6"], ["LR7", "2"]]}, + {name: "Llora.rf_sw.ic.ctrl", pads: [["LU5", "4"], ["LR8", "2"]]}, + {name: "Llora.tx_dcblock.neg", pads: [["LC11", "2"], ["LC14", "1"], ["LL4", "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"]]}, - {name: "Llora.balun.rfi_p", pads: [["LU4", "21"], ["LL5", "2"], ["LC16", "1"]]}, {name: "Llora.ant_pi.output", pads: [["LC18", "1"], ["LL6", "2"], ["LJ3", "1"]]}, - {name: "Ltp_lora_spi.io.sck", pads: [["LU2", "5"], ["LU4", "18"], ["LTP4", "1"]]}, - {name: "Ltp_lora_spi.io.mosi", pads: [["LU2", "6"], ["LU4", "17"], ["LTP5", "1"]]}, - {name: "Ltp_lora_spi.io.miso", pads: [["LU2", "15"], ["LU4", "16"], ["LTP6", "1"]]}, - {name: "Ltp_lora_cs.io", pads: [["LU2", "7"], ["LU4", "19"], ["LTP7", "1"]]}, - {name: "Ltp_lora_rst.io", pads: [["LU2", "12"], ["LU4", "15"], ["LTP8", "1"]]}, - {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.reset", pads: [["LJ4", "14"], ["LU7", "2"], ["LR12", "2"]]}, {name: "Loled.device.vcc", pads: [["LJ4", "28"], ["LC24", "1"]]}, + {name: "Loled.device.iref", pads: [["LJ4", "26"], ["LR11", "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"]]}, - {name: "Loled.c2_cap.neg", pads: [["LJ4", "3"], ["LC20", "2"]]}, - {name: "Loled.iref_res.a", pads: [["LJ4", "26"], ["LR11", "1"]]}, - {name: "Loled_rst.nreset", pads: [["LJ4", "14"], ["LU7", "2"], ["LR12", "2"]]}, + {name: "Loled.device.c1p", pads: [["LJ4", "4"], ["LC19", "1"]]}, + {name: "Loled.device.c1n", pads: [["LJ4", "5"], ["LC19", "2"]]}, + {name: "Loled.device.c2p", pads: [["LJ4", "2"], ["LC20", "1"]]}, + {name: "Loled.device.c2n", pads: [["LJ4", "3"], ["LC20", "2"]]}, {name: "Lsd.spi.sck", pads: [["LU2", "22"], ["LJ5", "5"]]}, {name: "Lsd.spi.mosi", pads: [["LU2", "19"], ["LJ5", "3"]]}, {name: "Lsd.spi.miso", pads: [["LU2", "38"], ["LJ5", "7"]]}, @@ -595,14 +595,14 @@ board.setNetlist([ {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.in1", pads: [["LR13", "1"], ["LL7", "2"], ["LC38", "1"], ["LC40", "1"]]}, + {name: "Lnfc.rx.in2", pads: [["LR14", "1"], ["LL8", "2"], ["LC39", "1"], ["LC41", "1"]]}, {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"]]}, - {name: "Lnfc.emc.out2", pads: [["LR14", "1"], ["LL8", "2"], ["LC39", "1"], ["LC41", "1"]]}, - {name: "Lnfc.damp.ant1", pads: [["LANT1", "1"], ["LR15", "2"]]}, - {name: "Lnfc.damp.ant2", pads: [["LANT1", "2"], ["LR16", "2"]]}, - {name: "Lnfc.match.out1", pads: [["LR15", "1"], ["LC40", "2"], ["LC42", "1"]]}, - {name: "Lnfc.match.out2", pads: [["LR16", "1"], ["LC41", "2"], ["LC43", "1"]]}, + {name: "Lnfc.ant.ant1", pads: [["LANT1", "1"], ["LR15", "2"]]}, + {name: "Lnfc.ant.ant2", pads: [["LANT1", "2"], ["LR16", "2"]]}, + {name: "Lnfc.damp.in1", pads: [["LR15", "1"], ["LC40", "2"], ["LC42", "1"]]}, + {name: "Lnfc.damp.in2", pads: [["LR16", "1"], ["LC41", "2"], ["LC43", "1"]]}, {name: "Ltx_cpack.pos.0", pads: [["LL3", "2"], ["LC13", "1"], ["LL4", "1"], ["LC44", "1"]]} ]) diff --git a/examples/EspProgrammer/EspProgrammer.net b/examples/EspProgrammer/EspProgrammer.net index 8a35e7e1d..61ef0ebd6 100644 --- a/examples/EspProgrammer/EspProgrammer.net +++ b/examples/EspProgrammer/EspProgrammer.net @@ -375,22 +375,22 @@ (node (ref UU1) (pin 6)) (node (ref UU1) (pin 9)) (node (ref UC3) (pin 1))) -(net (code 19) (name "Uauto.en") +(net (code 19) (name "Uout.en") (node (ref UJ2) (pin 6)) (node (ref UQ1) (pin 3))) -(net (code 20) (name "Uauto.boot") +(net (code 20) (name "Uout.boot") (node (ref UJ2) (pin 2)) (node (ref UQ2) (pin 3))) -(net (code 21) (name "Uauto.dtr_res.b") +(net (code 21) (name "Uauto.q_en.base") (node (ref UQ1) (pin 1)) (node (ref UR3) (pin 2))) -(net (code 22) (name "Uauto.rts_res.b") +(net (code 22) (name "Uauto.q_boot.base") (node (ref UQ2) (pin 1)) (node (ref UR4) (pin 2))) -(net (code 23) (name "Uled.res.a") +(net (code 23) (name "Uled.package.k") (node (ref UD2) (pin 1)) (node (ref UR5) (pin 1))) -(net (code 24) (name "Uled_en.res.a") +(net (code 24) (name "Uled_en.package.k") (node (ref UD3) (pin 1)) (node (ref UR6) (pin 1)))) ) \ No newline at end of file diff --git a/examples/EspProgrammer/EspProgrammer.svgpcb.js b/examples/EspProgrammer/EspProgrammer.svgpcb.js index 3f0eee39b..e8d2ebeb7 100644 --- a/examples/EspProgrammer/EspProgrammer.svgpcb.js +++ b/examples/EspProgrammer/EspProgrammer.svgpcb.js @@ -140,12 +140,12 @@ board.setNetlist([ {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"]]}, - {name: "Uauto.boot", pads: [["UJ2", "2"], ["UQ2", "3"]]}, - {name: "Uauto.dtr_res.b", pads: [["UQ1", "1"], ["UR3", "2"]]}, - {name: "Uauto.rts_res.b", pads: [["UQ2", "1"], ["UR4", "2"]]}, - {name: "Uled.res.a", pads: [["UD2", "1"], ["UR5", "1"]]}, - {name: "Uled_en.res.a", pads: [["UD3", "1"], ["UR6", "1"]]} + {name: "Uout.en", pads: [["UJ2", "6"], ["UQ1", "3"]]}, + {name: "Uout.boot", pads: [["UJ2", "2"], ["UQ2", "3"]]}, + {name: "Uauto.q_en.base", pads: [["UQ1", "1"], ["UR3", "2"]]}, + {name: "Uauto.q_boot.base", pads: [["UQ2", "1"], ["UR4", "2"]]}, + {name: "Uled.package.k", pads: [["UD2", "1"], ["UR5", "1"]]}, + {name: "Uled_en.package.k", pads: [["UD3", "1"], ["UR6", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/Fcml/Fcml.net b/examples/Fcml/Fcml.net index ba2dcf7d4..def708a68 100644 --- a/examples/Fcml/Fcml.net +++ b/examples/Fcml/Fcml.net @@ -2313,15 +2313,7 @@ (net (code 12) (name "usb_fpga.conn.cc.cc2") (node (ref J2) (pin B5)) (node (ref R4) (pin 2))) -(net (code 13) (name "reg_vgate.fb.output") - (node (ref U2) (pin 3)) - (node (ref R5) (pin 2)) - (node (ref R6) (pin 1))) -(net (code 14) (name "reg_vgate.power_path.switch") - (node (ref U2) (pin 1)) - (node (ref L1) (pin 2)) - (node (ref D2) (pin 2))) -(net (code 15) (name "conv.pwr_in") +(net (code 13) (name "conv_in.pwr") (node (ref J3) (pin 2)) (node (ref C5) (pin 1)) (node (ref C6) (pin 1)) @@ -2333,6 +2325,14 @@ (node (ref Q1) (pin 7)) (node (ref Q1) (pin 8)) (node (ref R36) (pin 1))) +(net (code 14) (name "reg_vgate.ic.sw") + (node (ref U2) (pin 1)) + (node (ref L1) (pin 2)) + (node (ref D2) (pin 2))) +(net (code 15) (name "reg_vgate.ic.fb") + (node (ref U2) (pin 3)) + (node (ref R5) (pin 2)) + (node (ref R6) (pin 1))) (net (code 16) (name "conv.pwr_out") (node (ref L2) (pin 2)) (node (ref C10) (pin 1)) @@ -2341,7 +2341,31 @@ (node (ref J4) (pin 2)) (node (ref TP5) (pin 1)) (node (ref R38) (pin 1))) -(net (code 17) (name "conv.sw[0].low_out") +(net (code 17) (name "conv.pwms.0L") + (node (ref U3) (pin 3)) + (node (ref R30) (pin 2)) + (node (ref C61) (pin 1))) +(net (code 18) (name "conv.pwms.0H") + (node (ref U3) (pin 2)) + (node (ref R31) (pin 2)) + (node (ref C62) (pin 1))) +(net (code 19) (name "conv.pwms.1L") + (node (ref U5) (pin 3)) + (node (ref R32) (pin 2)) + (node (ref C63) (pin 1))) +(net (code 20) (name "conv.pwms.1H") + (node (ref U5) (pin 2)) + (node (ref R33) (pin 2)) + (node (ref C64) (pin 1))) +(net (code 21) (name "conv.pwms.2L") + (node (ref U8) (pin 3)) + (node (ref R34) (pin 2)) + (node (ref C65) (pin 1))) +(net (code 22) (name "conv.pwms.2H") + (node (ref U8) (pin 2)) + (node (ref R35) (pin 2)) + (node (ref C66) (pin 1))) +(net (code 23) (name "conv.sw[0].low_out") (node (ref Q2) (pin 5)) (node (ref Q2) (pin 6)) (node (ref Q2) (pin 7)) @@ -2359,24 +2383,43 @@ (node (ref Q4) (pin 2)) (node (ref Q4) (pin 3)) (node (ref C25) (pin 2))) -(net (code 18) (name "conv.sw[0].high_gate_res.a") - (node (ref U3) (pin 7)) - (node (ref R7) (pin 1))) -(net (code 19) (name "conv.sw[0].high_gate_res.b") - (node (ref R7) (pin 2)) - (node (ref Q1) (pin 4))) -(net (code 20) (name "conv.sw[0].low_gate_res.a") +(net (code 24) (name "conv.sw[0].high_out") + (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[0].high_boot_in") + (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[0].driver.low_out") (node (ref U3) (pin 5)) (node (ref R8) (pin 1))) -(net (code 21) (name "conv.sw[0].low_gate_res.b") - (node (ref R8) (pin 2)) - (node (ref Q2) (pin 4))) -(net (code 22) (name "conv.sw[0].high_boot_cap.pos") +(net (code 27) (name "conv.sw[0].driver.high_pwr") (node (ref U3) (pin 8)) (node (ref C14) (pin 1)) (node (ref C15) (pin 1)) (node (ref D3) (pin 1))) -(net (code 23) (name "conv.sw[1].low_out") +(net (code 28) (name "conv.sw[0].driver.high_out") + (node (ref U3) (pin 7)) + (node (ref R7) (pin 1))) +(net (code 29) (name "conv.sw[0].high_gate_res.b") + (node (ref R7) (pin 2)) + (node (ref Q1) (pin 4))) +(net (code 30) (name "conv.sw[0].low_gate_res.b") + (node (ref R8) (pin 2)) + (node (ref Q2) (pin 4))) +(net (code 31) (name "conv.sw[1].low_out") (node (ref Q4) (pin 5)) (node (ref Q4) (pin 6)) (node (ref Q4) (pin 7)) @@ -2394,49 +2437,7 @@ (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.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))) -(net (code 30) (name "conv.sw[1].high_gate_res.b") - (node (ref R9) (pin 2)) - (node (ref Q3) (pin 4))) -(net (code 31) (name "conv.sw[1].low_gate_res.a") - (node (ref U6) (pin 5)) - (node (ref R10) (pin 1))) -(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].low_boot_in") +(net (code 32) (name "conv.sw[1].low_boot_out") (node (ref U4) (pin 1)) (node (ref U4) (pin 3)) (node (ref C16) (pin 1)) @@ -2445,16 +2446,7 @@ (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") +(net (code 33) (name "conv.sw[1].high_out") (node (ref U6) (pin 6)) (node (ref C21) (pin 2)) (node (ref Q3) (pin 1)) @@ -2467,36 +2459,68 @@ (node (ref Q5) (pin 6)) (node (ref Q5) (pin 7)) (node (ref Q5) (pin 8))) -(net (code 36) (name "conv.sw[2].high_boot_out") +(net (code 34) (name "conv.sw[1].high_boot_in") (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 37) (name "conv.sw[2].iso.pwr_b") +(net (code 35) (name "conv.sw[1].ldo.pwr_out") + (node (ref U4) (pin 5)) + (node (ref C17) (pin 1)) + (node (ref U5) (pin 8)) + (node (ref C19) (pin 1))) +(net (code 36) (name "conv.sw[1].driver.low_in") + (node (ref U5) (pin 6)) + (node (ref U6) (pin 3))) +(net (code 37) (name "conv.sw[1].driver.high_in") + (node (ref U5) (pin 7)) + (node (ref U6) (pin 2))) +(net (code 38) (name "conv.sw[1].driver.low_out") + (node (ref U6) (pin 5)) + (node (ref R10) (pin 1))) +(net (code 39) (name "conv.sw[1].driver.high_out") + (node (ref U6) (pin 7)) + (node (ref R9) (pin 1))) +(net (code 40) (name "conv.sw[1].high_gate_res.b") + (node (ref R9) (pin 2)) + (node (ref Q3) (pin 4))) +(net (code 41) (name "conv.sw[1].low_gate_res.b") + (node (ref R10) (pin 2)) + (node (ref Q4) (pin 4))) +(net (code 42) (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 43) (name "conv.sw[2].ldo.pwr_out") (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.low_in") +(net (code 44) (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") +(net (code 45) (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") +(net (code 46) (name "conv.sw[2].driver.low_out") + (node (ref U9) (pin 5)) + (node (ref R12) (pin 1))) +(net (code 47) (name "conv.sw[2].driver.high_out") (node (ref U9) (pin 7)) (node (ref R11) (pin 1))) -(net (code 41) (name "conv.sw[2].high_gate_res.b") +(net (code 48) (name "conv.sw[2].high_gate_res.b") (node (ref R11) (pin 2)) (node (ref Q5) (pin 4))) -(net (code 42) (name "conv.sw[2].low_gate_res.a") - (node (ref U9) (pin 5)) - (node (ref R12) (pin 1))) -(net (code 43) (name "conv.sw[2].low_gate_res.b") +(net (code 49) (name "conv.sw[2].low_gate_res.b") (node (ref R12) (pin 2)) (node (ref Q6) (pin 4))) -(net (code 44) (name "conv.sw_merge") +(net (code 50) (name "conv.sw_merge") (node (ref L2) (pin 1)) (node (ref U9) (pin 6)) (node (ref C31) (pin 2)) @@ -2508,232 +2532,208 @@ (node (ref Q6) (pin 7)) (node (ref Q6) (pin 8)) (node (ref C34) (pin 2))) -(net (code 45) (name "fpga.gpio.led_0") +(net (code 51) (name "fpga.gpio.led_0") (node (ref U10) (pin 21)) (node (ref D9) (pin 2))) -(net (code 46) (name "fpga.gpio.led_1") +(net (code 52) (name "fpga.gpio.led_1") (node (ref U10) (pin 20)) (node (ref D10) (pin 2))) -(net (code 47) (name "fpga.gpio.led_2") +(net (code 53) (name "fpga.gpio.led_2") (node (ref U10) (pin 19)) (node (ref D11) (pin 2))) -(net (code 48) (name "fpga.gpio.led_3") +(net (code 54) (name "fpga.gpio.led_3") (node (ref U10) (pin 18)) (node (ref D12) (pin 2))) -(net (code 49) (name "fpga.gpio.pwm_0L") +(net (code 55) (name "fpga.gpio.pwm_0L") (node (ref U10) (pin 47)) (node (ref TP11) (pin 1)) (node (ref R30) (pin 1))) -(net (code 50) (name "fpga.gpio.pwm_0H") +(net (code 56) (name "fpga.gpio.pwm_0H") (node (ref U10) (pin 48)) (node (ref TP12) (pin 1)) (node (ref R31) (pin 1))) -(net (code 51) (name "fpga.gpio.pwm_1L") +(net (code 57) (name "fpga.gpio.pwm_1L") (node (ref U10) (pin 45)) (node (ref TP13) (pin 1)) (node (ref R32) (pin 1))) -(net (code 52) (name "fpga.gpio.pwm_1H") +(net (code 58) (name "fpga.gpio.pwm_1H") (node (ref U10) (pin 46)) (node (ref TP14) (pin 1)) (node (ref R33) (pin 1))) -(net (code 53) (name "fpga.gpio.pwm_2L") +(net (code 59) (name "fpga.gpio.pwm_2L") (node (ref U10) (pin 43)) (node (ref TP15) (pin 1)) (node (ref R34) (pin 1))) -(net (code 54) (name "fpga.gpio.pwm_2H") +(net (code 60) (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") +(net (code 61) (name "fpga.cdone") (node (ref U10) (pin 7)) (node (ref D8) (pin 2))) -(net (code 56) (name "fpga.ic.creset_b") +(net (code 62) (name "fpga.ic.vcc") + (node (ref U10) (pin 30)) + (node (ref U10) (pin 5)) + (node (ref U11) (pin 5)) + (node (ref C37) (pin 1)) + (node (ref R15) (pin 1)) + (node (ref C43) (pin 1))) +(net (code 63) (name "fpga.ic.vcc_pll") + (node (ref U10) (pin 29)) + (node (ref R15) (pin 2)) + (node (ref C44) (pin 1)) + (node (ref C45) (pin 1))) +(net (code 64) (name "fpga.ic.creset_b") (node (ref U10) (pin 8)) (node (ref R13) (pin 2)) (node (ref J5) (pin 10))) -(net (code 57) (name "fpga.ic.spi_config.sck") +(net (code 65) (name "fpga.ic.spi_config.sck") (node (ref U10) (pin 15)) (node (ref U12) (pin 6)) (node (ref J5) (pin 4))) -(net (code 58) (name "fpga.ic.spi_config.mosi") +(net (code 66) (name "fpga.ic.spi_config.mosi") (node (ref U10) (pin 14)) (node (ref U12) (pin 5)) (node (ref J5) (pin 6))) -(net (code 59) (name "fpga.ic.spi_config.miso") +(net (code 67) (name "fpga.ic.spi_config.miso") (node (ref U10) (pin 17)) (node (ref U12) (pin 2)) (node (ref J5) (pin 8))) -(net (code 60) (name "fpga.ic.spi_config_cs") +(net (code 68) (name "fpga.ic.spi_config_cs") (node (ref U10) (pin 16)) (node (ref J5) (pin 2)) (node (ref JP1) (pin 1))) -(net (code 61) (name "fpga.vcc_reg.pwr_out") - (node (ref U10) (pin 30)) - (node (ref U10) (pin 5)) - (node (ref U11) (pin 5)) - (node (ref C37) (pin 1)) - (node (ref R15) (pin 1)) - (node (ref C43) (pin 1))) -(net (code 62) (name "fpga.cs_jmp.output") +(net (code 69) (name "fpga.mem.cs") (node (ref U12) (pin 1)) (node (ref JP1) (pin 2)) (node (ref R14) (pin 2))) -(net (code 63) (name "fpga.pll_res.pwr_out") - (node (ref U10) (pin 29)) - (node (ref R15) (pin 2)) - (node (ref C44) (pin 1)) - (node (ref C45) (pin 1))) -(net (code 64) (name "cdone.res.a") +(net (code 70) (name "cdone.package.k") (node (ref D8) (pin 1)) (node (ref R16) (pin 1))) -(net (code 65) (name "fpga_osc.out") +(net (code 71) (name "fpga_osc.out") (node (ref U10) (pin 37)) (node (ref X1) (pin 3))) -(net (code 66) (name "fpga_sw.out") +(net (code 72) (name "fpga_sw.out") (node (ref U10) (pin 32)) (node (ref SW1) (pin 1))) -(net (code 67) (name "fpga_led.led[0].res.a") +(net (code 73) (name "fpga_led.led[0].package.k") (node (ref D9) (pin 1)) (node (ref R17) (pin 1))) -(net (code 68) (name "fpga_led.led[1].res.a") +(net (code 74) (name "fpga_led.led[1].package.k") (node (ref D10) (pin 1)) (node (ref R18) (pin 1))) -(net (code 69) (name "fpga_led.led[2].res.a") +(net (code 75) (name "fpga_led.led[2].package.k") (node (ref D11) (pin 1)) (node (ref R19) (pin 1))) -(net (code 70) (name "fpga_led.led[3].res.a") +(net (code 76) (name "fpga_led.led[3].package.k") (node (ref D12) (pin 1)) (node (ref R20) (pin 1))) -(net (code 71) (name "usb_fpga_bitbang.dp") +(net (code 77) (name "usb_fpga_bitbang.dp") (node (ref U10) (pin 26)) (node (ref R22) (pin 1))) -(net (code 72) (name "usb_fpga_bitbang.dm") +(net (code 78) (name "usb_fpga_bitbang.dm") (node (ref U10) (pin 25)) (node (ref R23) (pin 1))) -(net (code 73) (name "usb_fpga_bitbang.dp_pull") +(net (code 79) (name "usb_fpga_bitbang.dp_pull") (node (ref U10) (pin 27)) (node (ref R21) (pin 1))) -(net (code 74) (name "mcu.gpio.led_0") +(net (code 80) (name "mcu.gpio.led_0") (node (ref U14) (pin 34)) (node (ref D13) (pin 2))) -(net (code 75) (name "mcu.gpio.led_1") +(net (code 81) (name "mcu.gpio.led_1") (node (ref U14) (pin 35)) (node (ref D14) (pin 2))) -(net (code 76) (name "mcu.gpio.led_2") +(net (code 82) (name "mcu.gpio.led_2") (node (ref U14) (pin 36)) (node (ref D15) (pin 2))) -(net (code 77) (name "mcu.gpio.led_3") +(net (code 83) (name "mcu.gpio.led_3") (node (ref U14) (pin 37)) (node (ref D16) (pin 2))) -(net (code 78) (name "mcu.xtal_node.xi") +(net (code 84) (name "mcu.xtal_node.xi") (node (ref U14) (pin 20)) (node (ref X2) (pin 1)) (node (ref C59) (pin 1))) -(net (code 79) (name "mcu.xtal_node.xo") +(net (code 85) (name "mcu.xtal_node.xo") (node (ref U14) (pin 21)) (node (ref X2) (pin 3)) (node (ref C60) (pin 1))) -(net (code 80) (name "mcu.swd_node.swdio") +(net (code 86) (name "mcu.swd_node.swdio") (node (ref J6) (pin 2)) (node (ref U14) (pin 25))) -(net (code 81) (name "mcu.swd_node.swclk") +(net (code 87) (name "mcu.swd_node.swclk") (node (ref J6) (pin 4)) (node (ref U14) (pin 24))) -(net (code 82) (name "mcu.reset_node") +(net (code 88) (name "mcu.reset_node") (node (ref J6) (pin 10)) (node (ref U14) (pin 26))) -(net (code 83) (name "mcu.usb_chain_0.d_P") +(net (code 89) (name "mcu.usb_chain_0.d_P") (node (ref U14) (pin 47)) (node (ref R24) (pin 1))) -(net (code 84) (name "mcu.usb_chain_0.d_N") +(net (code 90) (name "mcu.usb_chain_0.d_N") (node (ref U14) (pin 46)) (node (ref R25) (pin 1))) -(net (code 85) (name "mcu.swd.tdi") +(net (code 91) (name "mcu.swd.tdi") (node (ref J6) (pin 8)) (node (ref U14) (pin 3))) -(net (code 86) (name "mcu.swd.swo") +(net (code 92) (name "mcu.swd.swo") (node (ref J6) (pin 6)) (node (ref U14) (pin 2))) -(net (code 87) (name "mcu.ic.vreg_vout") +(net (code 93) (name "mcu.ic.dvdd") (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") +(net (code 94) (name "mcu.ic.qspi.sck") (node (ref U14) (pin 52)) (node (ref U15) (pin 6))) -(net (code 89) (name "mcu.ic.qspi.mosi") +(net (code 95) (name "mcu.ic.qspi.mosi") (node (ref U14) (pin 53)) (node (ref U15) (pin 5))) -(net (code 90) (name "mcu.ic.qspi.miso") +(net (code 96) (name "mcu.ic.qspi.miso") (node (ref U14) (pin 55)) (node (ref U15) (pin 2))) -(net (code 91) (name "mcu.ic.qspi_cs") +(net (code 97) (name "mcu.ic.qspi_cs") (node (ref U14) (pin 56)) (node (ref U15) (pin 1))) -(net (code 92) (name "mcu.ic.qspi_sd2") +(net (code 98) (name "mcu.ic.qspi_sd2") (node (ref U14) (pin 54)) (node (ref U15) (pin 3))) -(net (code 93) (name "mcu.ic.qspi_sd3") +(net (code 99) (name "mcu.ic.qspi_sd3") (node (ref U14) (pin 51)) (node (ref U15) (pin 7))) -(net (code 94) (name "mcu_sw.out") +(net (code 100) (name "mcu_sw.out") (node (ref U14) (pin 29)) (node (ref SW2) (pin 1))) -(net (code 95) (name "mcu_leds.led[0].res.a") +(net (code 101) (name "mcu_leds.led[0].package.k") (node (ref D13) (pin 1)) (node (ref R26) (pin 1))) -(net (code 96) (name "mcu_leds.led[1].res.a") +(net (code 102) (name "mcu_leds.led[1].package.k") (node (ref D14) (pin 1)) (node (ref R27) (pin 1))) -(net (code 97) (name "mcu_leds.led[2].res.a") +(net (code 103) (name "mcu_leds.led[2].package.k") (node (ref D15) (pin 1)) (node (ref R28) (pin 1))) -(net (code 98) (name "mcu_leds.led[3].res.a") +(net (code 104) (name "mcu_leds.led[3].package.k") (node (ref D16) (pin 1)) (node (ref R29) (pin 1))) -(net (code 99) (name "tp_fpga[0].io") +(net (code 105) (name "tp_fpga[0].io") (node (ref U10) (pin 2)) (node (ref U14) (pin 14)) (node (ref TP7) (pin 1))) -(net (code 100) (name "tp_fpga[1].io") +(net (code 106) (name "tp_fpga[1].io") (node (ref U10) (pin 3)) (node (ref U14) (pin 13)) (node (ref TP8) (pin 1))) -(net (code 101) (name "tp_fpga[2].io") +(net (code 107) (name "tp_fpga[2].io") (node (ref U10) (pin 4)) (node (ref U14) (pin 12)) (node (ref TP9) (pin 1))) -(net (code 102) (name "tp_fpga[3].io") +(net (code 108) (name "tp_fpga[3].io") (node (ref U10) (pin 6)) (node (ref U14) (pin 11)) (node (ref TP10) (pin 1))) -(net (code 103) (name "tp_pwm.output.0L") - (node (ref U3) (pin 3)) - (node (ref R30) (pin 2)) - (node (ref C61) (pin 1))) -(net (code 104) (name "tp_pwm.output.0H") - (node (ref U3) (pin 2)) - (node (ref R31) (pin 2)) - (node (ref C62) (pin 1))) -(net (code 105) (name "tp_pwm.output.1L") - (node (ref U5) (pin 3)) - (node (ref R32) (pin 2)) - (node (ref C63) (pin 1))) -(net (code 106) (name "tp_pwm.output.1H") - (node (ref U5) (pin 2)) - (node (ref R33) (pin 2)) - (node (ref C64) (pin 1))) -(net (code 107) (name "tp_pwm.output.2L") - (node (ref U8) (pin 3)) - (node (ref R34) (pin 2)) - (node (ref C65) (pin 1))) -(net (code 108) (name "tp_pwm.output.2H") - (node (ref U8) (pin 2)) - (node (ref R35) (pin 2)) - (node (ref C66) (pin 1))) (net (code 109) (name "conv_in_sense.output") (node (ref U14) (pin 38)) (node (ref R36) (pin 2)) diff --git a/examples/Fcml/Fcml.svgpcb.js b/examples/Fcml/Fcml.svgpcb.js index 014601236..cbec203fa 100644 --- a/examples/Fcml/Fcml.svgpcb.js +++ b/examples/Fcml/Fcml.svgpcb.js @@ -889,36 +889,42 @@ board.setNetlist([ {name: "usb_mcu.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "usb_fpga.conn.cc.cc1", pads: [["J2", "A5"], ["R3", "2"]]}, {name: "usb_fpga.conn.cc.cc2", pads: [["J2", "B5"], ["R4", "2"]]}, - {name: "reg_vgate.fb.output", pads: [["U2", "3"], ["R5", "2"], ["R6", "1"]]}, - {name: "reg_vgate.power_path.switch", pads: [["U2", "1"], ["L1", "2"], ["D2", "2"]]}, - {name: "conv.pwr_in", pads: [["J3", "2"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["Q1", "5"], ["Q1", "6"], ["Q1", "7"], ["Q1", "8"], ["R36", "1"]]}, + {name: "conv_in.pwr", pads: [["J3", "2"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["Q1", "5"], ["Q1", "6"], ["Q1", "7"], ["Q1", "8"], ["R36", "1"]]}, + {name: "reg_vgate.ic.sw", pads: [["U2", "1"], ["L1", "2"], ["D2", "2"]]}, + {name: "reg_vgate.ic.fb", pads: [["U2", "3"], ["R5", "2"], ["R6", "1"]]}, {name: "conv.pwr_out", pads: [["L2", "2"], ["C10", "1"], ["C11", "1"], ["C12", "1"], ["J4", "2"], ["TP5", "1"], ["R38", "1"]]}, + {name: "conv.pwms.0L", pads: [["U3", "3"], ["R30", "2"], ["C61", "1"]]}, + {name: "conv.pwms.0H", pads: [["U3", "2"], ["R31", "2"], ["C62", "1"]]}, + {name: "conv.pwms.1L", pads: [["U5", "3"], ["R32", "2"], ["C63", "1"]]}, + {name: "conv.pwms.1H", pads: [["U5", "2"], ["R33", "2"], ["C64", "1"]]}, + {name: "conv.pwms.2L", pads: [["U8", "3"], ["R34", "2"], ["C65", "1"]]}, + {name: "conv.pwms.2H", pads: [["U8", "2"], ["R35", "2"], ["C66", "1"]]}, {name: "conv.sw[0].low_out", pads: [["Q2", "5"], ["Q2", "6"], ["Q2", "7"], ["Q2", "8"], ["U4", "2"], ["C16", "2"], ["C17", "2"], ["U5", "5"], ["C19", "2"], ["U6", "4"], ["C20", "2"], ["C22", "2"], ["C23", "2"], ["Q4", "1"], ["Q4", "2"], ["Q4", "3"], ["C25", "2"]]}, - {name: "conv.sw[0].high_gate_res.a", pads: [["U3", "7"], ["R7", "1"]]}, + {name: "conv.sw[0].high_out", 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[0].high_boot_in", pads: [["D3", "2"], ["U6", "8"], ["C21", "1"], ["C24", "1"], ["D5", "1"]]}, + {name: "conv.sw[0].driver.low_out", pads: [["U3", "5"], ["R8", "1"]]}, + {name: "conv.sw[0].driver.high_pwr", pads: [["U3", "8"], ["C14", "1"], ["C15", "1"], ["D3", "1"]]}, + {name: "conv.sw[0].driver.high_out", pads: [["U3", "7"], ["R7", "1"]]}, {name: "conv.sw[0].high_gate_res.b", pads: [["R7", "2"], ["Q1", "4"]]}, - {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].iso.pwr_b", pads: [["U4", "5"], ["C17", "1"], ["U5", "8"], ["C19", "1"]]}, + {name: "conv.sw[1].low_boot_out", pads: [["U4", "1"], ["U4", "3"], ["C16", "1"], ["U6", "1"], ["C20", "1"], ["D4", "1"], ["C25", "1"], ["D6", "2"]]}, + {name: "conv.sw[1].high_out", 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[1].high_boot_in", pads: [["D5", "2"], ["U9", "8"], ["C31", "1"], ["C34", "1"], ["D7", "1"]]}, + {name: "conv.sw[1].ldo.pwr_out", pads: [["U4", "5"], ["C17", "1"], ["U5", "8"], ["C19", "1"]]}, {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].driver.low_out", pads: [["U6", "5"], ["R10", "1"]]}, + {name: "conv.sw[1].driver.high_out", 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].low_boot_in", pads: [["U4", "1"], ["U4", "3"], ["C16", "1"], ["U6", "1"], ["C20", "1"], ["D4", "1"], ["C25", "1"], ["D6", "2"]]}, {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].ldo.pwr_out", pads: [["U7", "5"], ["C27", "1"], ["U8", "8"], ["C29", "1"]]}, {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].driver.low_out", pads: [["U9", "5"], ["R12", "1"]]}, + {name: "conv.sw[2].driver.high_out", 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.gpio.led_0", pads: [["U10", "21"], ["D9", "2"]]}, @@ -932,21 +938,21 @@ board.setNetlist([ {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.vcc", pads: [["U10", "30"], ["U10", "5"], ["U11", "5"], ["C37", "1"], ["R15", "1"], ["C43", "1"]]}, + {name: "fpga.ic.vcc_pll", pads: [["U10", "29"], ["R15", "2"], ["C44", "1"], ["C45", "1"]]}, {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"]]}, {name: "fpga.ic.spi_config.miso", pads: [["U10", "17"], ["U12", "2"], ["J5", "8"]]}, {name: "fpga.ic.spi_config_cs", pads: [["U10", "16"], ["J5", "2"], ["JP1", "1"]]}, - {name: "fpga.vcc_reg.pwr_out", pads: [["U10", "30"], ["U10", "5"], ["U11", "5"], ["C37", "1"], ["R15", "1"], ["C43", "1"]]}, - {name: "fpga.cs_jmp.output", pads: [["U12", "1"], ["JP1", "2"], ["R14", "2"]]}, - {name: "fpga.pll_res.pwr_out", pads: [["U10", "29"], ["R15", "2"], ["C44", "1"], ["C45", "1"]]}, - {name: "cdone.res.a", pads: [["D8", "1"], ["R16", "1"]]}, + {name: "fpga.mem.cs", pads: [["U12", "1"], ["JP1", "2"], ["R14", "2"]]}, + {name: "cdone.package.k", pads: [["D8", "1"], ["R16", "1"]]}, {name: "fpga_osc.out", pads: [["U10", "37"], ["X1", "3"]]}, {name: "fpga_sw.out", pads: [["U10", "32"], ["SW1", "1"]]}, - {name: "fpga_led.led[0].res.a", pads: [["D9", "1"], ["R17", "1"]]}, - {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: "fpga_led.led[0].package.k", pads: [["D9", "1"], ["R17", "1"]]}, + {name: "fpga_led.led[1].package.k", pads: [["D10", "1"], ["R18", "1"]]}, + {name: "fpga_led.led[2].package.k", pads: [["D11", "1"], ["R19", "1"]]}, + {name: "fpga_led.led[3].package.k", pads: [["D12", "1"], ["R20", "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"]]}, @@ -963,7 +969,7 @@ board.setNetlist([ {name: "mcu.usb_chain_0.d_N", pads: [["U14", "46"], ["R25", "1"]]}, {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.dvdd", 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"]]}, @@ -971,20 +977,14 @@ board.setNetlist([ {name: "mcu.ic.qspi_sd2", pads: [["U14", "54"], ["U15", "3"]]}, {name: "mcu.ic.qspi_sd3", pads: [["U14", "51"], ["U15", "7"]]}, {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"]]}, - {name: "mcu_leds.led[2].res.a", pads: [["D15", "1"], ["R28", "1"]]}, - {name: "mcu_leds.led[3].res.a", pads: [["D16", "1"], ["R29", "1"]]}, + {name: "mcu_leds.led[0].package.k", pads: [["D13", "1"], ["R26", "1"]]}, + {name: "mcu_leds.led[1].package.k", pads: [["D14", "1"], ["R27", "1"]]}, + {name: "mcu_leds.led[2].package.k", pads: [["D15", "1"], ["R28", "1"]]}, + {name: "mcu_leds.led[3].package.k", pads: [["D16", "1"], ["R29", "1"]]}, {name: "tp_fpga[0].io", pads: [["U10", "2"], ["U14", "14"], ["TP7", "1"]]}, {name: "tp_fpga[1].io", pads: [["U10", "3"], ["U14", "13"], ["TP8", "1"]]}, {name: "tp_fpga[2].io", pads: [["U10", "4"], ["U14", "12"], ["TP9", "1"]]}, {name: "tp_fpga[3].io", pads: [["U10", "6"], ["U14", "11"], ["TP10", "1"]]}, - {name: "tp_pwm.output.0L", pads: [["U3", "3"], ["R30", "2"], ["C61", "1"]]}, - {name: "tp_pwm.output.0H", pads: [["U3", "2"], ["R31", "2"], ["C62", "1"]]}, - {name: "tp_pwm.output.1L", pads: [["U5", "3"], ["R32", "2"], ["C63", "1"]]}, - {name: "tp_pwm.output.1H", pads: [["U5", "2"], ["R33", "2"], ["C64", "1"]]}, - {name: "tp_pwm.output.2L", pads: [["U8", "3"], ["R34", "2"], ["C65", "1"]]}, - {name: "tp_pwm.output.2H", pads: [["U8", "2"], ["R35", "2"], ["C66", "1"]]}, {name: "conv_in_sense.output", pads: [["U14", "38"], ["R36", "2"], ["R37", "1"]]}, {name: "conv_out_sense.output", pads: [["U14", "39"], ["R38", "2"], ["R39", "1"]]} ]) diff --git a/examples/HighSwitch/HighSwitch.net b/examples/HighSwitch/HighSwitch.net index f97c090f3..30f972be9 100644 --- a/examples/HighSwitch/HighSwitch.net +++ b/examples/HighSwitch/HighSwitch.net @@ -1195,17 +1195,17 @@ (net (code 5) (name "can_chain_0.rxd") (node (ref U2) (pin 44)) (node (ref U5) (pin 2))) -(net (code 6) (name "pwr.fb.output") +(net (code 6) (name "pwr.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 7) (name "pwr.ic.fb") (node (ref U1) (pin 4)) (node (ref R1) (pin 2)) (node (ref R2) (pin 1))) -(net (code 7) (name "pwr.vbst_cap.pos") +(net (code 8) (name "pwr.ic.vbst") (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 9) (name "mcu.gpio.rgb1_red") (node (ref U2) (pin 28)) (node (ref R7) (pin 2))) @@ -1276,7 +1276,7 @@ (node (ref U3) (pin 1)) (node (ref U3) (pin 3)) (node (ref C19) (pin 1))) -(net (code 29) (name "can.transceiver.can_pwr") +(net (code 29) (name "can.reg.pwr_out") (node (ref U3) (pin 5)) (node (ref C20) (pin 1)) (node (ref U5) (pin 8)) @@ -1285,22 +1285,22 @@ (node (ref U2) (pin 21)) (node (ref R5) (pin 2)) (node (ref R6) (pin 1))) -(net (code 31) (name "rgb1.red_res.a") +(net (code 31) (name "rgb1.package.k_red") (node (ref D1) (pin 3)) (node (ref R7) (pin 1))) -(net (code 32) (name "rgb1.green_res.a") +(net (code 32) (name "rgb1.package.k_green") (node (ref D1) (pin 4)) (node (ref R8) (pin 1))) -(net (code 33) (name "rgb1.blue_res.a") +(net (code 33) (name "rgb1.package.k_blue") (node (ref D1) (pin 1)) (node (ref R9) (pin 1))) -(net (code 34) (name "rgb2.red_res.a") +(net (code 34) (name "rgb2.package.k_red") (node (ref D2) (pin 3)) (node (ref R10) (pin 1))) -(net (code 35) (name "rgb2.green_res.a") +(net (code 35) (name "rgb2.package.k_green") (node (ref D2) (pin 4)) (node (ref R11) (pin 1))) -(net (code 36) (name "rgb2.blue_res.a") +(net (code 36) (name "rgb2.package.k_blue") (node (ref D2) (pin 1)) (node (ref R12) (pin 1))) (net (code 37) (name "light[0].control[0]") @@ -1309,16 +1309,16 @@ (net (code 38) (name "light[0].control[1]") (node (ref U2) (pin 8)) (node (ref Q3) (pin 1))) -(net (code 39) (name "light[0].drv[0].output") +(net (code 39) (name "light[0].conn.out[0]") (node (ref J4) (pin 2)) (node (ref Q2) (pin 2))) -(net (code 40) (name "light[0].drv[0].pre.drain") +(net (code 40) (name "light[0].conn.out[1]") + (node (ref J4) (pin 3)) + (node (ref Q4) (pin 2))) +(net (code 41) (name "light[0].drv[0].pre.drain") (node (ref Q1) (pin 3)) (node (ref R13) (pin 2)) (node (ref Q2) (pin 1))) -(net (code 41) (name "light[0].drv[1].output") - (node (ref J4) (pin 3)) - (node (ref Q4) (pin 2))) (net (code 42) (name "light[0].drv[1].pre.drain") (node (ref Q3) (pin 3)) (node (ref R14) (pin 2)) @@ -1329,16 +1329,16 @@ (net (code 44) (name "light[1].control[1]") (node (ref U2) (pin 6)) (node (ref Q7) (pin 1))) -(net (code 45) (name "light[1].drv[0].output") +(net (code 45) (name "light[1].conn.out[0]") (node (ref J5) (pin 2)) (node (ref Q6) (pin 2))) -(net (code 46) (name "light[1].drv[0].pre.drain") +(net (code 46) (name "light[1].conn.out[1]") + (node (ref J5) (pin 3)) + (node (ref Q8) (pin 2))) +(net (code 47) (name "light[1].drv[0].pre.drain") (node (ref Q5) (pin 3)) (node (ref R15) (pin 2)) (node (ref Q6) (pin 1))) -(net (code 47) (name "light[1].drv[1].output") - (node (ref J5) (pin 3)) - (node (ref Q8) (pin 2))) (net (code 48) (name "light[1].drv[1].pre.drain") (node (ref Q7) (pin 3)) (node (ref R16) (pin 2)) @@ -1349,16 +1349,16 @@ (net (code 50) (name "light[2].control[1]") (node (ref U2) (pin 3)) (node (ref Q11) (pin 1))) -(net (code 51) (name "light[2].drv[0].output") +(net (code 51) (name "light[2].conn.out[0]") (node (ref J6) (pin 2)) (node (ref Q10) (pin 2))) -(net (code 52) (name "light[2].drv[0].pre.drain") +(net (code 52) (name "light[2].conn.out[1]") + (node (ref J6) (pin 3)) + (node (ref Q12) (pin 2))) +(net (code 53) (name "light[2].drv[0].pre.drain") (node (ref Q9) (pin 3)) (node (ref R17) (pin 2)) (node (ref Q10) (pin 1))) -(net (code 53) (name "light[2].drv[1].output") - (node (ref J6) (pin 3)) - (node (ref Q12) (pin 2))) (net (code 54) (name "light[2].drv[1].pre.drain") (node (ref Q11) (pin 3)) (node (ref R18) (pin 2)) @@ -1369,16 +1369,16 @@ (net (code 56) (name "light[3].control[1]") (node (ref U2) (pin 1)) (node (ref Q15) (pin 1))) -(net (code 57) (name "light[3].drv[0].output") +(net (code 57) (name "light[3].conn.out[0]") (node (ref J7) (pin 2)) (node (ref Q14) (pin 2))) -(net (code 58) (name "light[3].drv[0].pre.drain") +(net (code 58) (name "light[3].conn.out[1]") + (node (ref J7) (pin 3)) + (node (ref Q16) (pin 2))) +(net (code 59) (name "light[3].drv[0].pre.drain") (node (ref Q13) (pin 3)) (node (ref R19) (pin 2)) (node (ref Q14) (pin 1))) -(net (code 59) (name "light[3].drv[1].output") - (node (ref J7) (pin 3)) - (node (ref Q16) (pin 2))) (net (code 60) (name "light[3].drv[1].pre.drain") (node (ref Q15) (pin 3)) (node (ref R20) (pin 2)) @@ -1389,16 +1389,16 @@ (net (code 62) (name "light[4].control[1]") (node (ref U2) (pin 47)) (node (ref Q19) (pin 1))) -(net (code 63) (name "light[4].drv[0].output") +(net (code 63) (name "light[4].conn.out[0]") (node (ref J8) (pin 2)) (node (ref Q18) (pin 2))) -(net (code 64) (name "light[4].drv[0].pre.drain") +(net (code 64) (name "light[4].conn.out[1]") + (node (ref J8) (pin 3)) + (node (ref Q20) (pin 2))) +(net (code 65) (name "light[4].drv[0].pre.drain") (node (ref Q17) (pin 3)) (node (ref R21) (pin 2)) (node (ref Q18) (pin 1))) -(net (code 65) (name "light[4].drv[1].output") - (node (ref J8) (pin 3)) - (node (ref Q20) (pin 2))) (net (code 66) (name "light[4].drv[1].pre.drain") (node (ref Q19) (pin 3)) (node (ref R22) (pin 2)) @@ -1409,16 +1409,16 @@ (net (code 68) (name "light[5].control[1]") (node (ref U2) (pin 45)) (node (ref Q23) (pin 1))) -(net (code 69) (name "light[5].drv[0].output") +(net (code 69) (name "light[5].conn.out[0]") (node (ref J9) (pin 2)) (node (ref Q22) (pin 2))) -(net (code 70) (name "light[5].drv[0].pre.drain") +(net (code 70) (name "light[5].conn.out[1]") + (node (ref J9) (pin 3)) + (node (ref Q24) (pin 2))) +(net (code 71) (name "light[5].drv[0].pre.drain") (node (ref Q21) (pin 3)) (node (ref R23) (pin 2)) (node (ref Q22) (pin 1))) -(net (code 71) (name "light[5].drv[1].output") - (node (ref J9) (pin 3)) - (node (ref Q24) (pin 2))) (net (code 72) (name "light[5].drv[1].pre.drain") (node (ref Q23) (pin 3)) (node (ref R24) (pin 2)) diff --git a/examples/HighSwitch/HighSwitch.svgpcb.js b/examples/HighSwitch/HighSwitch.svgpcb.js index 109e741f0..c89a9f5db 100644 --- a/examples/HighSwitch/HighSwitch.svgpcb.js +++ b/examples/HighSwitch/HighSwitch.svgpcb.js @@ -452,9 +452,9 @@ board.setNetlist([ {name: "v3v3", pads: [["R1", "1"], ["L1", "2"], ["C4", "1"], ["J2", "1"], ["U2", "10"], ["U2", "14"], ["U2", "16"], ["U2", "27"], ["U2", "30"], ["U2", "39"], ["U2", "42"], ["R3", "1"], ["C5", "1"], ["C6", "1"], ["C7", "1"], ["C8", "1"], ["C9", "1"], ["C10", "1"], ["C11", "1"], ["C12", "1"], ["C13", "1"], ["C14", "1"], ["C15", "1"], ["C16", "1"], ["U5", "1"], ["C21", "1"], ["D1", "2"], ["D2", "2"]]}, {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "pwr.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "pwr.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "pwr.ic.fb", pads: [["U1", "4"], ["R1", "2"], ["R2", "1"]]}, + {name: "pwr.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -475,49 +475,49 @@ board.setNetlist([ {name: "can.conn.pwr", pads: [["J3", "2"], ["F1", "1"]]}, {name: "can.conn.gnd", pads: [["J3", "3"], ["U3", "2"], ["C19", "2"], ["C20", "2"], ["U4", "3"], ["U5", "5"], ["C22", "2"]]}, {name: "can.can_fuse.pwr_out", pads: [["F1", "2"], ["U3", "1"], ["U3", "3"], ["C19", "1"]]}, - {name: "can.transceiver.can_pwr", pads: [["U3", "5"], ["C20", "1"], ["U5", "8"], ["C22", "1"]]}, + {name: "can.reg.pwr_out", pads: [["U3", "5"], ["C20", "1"], ["U5", "8"], ["C22", "1"]]}, {name: "vsense.output", pads: [["U2", "21"], ["R5", "2"], ["R6", "1"]]}, - {name: "rgb1.red_res.a", pads: [["D1", "3"], ["R7", "1"]]}, - {name: "rgb1.green_res.a", pads: [["D1", "4"], ["R8", "1"]]}, - {name: "rgb1.blue_res.a", pads: [["D1", "1"], ["R9", "1"]]}, - {name: "rgb2.red_res.a", pads: [["D2", "3"], ["R10", "1"]]}, - {name: "rgb2.green_res.a", pads: [["D2", "4"], ["R11", "1"]]}, - {name: "rgb2.blue_res.a", pads: [["D2", "1"], ["R12", "1"]]}, + {name: "rgb1.package.k_red", pads: [["D1", "3"], ["R7", "1"]]}, + {name: "rgb1.package.k_green", pads: [["D1", "4"], ["R8", "1"]]}, + {name: "rgb1.package.k_blue", pads: [["D1", "1"], ["R9", "1"]]}, + {name: "rgb2.package.k_red", pads: [["D2", "3"], ["R10", "1"]]}, + {name: "rgb2.package.k_green", pads: [["D2", "4"], ["R11", "1"]]}, + {name: "rgb2.package.k_blue", pads: [["D2", "1"], ["R12", "1"]]}, {name: "light[0].control[0]", pads: [["U2", "12"], ["Q1", "1"]]}, {name: "light[0].control[1]", pads: [["U2", "8"], ["Q3", "1"]]}, - {name: "light[0].drv[0].output", pads: [["J4", "2"], ["Q2", "2"]]}, + {name: "light[0].conn.out[0]", pads: [["J4", "2"], ["Q2", "2"]]}, + {name: "light[0].conn.out[1]", pads: [["J4", "3"], ["Q4", "2"]]}, {name: "light[0].drv[0].pre.drain", pads: [["Q1", "3"], ["R13", "2"], ["Q2", "1"]]}, - {name: "light[0].drv[1].output", pads: [["J4", "3"], ["Q4", "2"]]}, {name: "light[0].drv[1].pre.drain", pads: [["Q3", "3"], ["R14", "2"], ["Q4", "1"]]}, {name: "light[1].control[0]", pads: [["U2", "7"], ["Q5", "1"]]}, {name: "light[1].control[1]", pads: [["U2", "6"], ["Q7", "1"]]}, - {name: "light[1].drv[0].output", pads: [["J5", "2"], ["Q6", "2"]]}, + {name: "light[1].conn.out[0]", pads: [["J5", "2"], ["Q6", "2"]]}, + {name: "light[1].conn.out[1]", pads: [["J5", "3"], ["Q8", "2"]]}, {name: "light[1].drv[0].pre.drain", pads: [["Q5", "3"], ["R15", "2"], ["Q6", "1"]]}, - {name: "light[1].drv[1].output", pads: [["J5", "3"], ["Q8", "2"]]}, {name: "light[1].drv[1].pre.drain", pads: [["Q7", "3"], ["R16", "2"], ["Q8", "1"]]}, {name: "light[2].control[0]", pads: [["U2", "4"], ["Q9", "1"]]}, {name: "light[2].control[1]", pads: [["U2", "3"], ["Q11", "1"]]}, - {name: "light[2].drv[0].output", pads: [["J6", "2"], ["Q10", "2"]]}, + {name: "light[2].conn.out[0]", pads: [["J6", "2"], ["Q10", "2"]]}, + {name: "light[2].conn.out[1]", pads: [["J6", "3"], ["Q12", "2"]]}, {name: "light[2].drv[0].pre.drain", pads: [["Q9", "3"], ["R17", "2"], ["Q10", "1"]]}, - {name: "light[2].drv[1].output", pads: [["J6", "3"], ["Q12", "2"]]}, {name: "light[2].drv[1].pre.drain", pads: [["Q11", "3"], ["R18", "2"], ["Q12", "1"]]}, {name: "light[3].control[0]", pads: [["U2", "2"], ["Q13", "1"]]}, {name: "light[3].control[1]", pads: [["U2", "1"], ["Q15", "1"]]}, - {name: "light[3].drv[0].output", pads: [["J7", "2"], ["Q14", "2"]]}, + {name: "light[3].conn.out[0]", pads: [["J7", "2"], ["Q14", "2"]]}, + {name: "light[3].conn.out[1]", pads: [["J7", "3"], ["Q16", "2"]]}, {name: "light[3].drv[0].pre.drain", pads: [["Q13", "3"], ["R19", "2"], ["Q14", "1"]]}, - {name: "light[3].drv[1].output", pads: [["J7", "3"], ["Q16", "2"]]}, {name: "light[3].drv[1].pre.drain", pads: [["Q15", "3"], ["R20", "2"], ["Q16", "1"]]}, {name: "light[4].control[0]", pads: [["U2", "48"], ["Q17", "1"]]}, {name: "light[4].control[1]", pads: [["U2", "47"], ["Q19", "1"]]}, - {name: "light[4].drv[0].output", pads: [["J8", "2"], ["Q18", "2"]]}, + {name: "light[4].conn.out[0]", pads: [["J8", "2"], ["Q18", "2"]]}, + {name: "light[4].conn.out[1]", pads: [["J8", "3"], ["Q20", "2"]]}, {name: "light[4].drv[0].pre.drain", pads: [["Q17", "3"], ["R21", "2"], ["Q18", "1"]]}, - {name: "light[4].drv[1].output", pads: [["J8", "3"], ["Q20", "2"]]}, {name: "light[4].drv[1].pre.drain", pads: [["Q19", "3"], ["R22", "2"], ["Q20", "1"]]}, {name: "light[5].control[0]", pads: [["U2", "46"], ["Q21", "1"]]}, {name: "light[5].control[1]", pads: [["U2", "45"], ["Q23", "1"]]}, - {name: "light[5].drv[0].output", pads: [["J9", "2"], ["Q22", "2"]]}, + {name: "light[5].conn.out[0]", pads: [["J9", "2"], ["Q22", "2"]]}, + {name: "light[5].conn.out[1]", pads: [["J9", "3"], ["Q24", "2"]]}, {name: "light[5].drv[0].pre.drain", pads: [["Q21", "3"], ["R23", "2"], ["Q22", "1"]]}, - {name: "light[5].drv[1].output", pads: [["J9", "3"], ["Q24", "2"]]}, {name: "light[5].drv[1].pre.drain", pads: [["Q23", "3"], ["R24", "2"], ["Q24", "1"]]} ]) diff --git a/examples/IotCurtainCrawler/IotCurtainCrawler.net b/examples/IotCurtainCrawler/IotCurtainCrawler.net index dad291d54..e54e1c2ee 100644 --- a/examples/IotCurtainCrawler/IotCurtainCrawler.net +++ b/examples/IotCurtainCrawler/IotCurtainCrawler.net @@ -690,18 +690,18 @@ (net (code 7) (name "Rfuse.pwr_out") (node (ref RF1) (pin 2)) (node (ref RFB1) (pin 1))) -(net (code 8) (name "Rreg_3v3.fb.output") +(net (code 8) (name "Rreg_3v3.ic.sw") + (node (ref RU1) (pin 2)) + (node (ref RC2) (pin 2)) + (node (ref RL1) (pin 1))) +(net (code 9) (name "Rreg_3v3.ic.fb") (node (ref RU1) (pin 4)) (node (ref RR1) (pin 2)) (node (ref RR2) (pin 1))) -(net (code 9) (name "Rreg_3v3.boot_cap.pos") +(net (code 10) (name "Rreg_3v3.ic.boot") (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 11) (name "Rreg_3v3.en_res.b") +(net (code 11) (name "Rreg_3v3.ic.en") (node (ref RU1) (pin 5)) (node (ref RR3) (pin 2))) (net (code 12) (name "Rmcu.program_uart_node.a_tx") @@ -719,7 +719,7 @@ (node (ref RU2) (pin 8)) (node (ref RJ3) (pin 2)) (node (ref RR5) (pin 2))) -(net (code 16) (name "Rledr.res.a") +(net (code 16) (name "Rledr.package.k") (node (ref RD2) (pin 1)) (node (ref RR5) (pin 1))) (net (code 17) (name "Rvin_sense.output") @@ -732,25 +732,25 @@ (net (code 19) (name "Rencb.out") (node (ref RU2) (pin 10)) (node (ref RU4) (pin 2))) -(net (code 20) (name "Rals.dvi_res.b") +(net (code 20) (name "Rals.ic.dvi") (node (ref RU5) (pin 5)) (node (ref RR10) (pin 2)) (node (ref RC12) (pin 1))) (net (code 21) (name "Rsw.out") (node (ref RU2) (pin 3)) (node (ref RSW1) (pin 1))) -(net (code 22) (name "Rdrv.in1") - (node (ref RU2) (pin 14)) - (node (ref RU6) (pin 3))) -(net (code 23) (name "Rdrv.in2") - (node (ref RU2) (pin 15)) - (node (ref RU6) (pin 2))) -(net (code 24) (name "Rdrv.out1") +(net (code 22) (name "Rmotor.motor1") (node (ref RJ5) (pin 1)) (node (ref RU6) (pin 6))) -(net (code 25) (name "Rdrv.out2") +(net (code 23) (name "Rmotor.motor2") (node (ref RJ5) (pin 2)) (node (ref RU6) (pin 8))) +(net (code 24) (name "Rdrv.in1") + (node (ref RU2) (pin 14)) + (node (ref RU6) (pin 3))) +(net (code 25) (name "Rdrv.in2") + (node (ref RU2) (pin 15)) + (node (ref RU6) (pin 2))) (net (code 26) (name "Rdrv.ic.isen") (node (ref RU6) (pin 7)) (node (ref RR11) (pin 2)))) diff --git a/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js b/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js index e7b241e9c..76521d23d 100644 --- a/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js +++ b/examples/IotCurtainCrawler/IotCurtainCrawler.svgpcb.js @@ -259,24 +259,24 @@ board.setNetlist([ {name: "Ri2c_chain_0.scl", pads: [["RU2", "6"], ["RR8", "2"], ["RTP4", "1"], ["RU5", "6"], ["RJ4", "4"]]}, {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.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: "Rreg_3v3.ic.sw", pads: [["RU1", "2"], ["RC2", "2"], ["RL1", "1"]]}, + {name: "Rreg_3v3.ic.fb", pads: [["RU1", "4"], ["RR1", "2"], ["RR2", "1"]]}, + {name: "Rreg_3v3.ic.boot", pads: [["RU1", "6"], ["RC2", "1"]]}, + {name: "Rreg_3v3.ic.en", 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"]]}, {name: "Rmcu.program_en_node", pads: [["RU2", "2"], ["RJ3", "6"], ["RR4", "2"], ["RC8", "1"]]}, {name: "Rmcu.program_boot_node", pads: [["RU2", "8"], ["RJ3", "2"], ["RR5", "2"]]}, - {name: "Rledr.res.a", pads: [["RD2", "1"], ["RR5", "1"]]}, + {name: "Rledr.package.k", pads: [["RD2", "1"], ["RR5", "1"]]}, {name: "Rvin_sense.output", pads: [["RU2", "17"], ["RR6", "2"], ["RR7", "1"]]}, {name: "Renca.out", pads: [["RU2", "13"], ["RU3", "2"]]}, {name: "Rencb.out", pads: [["RU2", "10"], ["RU4", "2"]]}, - {name: "Rals.dvi_res.b", pads: [["RU5", "5"], ["RR10", "2"], ["RC12", "1"]]}, + {name: "Rals.ic.dvi", pads: [["RU5", "5"], ["RR10", "2"], ["RC12", "1"]]}, {name: "Rsw.out", pads: [["RU2", "3"], ["RSW1", "1"]]}, + {name: "Rmotor.motor1", pads: [["RJ5", "1"], ["RU6", "6"]]}, + {name: "Rmotor.motor2", pads: [["RJ5", "2"], ["RU6", "8"]]}, {name: "Rdrv.in1", pads: [["RU2", "14"], ["RU6", "3"]]}, {name: "Rdrv.in2", pads: [["RU2", "15"], ["RU6", "2"]]}, - {name: "Rdrv.out1", pads: [["RJ5", "1"], ["RU6", "6"]]}, - {name: "Rdrv.out2", pads: [["RJ5", "2"], ["RU6", "8"]]}, {name: "Rdrv.ic.isen", pads: [["RU6", "7"], ["RR11", "2"]]} ]) diff --git a/examples/IotDisplay/IotDisplay.net b/examples/IotDisplay/IotDisplay.net index ba9e668a2..8ed700d94 100644 --- a/examples/IotDisplay/IotDisplay.net +++ b/examples/IotDisplay/IotDisplay.net @@ -992,18 +992,18 @@ (node (ref J2) (pin 2)) (node (ref TP1) (pin 1)) (node (ref Q1) (pin 3))) -(net (code 10) (name "reg_3v3.fb.output") +(net (code 10) (name "reg_3v3.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 11) (name "reg_3v3.ic.fb") (node (ref U1) (pin 4)) (node (ref R1) (pin 2)) (node (ref R2) (pin 1))) -(net (code 11) (name "reg_3v3.boot_cap.pos") +(net (code 12) (name "reg_3v3.ic.boot") (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 13) (name "reg_3v3.en_res.b") +(net (code 13) (name "reg_3v3.ic.en") (node (ref U1) (pin 5)) (node (ref R3) (pin 2))) (net (code 14) (name "vbat_sense_gate.control") @@ -1034,19 +1034,19 @@ (net (code 21) (name "ledr.signal") (node (ref U2) (pin 39)) (node (ref D1) (pin 2))) -(net (code 22) (name "ledr.res.a") +(net (code 22) (name "ledr.package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) (net (code 23) (name "ledg.signal") (node (ref U2) (pin 38)) (node (ref D2) (pin 2))) -(net (code 24) (name "ledg.res.a") +(net (code 24) (name "ledg.package.k") (node (ref D2) (pin 1)) (node (ref R7) (pin 1))) (net (code 25) (name "ledb.signal") (node (ref U2) (pin 4)) (node (ref D3) (pin 2))) -(net (code 26) (name "ledb.res.a") +(net (code 26) (name "ledb.package.k") (node (ref D3) (pin 1)) (node (ref R8) (pin 1))) (net (code 27) (name "sw.out") @@ -1082,95 +1082,95 @@ (node (ref U6) (pin 7)) (node (ref U6) (pin 8)) (node (ref C19) (pin 1))) -(net (code 35) (name "epd.device.vdd1v8") +(net (code 35) (name "epd.reset") + (node (ref U2) (pin 8)) + (node (ref J4) (pin 15)) + (node (ref TP7) (pin 1))) +(net (code 36) (name "epd.spi.sck") + (node (ref U2) (pin 33)) + (node (ref J4) (pin 12)) + (node (ref TP4) (pin 1))) +(net (code 37) (name "epd.spi.mosi") + (node (ref U2) (pin 35)) + (node (ref J4) (pin 11)) + (node (ref TP5) (pin 1))) +(net (code 38) (name "epd.spi.miso") + (node (ref TP6) (pin 1))) +(net (code 39) (name "epd.cs") + (node (ref U2) (pin 32)) + (node (ref J4) (pin 13)) + (node (ref TP9) (pin 1))) +(net (code 40) (name "epd.dc") + (node (ref U2) (pin 31)) + (node (ref J4) (pin 14)) + (node (ref TP8) (pin 1))) +(net (code 41) (name "epd.busy") + (node (ref U2) (pin 9)) + (node (ref J4) (pin 16)) + (node (ref TP10) (pin 1))) +(net (code 42) (name "epd.device.vdd1v8") (node (ref J4) (pin 7)) (node (ref C9) (pin 1))) -(net (code 36) (name "epd.device.gdr") +(net (code 43) (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") +(net (code 44) (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") +(net (code 45) (name "epd.device.vgl") (node (ref J4) (pin 21)) (node (ref C10) (pin 1))) -(net (code 39) (name "epd.device.vgh") +(net (code 46) (name "epd.device.vgh") (node (ref J4) (pin 20)) (node (ref C11) (pin 1))) -(net (code 40) (name "epd.device.vsh") +(net (code 47) (name "epd.device.vsh") (node (ref J4) (pin 5)) (node (ref C12) (pin 1))) -(net (code 41) (name "epd.device.vsl") +(net (code 48) (name "epd.device.vsl") (node (ref J4) (pin 3)) (node (ref C13) (pin 1))) -(net (code 42) (name "epd.device.vcom") - (node (ref J4) (pin 1)) - (node (ref C14) (pin 1))) -(net (code 43) (name "epd.boost.pos_out") +(net (code 49) (name "epd.device.prevgh") (node (ref J4) (pin 4)) (node (ref D4) (pin 1)) (node (ref C17) (pin 1))) -(net (code 44) (name "epd.boost.neg_out") +(net (code 50) (name "epd.device.prevgl") (node (ref J4) (pin 2)) (node (ref D5) (pin 2)) (node (ref C18) (pin 1))) -(net (code 45) (name "epd.boost.inductor.b") +(net (code 51) (name "epd.device.vcom") + (node (ref J4) (pin 1)) + (node (ref C14) (pin 1))) +(net (code 52) (name "epd.boost.fet.drain") (node (ref Q6) (pin 3)) (node (ref L2) (pin 2)) (node (ref D4) (pin 2)) (node (ref C16) (pin 1))) -(net (code 46) (name "epd.boost.boot_cap.neg") +(net (code 53) (name "epd.boost.boot_neg_diode.cathode") (node (ref D5) (pin 1)) (node (ref D6) (pin 2)) (node (ref C16) (pin 2))) -(net (code 47) (name "tp_epd.io.sck") - (node (ref U2) (pin 33)) - (node (ref J4) (pin 12)) - (node (ref TP4) (pin 1))) -(net (code 48) (name "tp_epd.io.mosi") - (node (ref U2) (pin 35)) - (node (ref J4) (pin 11)) - (node (ref TP5) (pin 1))) -(net (code 49) (name "tp_epd.io.miso") - (node (ref TP6) (pin 1))) -(net (code 50) (name "tp_erst.io") - (node (ref U2) (pin 8)) - (node (ref J4) (pin 15)) - (node (ref TP7) (pin 1))) -(net (code 51) (name "tp_dc.io") - (node (ref U2) (pin 31)) - (node (ref J4) (pin 14)) - (node (ref TP8) (pin 1))) -(net (code 52) (name "tp_epd_cs.io") - (node (ref U2) (pin 32)) - (node (ref J4) (pin 13)) - (node (ref TP9) (pin 1))) -(net (code 53) (name "tp_busy.io") - (node (ref U2) (pin 9)) - (node (ref J4) (pin 16)) - (node (ref TP10) (pin 1))) -(net (code 54) (name "flash.cs") - (node (ref U2) (pin 20)) - (node (ref U6) (pin 1))) -(net (code 55) (name "tp_sd.io.sck") +(net (code 54) (name "sd.spi.sck") (node (ref U2) (pin 17)) (node (ref J5) (pin 5)) (node (ref U6) (pin 6)) (node (ref TP11) (pin 1))) -(net (code 56) (name "tp_sd.io.mosi") +(net (code 55) (name "sd.spi.mosi") (node (ref U2) (pin 18)) (node (ref J5) (pin 3)) (node (ref U6) (pin 5)) (node (ref TP12) (pin 1))) -(net (code 57) (name "tp_sd.io.miso") +(net (code 56) (name "sd.spi.miso") (node (ref U2) (pin 15)) (node (ref J5) (pin 7)) (node (ref U6) (pin 2)) (node (ref TP13) (pin 1))) -(net (code 58) (name "tp_sd_cs.io") +(net (code 57) (name "sd.cs") (node (ref U2) (pin 19)) (node (ref J5) (pin 2)) - (node (ref TP14) (pin 1)))) + (node (ref TP14) (pin 1))) +(net (code 58) (name "flash.cs") + (node (ref U2) (pin 20)) + (node (ref U6) (pin 1)))) ) \ No newline at end of file diff --git a/examples/IotDisplay/IotDisplay.svgpcb.js b/examples/IotDisplay/IotDisplay.svgpcb.js index 57adab43b..0ee490b1e 100644 --- a/examples/IotDisplay/IotDisplay.svgpcb.js +++ b/examples/IotDisplay/IotDisplay.svgpcb.js @@ -386,10 +386,10 @@ board.setNetlist([ {name: "usb.conn.cc.cc1", pads: [["J1", "A5"]]}, {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.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: "reg_3v3.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg_3v3.ic.fb", pads: [["U1", "4"], ["R1", "2"], ["R2", "1"]]}, + {name: "reg_3v3.ic.boot", pads: [["U1", "6"], ["C2", "1"]]}, + {name: "reg_3v3.ic.en", 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"]]}, {name: "vbat_sense_gate.pre.drain", pads: [["Q2", "3"], ["R4", "2"], ["Q3", "1"]]}, @@ -398,11 +398,11 @@ board.setNetlist([ {name: "mcu.program_en_node", pads: [["U2", "3"], ["J3", "6"], ["R5", "2"], ["C7", "1"]]}, {name: "mcu.program_boot_node", pads: [["U2", "27"], ["J3", "2"], ["SW1", "1"]]}, {name: "ledr.signal", pads: [["U2", "39"], ["D1", "2"]]}, - {name: "ledr.res.a", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "ledr.package.k", pads: [["D1", "1"], ["R6", "1"]]}, {name: "ledg.signal", pads: [["U2", "38"], ["D2", "2"]]}, - {name: "ledg.res.a", pads: [["D2", "1"], ["R7", "1"]]}, + {name: "ledg.package.k", pads: [["D2", "1"], ["R7", "1"]]}, {name: "ledb.signal", pads: [["U2", "4"], ["D3", "2"]]}, - {name: "ledb.res.a", pads: [["D3", "1"], ["R8", "1"]]}, + {name: "ledb.package.k", pads: [["D3", "1"], ["R8", "1"]]}, {name: "sw.out", pads: [["U2", "5"], ["SW2", "1"]]}, {name: "vbat_sense.output", pads: [["U2", "7"], ["R9", "2"], ["R10", "1"]]}, {name: "touch_duck.pad", pads: [["U2", "21"], ["U4", "1"]]}, @@ -411,6 +411,13 @@ board.setNetlist([ {name: "epd_gate.output", pads: [["Q4", "3"], ["J4", "10"], ["J4", "9"], ["C8", "1"], ["L2", "1"], ["C15", "1"]]}, {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.reset", pads: [["U2", "8"], ["J4", "15"], ["TP7", "1"]]}, + {name: "epd.spi.sck", pads: [["U2", "33"], ["J4", "12"], ["TP4", "1"]]}, + {name: "epd.spi.mosi", pads: [["U2", "35"], ["J4", "11"], ["TP5", "1"]]}, + {name: "epd.spi.miso", pads: [["TP6", "1"]]}, + {name: "epd.cs", pads: [["U2", "32"], ["J4", "13"], ["TP9", "1"]]}, + {name: "epd.dc", pads: [["U2", "31"], ["J4", "14"], ["TP8", "1"]]}, + {name: "epd.busy", pads: [["U2", "9"], ["J4", "16"], ["TP10", "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"]]}, @@ -418,23 +425,16 @@ board.setNetlist([ {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.prevgh", pads: [["J4", "4"], ["D4", "1"], ["C17", "1"]]}, + {name: "epd.device.prevgl", pads: [["J4", "2"], ["D5", "2"], ["C18", "1"]]}, {name: "epd.device.vcom", pads: [["J4", "1"], ["C14", "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"]]}, - {name: "epd.boost.boot_cap.neg", pads: [["D5", "1"], ["D6", "2"], ["C16", "2"]]}, - {name: "tp_epd.io.sck", pads: [["U2", "33"], ["J4", "12"], ["TP4", "1"]]}, - {name: "tp_epd.io.mosi", pads: [["U2", "35"], ["J4", "11"], ["TP5", "1"]]}, - {name: "tp_epd.io.miso", pads: [["TP6", "1"]]}, - {name: "tp_erst.io", pads: [["U2", "8"], ["J4", "15"], ["TP7", "1"]]}, - {name: "tp_dc.io", pads: [["U2", "31"], ["J4", "14"], ["TP8", "1"]]}, - {name: "tp_epd_cs.io", pads: [["U2", "32"], ["J4", "13"], ["TP9", "1"]]}, - {name: "tp_busy.io", pads: [["U2", "9"], ["J4", "16"], ["TP10", "1"]]}, - {name: "flash.cs", pads: [["U2", "20"], ["U6", "1"]]}, - {name: "tp_sd.io.sck", pads: [["U2", "17"], ["J5", "5"], ["U6", "6"], ["TP11", "1"]]}, - {name: "tp_sd.io.mosi", pads: [["U2", "18"], ["J5", "3"], ["U6", "5"], ["TP12", "1"]]}, - {name: "tp_sd.io.miso", pads: [["U2", "15"], ["J5", "7"], ["U6", "2"], ["TP13", "1"]]}, - {name: "tp_sd_cs.io", pads: [["U2", "19"], ["J5", "2"], ["TP14", "1"]]} + {name: "epd.boost.fet.drain", pads: [["Q6", "3"], ["L2", "2"], ["D4", "2"], ["C16", "1"]]}, + {name: "epd.boost.boot_neg_diode.cathode", pads: [["D5", "1"], ["D6", "2"], ["C16", "2"]]}, + {name: "sd.spi.sck", pads: [["U2", "17"], ["J5", "5"], ["U6", "6"], ["TP11", "1"]]}, + {name: "sd.spi.mosi", pads: [["U2", "18"], ["J5", "3"], ["U6", "5"], ["TP12", "1"]]}, + {name: "sd.spi.miso", pads: [["U2", "15"], ["J5", "7"], ["U6", "2"], ["TP13", "1"]]}, + {name: "sd.cs", pads: [["U2", "19"], ["J5", "2"], ["TP14", "1"]]}, + {name: "flash.cs", pads: [["U2", "20"], ["U6", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/IotFan/IotFan.net b/examples/IotFan/IotFan.net index 0fb84197d..9fd055f73 100644 --- a/examples/IotFan/IotFan.net +++ b/examples/IotFan/IotFan.net @@ -1274,18 +1274,18 @@ (node (ref FJ2) (pin 1)) (node (ref FR4) (pin 1)) (node (ref FD3) (pin 2))) -(net (code 5) (name "Freg_5v.fb.output") +(net (code 5) (name "Freg_5v.ic.sw") + (node (ref FU1) (pin 2)) + (node (ref FC2) (pin 2)) + (node (ref FL1) (pin 1))) +(net (code 6) (name "Freg_5v.ic.fb") (node (ref FU1) (pin 4)) (node (ref FR1) (pin 2)) (node (ref FR2) (pin 1))) -(net (code 6) (name "Freg_5v.boot_cap.pos") +(net (code 7) (name "Freg_5v.ic.boot") (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 8) (name "Freg_5v.en_res.b") +(net (code 8) (name "Freg_5v.ic.en") (node (ref FU1) (pin 5)) (node (ref FR3) (pin 2))) (net (code 9) (name "Fmcu.xtal_node.xi") @@ -1320,11 +1320,11 @@ (node (ref FU3) (pin 3)) (node (ref FC16) (pin 1)) (node (ref FL3) (pin 2))) -(net (code 17) (name "Fmcu.pi.output") +(net (code 17) (name "Fmcu.ant.a") (node (ref FANT1) (pin 1)) (node (ref FC14) (pin 1)) (node (ref FL2) (pin 2))) -(net (code 18) (name "Fledr.res.a") +(net (code 18) (name "Fledr.package.k") (node (ref FD3) (pin 1)) (node (ref FR5) (pin 1))) (net (code 19) (name "Fenc.a") @@ -1396,48 +1396,48 @@ (net (code 41) (name "Frgb_ring.led[16].dout") (node (ref FD20) (pin 3)) (node (ref FD21) (pin 1))) -(net (code 42) (name "Ffan[0].pwr") +(net (code 42) (name "Ffan[0].control") + (node (ref FJ3) (pin 4)) + (node (ref FQ3) (pin 3))) +(net (code 43) (name "Ffan[0].pwr") (node (ref FJ3) (pin 2)) (node (ref FQ2) (pin 5)) (node (ref FQ2) (pin 6)) (node (ref FQ2) (pin 7)) (node (ref FQ2) (pin 8))) -(net (code 43) (name "Ffan[0].sense") +(net (code 44) (name "Ffan[0].sense") (node (ref FU3) (pin 9)) (node (ref FJ3) (pin 3))) -(net (code 44) (name "Ffan_drv[0].control") +(net (code 45) (name "Ffan_drv[0].control") (node (ref FU3) (pin 5)) (node (ref FQ1) (pin 1))) -(net (code 45) (name "Ffan_drv[0].pre.drain") +(net (code 46) (name "Ffan_drv[0].pre.drain") (node (ref FQ1) (pin 3)) (node (ref FR8) (pin 2)) (node (ref FQ2) (pin 4))) -(net (code 46) (name "Ffan_ctl[0].control") +(net (code 47) (name "Ffan_ctl[0].control") (node (ref FU3) (pin 8)) (node (ref FQ3) (pin 1))) -(net (code 47) (name "Ffan_ctl[0].output") - (node (ref FJ3) (pin 4)) - (node (ref FQ3) (pin 3))) -(net (code 48) (name "Ffan[1].pwr") +(net (code 48) (name "Ffan[1].control") + (node (ref FJ4) (pin 4)) + (node (ref FQ6) (pin 3))) +(net (code 49) (name "Ffan[1].pwr") (node (ref FJ4) (pin 2)) (node (ref FQ5) (pin 5)) (node (ref FQ5) (pin 6)) (node (ref FQ5) (pin 7)) (node (ref FQ5) (pin 8))) -(net (code 49) (name "Ffan[1].sense") +(net (code 50) (name "Ffan[1].sense") (node (ref FU3) (pin 12)) (node (ref FJ4) (pin 3))) -(net (code 50) (name "Ffan_drv[1].control") +(net (code 51) (name "Ffan_drv[1].control") (node (ref FU3) (pin 10)) (node (ref FQ4) (pin 1))) -(net (code 51) (name "Ffan_drv[1].pre.drain") +(net (code 52) (name "Ffan_drv[1].pre.drain") (node (ref FQ4) (pin 3)) (node (ref FR9) (pin 2)) (node (ref FQ5) (pin 4))) -(net (code 52) (name "Ffan_ctl[1].control") +(net (code 53) (name "Ffan_ctl[1].control") (node (ref FU3) (pin 13)) - (node (ref FQ6) (pin 1))) -(net (code 53) (name "Ffan_ctl[1].output") - (node (ref FJ4) (pin 4)) - (node (ref FQ6) (pin 3)))) + (node (ref FQ6) (pin 1)))) ) \ No newline at end of file diff --git a/examples/IotFan/IotFan.svgpcb.js b/examples/IotFan/IotFan.svgpcb.js index 7174179b0..078b6b9f1 100644 --- a/examples/IotFan/IotFan.svgpcb.js +++ b/examples/IotFan/IotFan.svgpcb.js @@ -471,10 +471,10 @@ board.setNetlist([ {name: "Fgnd", pads: [["FJ1", "2"], ["FTP2", "1"], ["FU1", "1"], ["FR2", "2"], ["FC1", "2"], ["FC3", "2"], ["FC4", "2"], ["FD1", "2"], ["FU2", "1"], ["FC5", "2"], ["FC6", "2"], ["FD2", "2"], ["FU3", "33"], ["FC7", "2"], ["FC8", "2"], ["FC9", "2"], ["FC10", "2"], ["FC11", "2"], ["FC12", "2"], ["FC13", "2"], ["FC14", "2"], ["FC15", "2"], ["FC16", "2"], ["FX1", "2"], ["FX1", "4"], ["FC17", "2"], ["FC18", "2"], ["FJ2", "5"], ["FC19", "2"], ["FSW1", "C"], ["FSW1", "S2"], ["FR7", "2"], ["FD4", "4"], ["FC20", "2"], ["FD5", "4"], ["FC21", "2"], ["FD6", "4"], ["FC22", "2"], ["FD7", "4"], ["FC23", "2"], ["FD8", "4"], ["FC24", "2"], ["FD9", "4"], ["FC25", "2"], ["FD10", "4"], ["FC26", "2"], ["FD11", "4"], ["FC27", "2"], ["FD12", "4"], ["FC28", "2"], ["FD13", "4"], ["FC29", "2"], ["FD14", "4"], ["FC30", "2"], ["FD15", "4"], ["FC31", "2"], ["FD16", "4"], ["FC32", "2"], ["FD17", "4"], ["FC33", "2"], ["FD18", "4"], ["FC34", "2"], ["FD19", "4"], ["FC35", "2"], ["FD20", "4"], ["FC36", "2"], ["FD21", "4"], ["FC37", "2"], ["FJ3", "1"], ["FQ1", "2"], ["FQ3", "2"], ["FJ4", "1"], ["FQ4", "2"], ["FQ6", "2"]]}, {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.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: "Freg_5v.ic.sw", pads: [["FU1", "2"], ["FC2", "2"], ["FL1", "1"]]}, + {name: "Freg_5v.ic.fb", pads: [["FU1", "4"], ["FR1", "2"], ["FR2", "1"]]}, + {name: "Freg_5v.ic.boot", pads: [["FU1", "6"], ["FC2", "1"]]}, + {name: "Freg_5v.ic.en", 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"]]}, {name: "Fmcu.program_uart_node.a_tx", pads: [["FU3", "28"], ["FJ2", "3"]]}, @@ -483,8 +483,8 @@ board.setNetlist([ {name: "Fmcu.program_boot_node", pads: [["FU3", "15"], ["FJ2", "2"], ["FR5", "2"]]}, {name: "Fmcu.ic.lna_in", pads: [["FU3", "1"], ["FC13", "1"], ["FL2", "1"]]}, {name: "Fmcu.ic.vdd3p3", pads: [["FU3", "2"], ["FU3", "3"], ["FC16", "1"], ["FL3", "2"]]}, - {name: "Fmcu.pi.output", pads: [["FANT1", "1"], ["FC14", "1"], ["FL2", "2"]]}, - {name: "Fledr.res.a", pads: [["FD3", "1"], ["FR5", "1"]]}, + {name: "Fmcu.ant.a", pads: [["FANT1", "1"], ["FC14", "1"], ["FL2", "2"]]}, + {name: "Fledr.package.k", pads: [["FD3", "1"], ["FR5", "1"]]}, {name: "Fenc.a", pads: [["FU3", "26"], ["FSW1", "A"]]}, {name: "Fenc.b", pads: [["FU3", "16"], ["FSW1", "B"]]}, {name: "Fenc.sw", pads: [["FU3", "25"], ["FSW1", "S1"]]}, @@ -508,18 +508,18 @@ board.setNetlist([ {name: "Frgb_ring.led[14].dout", pads: [["FD18", "3"], ["FD19", "1"]]}, {name: "Frgb_ring.led[15].dout", pads: [["FD19", "3"], ["FD20", "1"]]}, {name: "Frgb_ring.led[16].dout", pads: [["FD20", "3"], ["FD21", "1"]]}, + {name: "Ffan[0].control", pads: [["FJ3", "4"], ["FQ3", "3"]]}, {name: "Ffan[0].pwr", pads: [["FJ3", "2"], ["FQ2", "5"], ["FQ2", "6"], ["FQ2", "7"], ["FQ2", "8"]]}, {name: "Ffan[0].sense", pads: [["FU3", "9"], ["FJ3", "3"]]}, {name: "Ffan_drv[0].control", pads: [["FU3", "5"], ["FQ1", "1"]]}, {name: "Ffan_drv[0].pre.drain", pads: [["FQ1", "3"], ["FR8", "2"], ["FQ2", "4"]]}, {name: "Ffan_ctl[0].control", pads: [["FU3", "8"], ["FQ3", "1"]]}, - {name: "Ffan_ctl[0].output", pads: [["FJ3", "4"], ["FQ3", "3"]]}, + {name: "Ffan[1].control", pads: [["FJ4", "4"], ["FQ6", "3"]]}, {name: "Ffan[1].pwr", pads: [["FJ4", "2"], ["FQ5", "5"], ["FQ5", "6"], ["FQ5", "7"], ["FQ5", "8"]]}, {name: "Ffan[1].sense", pads: [["FU3", "12"], ["FJ4", "3"]]}, {name: "Ffan_drv[1].control", pads: [["FU3", "10"], ["FQ4", "1"]]}, {name: "Ffan_drv[1].pre.drain", pads: [["FQ4", "3"], ["FR9", "2"], ["FQ5", "4"]]}, - {name: "Ffan_ctl[1].control", pads: [["FU3", "13"], ["FQ6", "1"]]}, - {name: "Ffan_ctl[1].output", pads: [["FJ4", "4"], ["FQ6", "3"]]} + {name: "Ffan_ctl[1].control", pads: [["FU3", "13"], ["FQ6", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/IotIron/IotIron.net b/examples/IotIron/IotIron.net index 2a973fba6..9f31f44ba 100644 --- a/examples/IotIron/IotIron.net +++ b/examples/IotIron/IotIron.net @@ -1293,18 +1293,18 @@ (node (ref IJ1) (pin B5)) (node (ref IU4) (pin 1)) (node (ref IU4) (pin 14))) -(net (code 10) (name "Ireg_3v3.fb.output") +(net (code 10) (name "Ireg_3v3.ic.sw") + (node (ref IU1) (pin 2)) + (node (ref IC2) (pin 2)) + (node (ref IL1) (pin 1))) +(net (code 11) (name "Ireg_3v3.ic.fb") (node (ref IU1) (pin 4)) (node (ref IR1) (pin 2)) (node (ref IR2) (pin 1))) -(net (code 11) (name "Ireg_3v3.boot_cap.pos") +(net (code 12) (name "Ireg_3v3.ic.boot") (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 13) (name "Ireg_3v3.en_res.b") +(net (code 13) (name "Ireg_3v3.ic.en") (node (ref IU1) (pin 5)) (node (ref IR3) (pin 2))) (net (code 14) (name "Imcu.program_uart_node.a_tx") @@ -1360,24 +1360,24 @@ (net (code 27) (name "Ioled.device.vcc") (node (ref IJ3) (pin 28)) (node (ref IC19) (pin 1))) -(net (code 28) (name "Ioled.device.vcomh") +(net (code 28) (name "Ioled.device.iref") + (node (ref IJ3) (pin 26)) + (node (ref IR9) (pin 1))) +(net (code 29) (name "Ioled.device.vcomh") (node (ref IJ3) (pin 27)) (node (ref IC16) (pin 1))) -(net (code 29) (name "Ioled.c1_cap.pos") +(net (code 30) (name "Ioled.device.c1p") (node (ref IJ3) (pin 4)) (node (ref IC14) (pin 1))) -(net (code 30) (name "Ioled.c1_cap.neg") +(net (code 31) (name "Ioled.device.c1n") (node (ref IJ3) (pin 5)) (node (ref IC14) (pin 2))) -(net (code 31) (name "Ioled.c2_cap.pos") +(net (code 32) (name "Ioled.device.c2p") (node (ref IJ3) (pin 2)) (node (ref IC15) (pin 1))) -(net (code 32) (name "Ioled.c2_cap.neg") +(net (code 33) (name "Ioled.device.c2n") (node (ref IJ3) (pin 3)) (node (ref IC15) (pin 2))) -(net (code 33) (name "Ioled.iref_res.a") - (node (ref IJ3) (pin 26)) - (node (ref IR9) (pin 1))) (net (code 34) (name "Ispk_drv.i2s.sck") (node (ref IU3) (pin 32)) (node (ref IU8) (pin 16))) @@ -1393,25 +1393,35 @@ (net (code 38) (name "Ispk_drv.out.b") (node (ref IU8) (pin 10)) (node (ref IJ4) (pin 2))) -(net (code 39) (name "Iledr.res.a") +(net (code 39) (name "Iledr.package.k") (node (ref ID2) (pin 1)) (node (ref IR10) (pin 1))) -(net (code 40) (name "Iconv.sw.driver.ic.hb") - (node (ref IU9) (pin 2)) - (node (ref IC26) (pin 1))) -(net (code 41) (name "Iconv.sw.low_gate_res.a") +(net (code 40) (name "Iconv.pwm_low") + (node (ref IU9) (pin 6)) + (node (ref IR14) (pin 2)) + (node (ref IC27) (pin 1)) + (node (ref ITP6) (pin 1))) +(net (code 41) (name "Iconv.pwm_high") + (node (ref IU9) (pin 5)) + (node (ref IR16) (pin 2)) + (node (ref IC28) (pin 1)) + (node (ref ITP7) (pin 1))) +(net (code 42) (name "Iconv.sw.driver.low_out") (node (ref IU9) (pin 8)) (node (ref IR11) (pin 1))) -(net (code 42) (name "Iconv.sw.low_gate_res.b") - (node (ref IQ1) (pin 4)) - (node (ref IR11) (pin 2))) -(net (code 43) (name "Iconv.sw.high_gate_res.a") +(net (code 43) (name "Iconv.sw.driver.high_out") (node (ref IU9) (pin 3)) (node (ref IR12) (pin 1))) -(net (code 44) (name "Iconv.sw.high_gate_res.b") +(net (code 44) (name "Iconv.sw.driver.ic.hb") + (node (ref IU9) (pin 2)) + (node (ref IC26) (pin 1))) +(net (code 45) (name "Iconv.sw.low_fet.gate") + (node (ref IQ1) (pin 4)) + (node (ref IR11) (pin 2))) +(net (code 46) (name "Iconv.sw.high_fet.gate") (node (ref IQ2) (pin 4)) (node (ref IR12) (pin 2))) -(net (code 45) (name "Iconv.sw_out_force") +(net (code 47) (name "Iconv.sw_out_force") (node (ref IL2) (pin 1)) (node (ref IU9) (pin 4)) (node (ref IC26) (pin 2)) @@ -1422,54 +1432,44 @@ (node (ref IQ2) (pin 1)) (node (ref IQ2) (pin 2)) (node (ref IQ2) (pin 3))) -(net (code 46) (name "Ilow_pull.io") +(net (code 48) (name "Ilow_pull.io") (node (ref IU3) (pin 4)) (node (ref IR13) (pin 2)) (node (ref IR14) (pin 1))) -(net (code 47) (name "Ilow_rc.output") - (node (ref IU9) (pin 6)) - (node (ref IR14) (pin 2)) - (node (ref IC27) (pin 1)) - (node (ref ITP6) (pin 1))) -(net (code 48) (name "Ihigh_pull.io") +(net (code 49) (name "Ihigh_pull.io") (node (ref IU3) (pin 5)) (node (ref IR15) (pin 2)) (node (ref IR16) (pin 1))) -(net (code 49) (name "Ihigh_rc.output") - (node (ref IU9) (pin 5)) - (node (ref IR16) (pin 2)) - (node (ref IC28) (pin 1)) - (node (ref ITP7) (pin 1))) (net (code 50) (name "Itouch_sink.pad") (node (ref IU3) (pin 15)) (node (ref IU10) (pin 1))) -(net (code 51) (name "Iiron.isense") +(net (code 51) (name "Iiron.thermocouple") + (node (ref IJ5) (pin 3)) + (node (ref IR25) (pin 1)) + (node (ref ITP10) (pin 1))) +(net (code 52) (name "Iiron.isense") (node (ref IJ5) (pin 1)) (node (ref IR17) (pin 2)) (node (ref IR24) (pin 1)) (node (ref IU11) (pin 3))) -(net (code 52) (name "Ivsense.output") +(net (code 53) (name "Ivsense.output") (node (ref IR18) (pin 2)) (node (ref IR19) (pin 1)) (node (ref ITP8) (pin 1)) (node (ref IR20) (pin 1))) -(net (code 53) (name "Ivfilt.output") +(net (code 54) (name "Ivfilt.output") (node (ref IU3) (pin 6)) (node (ref IR20) (pin 2)) (node (ref IC29) (pin 1))) -(net (code 54) (name "Iifilt.output") +(net (code 55) (name "Iifilt.output") (node (ref IR21) (pin 1)) (node (ref IR23) (pin 1)) (node (ref IU11) (pin 1))) -(net (code 55) (name "Itp_i.output") +(net (code 56) (name "Itp_i.output") (node (ref IU3) (pin 7)) (node (ref IR23) (pin 2)) (node (ref IC30) (pin 1)) (node (ref ITP9) (pin 1))) -(net (code 56) (name "Itamp.input_positive") - (node (ref IJ5) (pin 3)) - (node (ref IR25) (pin 1)) - (node (ref ITP10) (pin 1))) (net (code 57) (name "Itamp.output") (node (ref IU3) (pin 12)) (node (ref IR26) (pin 1)) diff --git a/examples/IotIron/IotIron.svgpcb.js b/examples/IotIron/IotIron.svgpcb.js index 206fb2a90..41744f6a1 100644 --- a/examples/IotIron/IotIron.svgpcb.js +++ b/examples/IotIron/IotIron.svgpcb.js @@ -481,10 +481,10 @@ board.setNetlist([ {name: "Iusb_chain_0.d_N", pads: [["IJ1", "A7"], ["IJ1", "B7"], ["IU3", "13"], ["IU5", "1"]]}, {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.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: "Ireg_3v3.ic.sw", pads: [["IU1", "2"], ["IC2", "2"], ["IL1", "1"]]}, + {name: "Ireg_3v3.ic.fb", pads: [["IU1", "4"], ["IR1", "2"], ["IR2", "1"]]}, + {name: "Ireg_3v3.ic.boot", pads: [["IU1", "6"], ["IC2", "1"]]}, + {name: "Ireg_3v3.ic.en", 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"]]}, {name: "Imcu.program_en_node", pads: [["IU3", "3"], ["IJ2", "6"], ["IR4", "2"], ["IC10", "1"]]}, @@ -499,35 +499,35 @@ board.setNetlist([ {name: "Ienc.sw", pads: [["IU3", "8"], ["ISW1", "S1"]]}, {name: "Ioled.reset", pads: [["IU3", "11"], ["IJ3", "14"]]}, {name: "Ioled.device.vcc", pads: [["IJ3", "28"], ["IC19", "1"]]}, + {name: "Ioled.device.iref", pads: [["IJ3", "26"], ["IR9", "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"]]}, - {name: "Ioled.c2_cap.neg", pads: [["IJ3", "3"], ["IC15", "2"]]}, - {name: "Ioled.iref_res.a", pads: [["IJ3", "26"], ["IR9", "1"]]}, + {name: "Ioled.device.c1p", pads: [["IJ3", "4"], ["IC14", "1"]]}, + {name: "Ioled.device.c1n", pads: [["IJ3", "5"], ["IC14", "2"]]}, + {name: "Ioled.device.c2p", pads: [["IJ3", "2"], ["IC15", "1"]]}, + {name: "Ioled.device.c2n", pads: [["IJ3", "3"], ["IC15", "2"]]}, {name: "Ispk_drv.i2s.sck", pads: [["IU3", "32"], ["IU8", "16"]]}, {name: "Ispk_drv.i2s.ws", pads: [["IU3", "31"], ["IU8", "14"]]}, {name: "Ispk_drv.i2s.sd", pads: [["IU3", "33"], ["IU8", "1"]]}, {name: "Ispk_drv.out.a", pads: [["IU8", "9"], ["IJ4", "1"]]}, {name: "Ispk_drv.out.b", pads: [["IU8", "10"], ["IJ4", "2"]]}, - {name: "Iledr.res.a", pads: [["ID2", "1"], ["IR10", "1"]]}, + {name: "Iledr.package.k", pads: [["ID2", "1"], ["IR10", "1"]]}, + {name: "Iconv.pwm_low", pads: [["IU9", "6"], ["IR14", "2"], ["IC27", "1"], ["ITP6", "1"]]}, + {name: "Iconv.pwm_high", pads: [["IU9", "5"], ["IR16", "2"], ["IC28", "1"], ["ITP7", "1"]]}, + {name: "Iconv.sw.driver.low_out", pads: [["IU9", "8"], ["IR11", "1"]]}, + {name: "Iconv.sw.driver.high_out", pads: [["IU9", "3"], ["IR12", "1"]]}, {name: "Iconv.sw.driver.ic.hb", pads: [["IU9", "2"], ["IC26", "1"]]}, - {name: "Iconv.sw.low_gate_res.a", pads: [["IU9", "8"], ["IR11", "1"]]}, - {name: "Iconv.sw.low_gate_res.b", pads: [["IQ1", "4"], ["IR11", "2"]]}, - {name: "Iconv.sw.high_gate_res.a", pads: [["IU9", "3"], ["IR12", "1"]]}, - {name: "Iconv.sw.high_gate_res.b", pads: [["IQ2", "4"], ["IR12", "2"]]}, + {name: "Iconv.sw.low_fet.gate", pads: [["IQ1", "4"], ["IR11", "2"]]}, + {name: "Iconv.sw.high_fet.gate", pads: [["IQ2", "4"], ["IR12", "2"]]}, {name: "Iconv.sw_out_force", pads: [["IL2", "1"], ["IU9", "4"], ["IC26", "2"], ["IQ1", "5"], ["IQ1", "6"], ["IQ1", "7"], ["IQ1", "8"], ["IQ2", "1"], ["IQ2", "2"], ["IQ2", "3"]]}, {name: "Ilow_pull.io", pads: [["IU3", "4"], ["IR13", "2"], ["IR14", "1"]]}, - {name: "Ilow_rc.output", pads: [["IU9", "6"], ["IR14", "2"], ["IC27", "1"], ["ITP6", "1"]]}, {name: "Ihigh_pull.io", pads: [["IU3", "5"], ["IR15", "2"], ["IR16", "1"]]}, - {name: "Ihigh_rc.output", pads: [["IU9", "5"], ["IR16", "2"], ["IC28", "1"], ["ITP7", "1"]]}, {name: "Itouch_sink.pad", pads: [["IU3", "15"], ["IU10", "1"]]}, + {name: "Iiron.thermocouple", pads: [["IJ5", "3"], ["IR25", "1"], ["ITP10", "1"]]}, {name: "Iiron.isense", pads: [["IJ5", "1"], ["IR17", "2"], ["IR24", "1"], ["IU11", "3"]]}, {name: "Ivsense.output", pads: [["IR18", "2"], ["IR19", "1"], ["ITP8", "1"], ["IR20", "1"]]}, {name: "Ivfilt.output", pads: [["IU3", "6"], ["IR20", "2"], ["IC29", "1"]]}, {name: "Iifilt.output", pads: [["IR21", "1"], ["IR23", "1"], ["IU11", "1"]]}, {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.inp.1", pads: [["IR25", "2"], ["IR27", "2"], ["IU11", "5"]]}, {name: "Ipacked_opamp.inn.0", pads: [["IR21", "2"], ["IR22", "1"], ["IU11", "2"]]}, diff --git a/examples/IotKnob/IotKnob.net b/examples/IotKnob/IotKnob.net index e04fa0bcb..2d046441e 100644 --- a/examples/IotKnob/IotKnob.net +++ b/examples/IotKnob/IotKnob.net @@ -1936,13 +1936,13 @@ (net (code 14) (name "Kledr.signal") (node (ref KU2) (pin 25)) (node (ref KD2) (pin 2))) -(net (code 15) (name "Kledr.res.a") +(net (code 15) (name "Kledr.package.k") (node (ref KD2) (pin 1)) (node (ref KR6) (pin 1))) (net (code 16) (name "Kledy.signal") (node (ref KU2) (pin 24)) (node (ref KD3) (pin 2))) -(net (code 17) (name "Kledy.res.a") +(net (code 17) (name "Kledy.package.k") (node (ref KD3) (pin 1)) (node (ref KR7) (pin 1))) (net (code 18) (name "Kenc.a") @@ -1972,7 +1972,7 @@ (net (code 26) (name "Ksw[5].out") (node (ref KU2) (pin 39)) (node (ref KSW7) (pin 1))) -(net (code 27) (name "Kals.dvi_res.b") +(net (code 27) (name "Kals.ic.dvi") (node (ref KU4) (pin 5)) (node (ref KR8) (pin 2)) (node (ref KC7) (pin 1))) @@ -1984,133 +1984,133 @@ (net (code 30) (name "Koled.device.vcc") (node (ref KJ3) (pin 28)) (node (ref KC16) (pin 1))) -(net (code 31) (name "Koled.device.vcomh") +(net (code 31) (name "Koled.device.iref") + (node (ref KJ3) (pin 26)) + (node (ref KR9) (pin 1))) +(net (code 32) (name "Koled.device.vcomh") (node (ref KJ3) (pin 27)) (node (ref KC13) (pin 1))) -(net (code 32) (name "Koled.c1_cap.pos") +(net (code 33) (name "Koled.device.c1p") (node (ref KJ3) (pin 4)) (node (ref KC11) (pin 1))) -(net (code 33) (name "Koled.c1_cap.neg") +(net (code 34) (name "Koled.device.c1n") (node (ref KJ3) (pin 5)) (node (ref KC11) (pin 2))) -(net (code 34) (name "Koled.c2_cap.pos") +(net (code 35) (name "Koled.device.c2p") (node (ref KJ3) (pin 2)) (node (ref KC12) (pin 1))) -(net (code 35) (name "Koled.c2_cap.neg") +(net (code 36) (name "Koled.device.c2n") (node (ref KJ3) (pin 3)) (node (ref KC12) (pin 2))) -(net (code 36) (name "Koled.iref_res.a") - (node (ref KJ3) (pin 26)) - (node (ref KR9) (pin 1))) -(net (code 37) (name "Krgb_shift.output") +(net (code 37) (name "Krgb_shift.input") + (node (ref KU2) (pin 10)) + (node (ref KU8) (pin 2)) + (node (ref KR10) (pin 2))) +(net (code 38) (name "Krgb_shift.output") (node (ref KU8) (pin 4)) (node (ref KTP6) (pin 1)) (node (ref KD4) (pin 1))) -(net (code 38) (name "Krgb_knob.dout") +(net (code 39) (name "Krgb_knob.dout") (node (ref KD7) (pin 3)) (node (ref KD8) (pin 1))) -(net (code 39) (name "Krgb_knob.led[0].dout") +(net (code 40) (name "Krgb_knob.led[0].dout") (node (ref KD4) (pin 3)) (node (ref KD5) (pin 1))) -(net (code 40) (name "Krgb_knob.led[1].dout") +(net (code 41) (name "Krgb_knob.led[1].dout") (node (ref KD5) (pin 3)) (node (ref KD6) (pin 1))) -(net (code 41) (name "Krgb_knob.led[2].dout") +(net (code 42) (name "Krgb_knob.led[2].dout") (node (ref KD6) (pin 3)) (node (ref KD7) (pin 1))) -(net (code 42) (name "Krgb_ring.dout") +(net (code 43) (name "Krgb_ring.dout") (node (ref KD31) (pin 3)) (node (ref KD32) (pin 1))) -(net (code 43) (name "Krgb_ring.led[0].dout") +(net (code 44) (name "Krgb_ring.led[0].dout") (node (ref KD8) (pin 3)) (node (ref KD9) (pin 1))) -(net (code 44) (name "Krgb_ring.led[1].dout") +(net (code 45) (name "Krgb_ring.led[1].dout") (node (ref KD9) (pin 3)) (node (ref KD10) (pin 1))) -(net (code 45) (name "Krgb_ring.led[2].dout") +(net (code 46) (name "Krgb_ring.led[2].dout") (node (ref KD10) (pin 3)) (node (ref KD11) (pin 1))) -(net (code 46) (name "Krgb_ring.led[3].dout") +(net (code 47) (name "Krgb_ring.led[3].dout") (node (ref KD11) (pin 3)) (node (ref KD12) (pin 1))) -(net (code 47) (name "Krgb_ring.led[4].dout") +(net (code 48) (name "Krgb_ring.led[4].dout") (node (ref KD12) (pin 3)) (node (ref KD13) (pin 1))) -(net (code 48) (name "Krgb_ring.led[5].dout") +(net (code 49) (name "Krgb_ring.led[5].dout") (node (ref KD13) (pin 3)) (node (ref KD14) (pin 1))) -(net (code 49) (name "Krgb_ring.led[6].dout") +(net (code 50) (name "Krgb_ring.led[6].dout") (node (ref KD14) (pin 3)) (node (ref KD15) (pin 1))) -(net (code 50) (name "Krgb_ring.led[7].dout") +(net (code 51) (name "Krgb_ring.led[7].dout") (node (ref KD15) (pin 3)) (node (ref KD16) (pin 1))) -(net (code 51) (name "Krgb_ring.led[8].dout") +(net (code 52) (name "Krgb_ring.led[8].dout") (node (ref KD16) (pin 3)) (node (ref KD17) (pin 1))) -(net (code 52) (name "Krgb_ring.led[9].dout") +(net (code 53) (name "Krgb_ring.led[9].dout") (node (ref KD17) (pin 3)) (node (ref KD18) (pin 1))) -(net (code 53) (name "Krgb_ring.led[10].dout") +(net (code 54) (name "Krgb_ring.led[10].dout") (node (ref KD18) (pin 3)) (node (ref KD19) (pin 1))) -(net (code 54) (name "Krgb_ring.led[11].dout") +(net (code 55) (name "Krgb_ring.led[11].dout") (node (ref KD19) (pin 3)) (node (ref KD20) (pin 1))) -(net (code 55) (name "Krgb_ring.led[12].dout") +(net (code 56) (name "Krgb_ring.led[12].dout") (node (ref KD20) (pin 3)) (node (ref KD21) (pin 1))) -(net (code 56) (name "Krgb_ring.led[13].dout") +(net (code 57) (name "Krgb_ring.led[13].dout") (node (ref KD21) (pin 3)) (node (ref KD22) (pin 1))) -(net (code 57) (name "Krgb_ring.led[14].dout") +(net (code 58) (name "Krgb_ring.led[14].dout") (node (ref KD22) (pin 3)) (node (ref KD23) (pin 1))) -(net (code 58) (name "Krgb_ring.led[15].dout") +(net (code 59) (name "Krgb_ring.led[15].dout") (node (ref KD23) (pin 3)) (node (ref KD24) (pin 1))) -(net (code 59) (name "Krgb_ring.led[16].dout") +(net (code 60) (name "Krgb_ring.led[16].dout") (node (ref KD24) (pin 3)) (node (ref KD25) (pin 1))) -(net (code 60) (name "Krgb_ring.led[17].dout") +(net (code 61) (name "Krgb_ring.led[17].dout") (node (ref KD25) (pin 3)) (node (ref KD26) (pin 1))) -(net (code 61) (name "Krgb_ring.led[18].dout") +(net (code 62) (name "Krgb_ring.led[18].dout") (node (ref KD26) (pin 3)) (node (ref KD27) (pin 1))) -(net (code 62) (name "Krgb_ring.led[19].dout") +(net (code 63) (name "Krgb_ring.led[19].dout") (node (ref KD27) (pin 3)) (node (ref KD28) (pin 1))) -(net (code 63) (name "Krgb_ring.led[20].dout") +(net (code 64) (name "Krgb_ring.led[20].dout") (node (ref KD28) (pin 3)) (node (ref KD29) (pin 1))) -(net (code 64) (name "Krgb_ring.led[21].dout") +(net (code 65) (name "Krgb_ring.led[21].dout") (node (ref KD29) (pin 3)) (node (ref KD30) (pin 1))) -(net (code 65) (name "Krgb_ring.led[22].dout") +(net (code 66) (name "Krgb_ring.led[22].dout") (node (ref KD30) (pin 3)) (node (ref KD31) (pin 1))) -(net (code 66) (name "Krgb_sw.dout") +(net (code 67) (name "Krgb_sw.dout") (node (ref KD37) (pin 3))) -(net (code 67) (name "Krgb_sw.led[0].dout") +(net (code 68) (name "Krgb_sw.led[0].dout") (node (ref KD32) (pin 3)) (node (ref KD33) (pin 1))) -(net (code 68) (name "Krgb_sw.led[1].dout") +(net (code 69) (name "Krgb_sw.led[1].dout") (node (ref KD33) (pin 3)) (node (ref KD34) (pin 1))) -(net (code 69) (name "Krgb_sw.led[2].dout") +(net (code 70) (name "Krgb_sw.led[2].dout") (node (ref KD34) (pin 3)) (node (ref KD35) (pin 1))) -(net (code 70) (name "Krgb_sw.led[3].dout") +(net (code 71) (name "Krgb_sw.led[3].dout") (node (ref KD35) (pin 3)) (node (ref KD36) (pin 1))) -(net (code 71) (name "Krgb_sw.led[4].dout") +(net (code 72) (name "Krgb_sw.led[4].dout") (node (ref KD36) (pin 3)) (node (ref KD37) (pin 1))) -(net (code 72) (name "Kio8_pur.io") - (node (ref KU2) (pin 10)) - (node (ref KU8) (pin 2)) - (node (ref KR10) (pin 2))) (net (code 73) (name "Kspk_dac.input") (node (ref KU2) (pin 9)) (node (ref KR11) (pin 1))) @@ -2125,10 +2125,10 @@ (net (code 76) (name "Kspk_drv.spk.b") (node (ref KU9) (pin 8)) (node (ref KJ4) (pin 2))) -(net (code 77) (name "Kspk_drv.inp_cap.pos") +(net (code 77) (name "Kspk_drv.ic.inp") (node (ref KU9) (pin 3)) (node (ref KC55) (pin 1))) -(net (code 78) (name "Kspk_drv.inn_cap.pos") +(net (code 78) (name "Kspk_drv.ic.inn") (node (ref KU9) (pin 4)) (node (ref KC56) (pin 1))) (net (code 79) (name "Kv5v_sense.output") diff --git a/examples/IotKnob/IotKnob.svgpcb.js b/examples/IotKnob/IotKnob.svgpcb.js index 862d0b11d..9842556fc 100644 --- a/examples/IotKnob/IotKnob.svgpcb.js +++ b/examples/IotKnob/IotKnob.svgpcb.js @@ -359,9 +359,9 @@ board.setNetlist([ {name: "Kmcu.program_en_node", pads: [["KU2", "3"], ["KJ2", "6"], ["KR3", "2"], ["KC5", "1"]]}, {name: "Kmcu.program_boot_node", pads: [["KU2", "27"], ["KJ2", "2"]]}, {name: "Kledr.signal", pads: [["KU2", "25"], ["KD2", "2"]]}, - {name: "Kledr.res.a", pads: [["KD2", "1"], ["KR6", "1"]]}, + {name: "Kledr.package.k", pads: [["KD2", "1"], ["KR6", "1"]]}, {name: "Kledy.signal", pads: [["KU2", "24"], ["KD3", "2"]]}, - {name: "Kledy.res.a", pads: [["KD3", "1"], ["KR7", "1"]]}, + {name: "Kledy.package.k", pads: [["KD3", "1"], ["KR7", "1"]]}, {name: "Kenc.a", pads: [["KU2", "12"], ["KSW1", "A"]]}, {name: "Kenc.b", pads: [["KU2", "11"], ["KSW1", "B"]]}, {name: "Kenc.sw", pads: [["KU2", "31"], ["KSW1", "S1"]]}, @@ -371,16 +371,17 @@ board.setNetlist([ {name: "Ksw[3].out", pads: [["KU2", "35"], ["KSW5", "1"]]}, {name: "Ksw[4].out", pads: [["KU2", "38"], ["KSW6", "1"]]}, {name: "Ksw[5].out", pads: [["KU2", "39"], ["KSW7", "1"]]}, - {name: "Kals.dvi_res.b", pads: [["KU4", "5"], ["KR8", "2"], ["KC7", "1"]]}, + {name: "Kals.ic.dvi", 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.vcc", pads: [["KJ3", "28"], ["KC16", "1"]]}, + {name: "Koled.device.iref", pads: [["KJ3", "26"], ["KR9", "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"]]}, - {name: "Koled.c2_cap.neg", pads: [["KJ3", "3"], ["KC12", "2"]]}, - {name: "Koled.iref_res.a", pads: [["KJ3", "26"], ["KR9", "1"]]}, + {name: "Koled.device.c1p", pads: [["KJ3", "4"], ["KC11", "1"]]}, + {name: "Koled.device.c1n", pads: [["KJ3", "5"], ["KC11", "2"]]}, + {name: "Koled.device.c2p", pads: [["KJ3", "2"], ["KC12", "1"]]}, + {name: "Koled.device.c2n", pads: [["KJ3", "3"], ["KC12", "2"]]}, + {name: "Krgb_shift.input", pads: [["KU2", "10"], ["KU8", "2"], ["KR10", "2"]]}, {name: "Krgb_shift.output", pads: [["KU8", "4"], ["KTP6", "1"], ["KD4", "1"]]}, {name: "Krgb_knob.dout", pads: [["KD7", "3"], ["KD8", "1"]]}, {name: "Krgb_knob.led[0].dout", pads: [["KD4", "3"], ["KD5", "1"]]}, @@ -416,13 +417,12 @@ board.setNetlist([ {name: "Krgb_sw.led[2].dout", pads: [["KD34", "3"], ["KD35", "1"]]}, {name: "Krgb_sw.led[3].dout", pads: [["KD35", "3"], ["KD36", "1"]]}, {name: "Krgb_sw.led[4].dout", pads: [["KD36", "3"], ["KD37", "1"]]}, - {name: "Kio8_pur.io", pads: [["KU2", "10"], ["KU8", "2"], ["KR10", "2"]]}, {name: "Kspk_dac.input", pads: [["KU2", "9"], ["KR11", "1"]]}, {name: "Kspk_dac.output", pads: [["KR11", "2"], ["KC52", "1"], ["KTP7", "1"], ["KC55", "2"]]}, {name: "Kspk_drv.spk.a", pads: [["KU9", "5"], ["KJ4", "1"]]}, {name: "Kspk_drv.spk.b", pads: [["KU9", "8"], ["KJ4", "2"]]}, - {name: "Kspk_drv.inp_cap.pos", pads: [["KU9", "3"], ["KC55", "1"]]}, - {name: "Kspk_drv.inn_cap.pos", pads: [["KU9", "4"], ["KC56", "1"]]}, + {name: "Kspk_drv.ic.inp", pads: [["KU9", "3"], ["KC55", "1"]]}, + {name: "Kspk_drv.ic.inn", pads: [["KU9", "4"], ["KC56", "1"]]}, {name: "Kv5v_sense.output", pads: [["KU2", "5"], ["KR12", "2"], ["KR13", "1"]]} ]) diff --git a/examples/IotLedDriver/IotLedDriver.net b/examples/IotLedDriver/IotLedDriver.net index 57baedfad..1da1b36c3 100644 --- a/examples/IotLedDriver/IotLedDriver.net +++ b/examples/IotLedDriver/IotLedDriver.net @@ -1046,18 +1046,18 @@ (node (ref LC19) (pin 1)) (node (ref LR11) (pin 1)) (node (ref LR12) (pin 1))) -(net (code 4) (name "Lreg_3v3.fb.output") +(net (code 4) (name "Lreg_3v3.ic.sw") + (node (ref LU1) (pin 2)) + (node (ref LC2) (pin 2)) + (node (ref LL1) (pin 1))) +(net (code 5) (name "Lreg_3v3.ic.fb") (node (ref LU1) (pin 4)) (node (ref LR1) (pin 2)) (node (ref LR2) (pin 1))) -(net (code 5) (name "Lreg_3v3.boot_cap.pos") +(net (code 6) (name "Lreg_3v3.ic.boot") (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 7) (name "Lreg_3v3.en_res.b") +(net (code 7) (name "Lreg_3v3.ic.en") (node (ref LU1) (pin 5)) (node (ref LR3) (pin 2))) (net (code 8) (name "Lmcu.xtal_node.xi") @@ -1092,18 +1092,18 @@ (node (ref LU2) (pin 3)) (node (ref LC14) (pin 1)) (node (ref LL3) (pin 2))) -(net (code 16) (name "Lmcu.pi.output") +(net (code 16) (name "Lmcu.ant.a") (node (ref LANT1) (pin 1)) (node (ref LC12) (pin 1)) (node (ref LL2) (pin 2))) -(net (code 17) (name "Lledr.res.a") +(net (code 17) (name "Lledr.package.k") (node (ref LD2) (pin 1)) (node (ref LR5) (pin 1))) (net (code 18) (name "Lv12_sense.output") (node (ref LU2) (pin 4)) (node (ref LR6) (pin 2)) (node (ref LR7) (pin 1))) -(net (code 19) (name "Lqwiic_pwr_res.pwr_out") +(net (code 19) (name "Lqwiic.pwr") (node (ref LU2) (pin 16)) (node (ref LJ3) (pin 2)) (node (ref LR8) (pin 2))) @@ -1115,16 +1115,16 @@ (node (ref LU2) (pin 26)) (node (ref LJ3) (pin 3)) (node (ref LR10) (pin 2))) -(net (code 22) (name "Ltof.ic.gpio1") - (node (ref LU3) (pin 7))) -(net (code 23) (name "Ltof_pull.i2c.scl") +(net (code 22) (name "Ltof.i2c.scl") (node (ref LU2) (pin 12)) (node (ref LU3) (pin 10)) (node (ref LR11) (pin 2))) -(net (code 24) (name "Ltof_pull.i2c.sda") +(net (code 23) (name "Ltof.i2c.sda") (node (ref LU2) (pin 13)) (node (ref LU3) (pin 9)) (node (ref LR12) (pin 2))) +(net (code 24) (name "Ltof.ic.gpio1") + (node (ref LU3) (pin 7))) (net (code 25) (name "Lled_drv[0].leda") (node (ref LL4) (pin 2)) (node (ref LC23) (pin 1))) @@ -1134,13 +1134,13 @@ (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") +(net (code 28) (name "Lled_drv[0].ic.sw") (node (ref LU4) (pin 5)) (node (ref LC21) (pin 2)) (node (ref LL4) (pin 1))) +(net (code 29) (name "Lled_drv[0].ic.boot") + (node (ref LU4) (pin 6)) + (node (ref LC21) (pin 1))) (net (code 30) (name "Lled_drv[1].leda") (node (ref LL5) (pin 2)) (node (ref LC27) (pin 1))) @@ -1150,13 +1150,13 @@ (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") +(net (code 33) (name "Lled_drv[1].ic.sw") (node (ref LU5) (pin 5)) (node (ref LC25) (pin 2)) (node (ref LL5) (pin 1))) +(net (code 34) (name "Lled_drv[1].ic.boot") + (node (ref LU5) (pin 6)) + (node (ref LC25) (pin 1))) (net (code 35) (name "Lled_drv[2].leda") (node (ref LL6) (pin 2)) (node (ref LC31) (pin 1))) @@ -1166,13 +1166,13 @@ (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") +(net (code 38) (name "Lled_drv[2].ic.sw") (node (ref LU6) (pin 5)) (node (ref LC29) (pin 2)) (node (ref LL6) (pin 1))) +(net (code 39) (name "Lled_drv[2].ic.boot") + (node (ref LU6) (pin 6)) + (node (ref LC29) (pin 1))) (net (code 40) (name "Lled_drv[3].leda") (node (ref LL7) (pin 2)) (node (ref LC35) (pin 1))) @@ -1182,11 +1182,11 @@ (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") +(net (code 43) (name "Lled_drv[3].ic.sw") (node (ref LU7) (pin 5)) (node (ref LC33) (pin 2)) - (node (ref LL7) (pin 1)))) + (node (ref LL7) (pin 1))) +(net (code 44) (name "Lled_drv[3].ic.boot") + (node (ref LU7) (pin 6)) + (node (ref LC33) (pin 1)))) ) \ No newline at end of file diff --git a/examples/IotLedDriver/IotLedDriver.svgpcb.js b/examples/IotLedDriver/IotLedDriver.svgpcb.js index 55e684daf..b7d0b3e7c 100644 --- a/examples/IotLedDriver/IotLedDriver.svgpcb.js +++ b/examples/IotLedDriver/IotLedDriver.svgpcb.js @@ -395,10 +395,10 @@ board.setNetlist([ {name: "Lgnd", pads: [["LJ1", "1"], ["LTP2", "1"], ["LU1", "1"], ["LR2", "2"], ["LC1", "2"], ["LC3", "2"], ["LC4", "2"], ["LD1", "2"], ["LU2", "33"], ["LC5", "2"], ["LC6", "2"], ["LC7", "2"], ["LC8", "2"], ["LC9", "2"], ["LC10", "2"], ["LC11", "2"], ["LC12", "2"], ["LC13", "2"], ["LC14", "2"], ["LX1", "2"], ["LX1", "4"], ["LC15", "2"], ["LC16", "2"], ["LJ2", "5"], ["LC17", "2"], ["LR5", "2"], ["LR7", "2"], ["LJ3", "1"], ["LU3", "12"], ["LU3", "2"], ["LU3", "3"], ["LU3", "4"], ["LU3", "6"], ["LC18", "2"], ["LC19", "2"], ["LU4", "3"], ["LC20", "2"], ["LR13", "1"], ["LC22", "2"], ["LC23", "2"], ["LU5", "3"], ["LC24", "2"], ["LR14", "1"], ["LC26", "2"], ["LC27", "2"], ["LU6", "3"], ["LC28", "2"], ["LR15", "1"], ["LC30", "2"], ["LC31", "2"], ["LU7", "3"], ["LC32", "2"], ["LR16", "1"], ["LC34", "2"], ["LC35", "2"]]}, {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.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: "Lreg_3v3.ic.sw", pads: [["LU1", "2"], ["LC2", "2"], ["LL1", "1"]]}, + {name: "Lreg_3v3.ic.fb", pads: [["LU1", "4"], ["LR1", "2"], ["LR2", "1"]]}, + {name: "Lreg_3v3.ic.boot", pads: [["LU1", "6"], ["LC2", "1"]]}, + {name: "Lreg_3v3.ic.en", 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"]]}, {name: "Lmcu.program_uart_node.a_tx", pads: [["LU2", "28"], ["LJ2", "3"]]}, @@ -407,35 +407,35 @@ board.setNetlist([ {name: "Lmcu.program_boot_node", pads: [["LU2", "15"], ["LJ2", "2"], ["LD2", "2"]]}, {name: "Lmcu.ic.lna_in", pads: [["LU2", "1"], ["LC11", "1"], ["LL2", "1"]]}, {name: "Lmcu.ic.vdd3p3", pads: [["LU2", "2"], ["LU2", "3"], ["LC14", "1"], ["LL3", "2"]]}, - {name: "Lmcu.pi.output", pads: [["LANT1", "1"], ["LC12", "1"], ["LL2", "2"]]}, - {name: "Lledr.res.a", pads: [["LD2", "1"], ["LR5", "1"]]}, + {name: "Lmcu.ant.a", pads: [["LANT1", "1"], ["LC12", "1"], ["LL2", "2"]]}, + {name: "Lledr.package.k", pads: [["LD2", "1"], ["LR5", "1"]]}, {name: "Lv12_sense.output", pads: [["LU2", "4"], ["LR6", "2"], ["LR7", "1"]]}, - {name: "Lqwiic_pwr_res.pwr_out", pads: [["LU2", "16"], ["LJ3", "2"], ["LR8", "2"]]}, + {name: "Lqwiic.pwr", pads: [["LU2", "16"], ["LJ3", "2"], ["LR8", "2"]]}, {name: "Lqwiic_i2c.scl", pads: [["LU2", "25"], ["LJ3", "4"], ["LR9", "2"]]}, {name: "Lqwiic_i2c.sda", pads: [["LU2", "26"], ["LJ3", "3"], ["LR10", "2"]]}, + {name: "Ltof.i2c.scl", pads: [["LU2", "12"], ["LU3", "10"], ["LR11", "2"]]}, + {name: "Ltof.i2c.sda", pads: [["LU2", "13"], ["LU3", "9"], ["LR12", "2"]]}, {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].leda", pads: [["LL4", "2"], ["LC23", "1"]]}, {name: "Lled_drv[0].ledk", pads: [["LU4", "1"], ["LR13", "2"]]}, {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[0].boot_cap.neg", pads: [["LU4", "5"], ["LC21", "2"], ["LL4", "1"]]}, + {name: "Lled_drv[0].ic.sw", pads: [["LU4", "5"], ["LC21", "2"], ["LL4", "1"]]}, + {name: "Lled_drv[0].ic.boot", pads: [["LU4", "6"], ["LC21", "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].pwm", pads: [["LU2", "8"], ["LU5", "2"]]}, - {name: "Lled_drv[1].boot_cap.pos", pads: [["LU5", "6"], ["LC25", "1"]]}, - {name: "Lled_drv[1].boot_cap.neg", pads: [["LU5", "5"], ["LC25", "2"], ["LL5", "1"]]}, + {name: "Lled_drv[1].ic.sw", pads: [["LU5", "5"], ["LC25", "2"], ["LL5", "1"]]}, + {name: "Lled_drv[1].ic.boot", pads: [["LU5", "6"], ["LC25", "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].pwm", pads: [["LU2", "9"], ["LU6", "2"]]}, - {name: "Lled_drv[2].boot_cap.pos", pads: [["LU6", "6"], ["LC29", "1"]]}, - {name: "Lled_drv[2].boot_cap.neg", pads: [["LU6", "5"], ["LC29", "2"], ["LL6", "1"]]}, + {name: "Lled_drv[2].ic.sw", pads: [["LU6", "5"], ["LC29", "2"], ["LL6", "1"]]}, + {name: "Lled_drv[2].ic.boot", pads: [["LU6", "6"], ["LC29", "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].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"]]} + {name: "Lled_drv[3].ic.sw", pads: [["LU7", "5"], ["LC33", "2"], ["LL7", "1"]]}, + {name: "Lled_drv[3].ic.boot", pads: [["LU7", "6"], ["LC33", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/IotRollerBlinds/IotRollerBlinds.net b/examples/IotRollerBlinds/IotRollerBlinds.net index fd2752979..c346ab6d5 100644 --- a/examples/IotRollerBlinds/IotRollerBlinds.net +++ b/examples/IotRollerBlinds/IotRollerBlinds.net @@ -535,65 +535,65 @@ (net (code 6) (name "Bconn.encb") (node (ref BJ3) (pin 3)) (node (ref BU2) (pin 10))) -(net (code 7) (name "Bfuse.pwr_out") +(net (code 7) (name "Bconn.motor2") + (node (ref BJ3) (pin 5)) + (node (ref BU3) (pin 6))) +(net (code 8) (name "Bconn.motor1") + (node (ref BJ3) (pin 6)) + (node (ref BU3) (pin 8))) +(net (code 9) (name "Bfuse.pwr_out") (node (ref BF1) (pin 2)) (node (ref BFB1) (pin 1))) -(net (code 8) (name "Breg_3v3.fb.output") +(net (code 10) (name "Breg_3v3.ic.sw") + (node (ref BU1) (pin 2)) + (node (ref BC2) (pin 2)) + (node (ref BL1) (pin 1))) +(net (code 11) (name "Breg_3v3.ic.fb") (node (ref BU1) (pin 4)) (node (ref BR1) (pin 2)) (node (ref BR2) (pin 1))) -(net (code 9) (name "Breg_3v3.boot_cap.pos") +(net (code 12) (name "Breg_3v3.ic.boot") (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 11) (name "Breg_3v3.en_res.b") +(net (code 13) (name "Breg_3v3.ic.en") (node (ref BU1) (pin 5)) (node (ref BR3) (pin 2))) -(net (code 12) (name "Bmcu.program_uart_node.a_tx") +(net (code 14) (name "Bmcu.program_uart_node.a_tx") (node (ref BU2) (pin 12)) (node (ref BJ4) (pin 3))) -(net (code 13) (name "Bmcu.program_uart_node.b_tx") +(net (code 15) (name "Bmcu.program_uart_node.b_tx") (node (ref BU2) (pin 11)) (node (ref BJ4) (pin 4))) -(net (code 14) (name "Bmcu.program_en_node") +(net (code 16) (name "Bmcu.program_en_node") (node (ref BU2) (pin 2)) (node (ref BJ4) (pin 6)) (node (ref BR4) (pin 2)) (node (ref BC8) (pin 1))) -(net (code 15) (name "Bmcu.program_boot_node") +(net (code 17) (name "Bmcu.program_boot_node") (node (ref BU2) (pin 8)) (node (ref BJ4) (pin 2)) (node (ref BR5) (pin 2))) -(net (code 16) (name "Bledr.res.a") +(net (code 18) (name "Bledr.package.k") (node (ref BD2) (pin 1)) (node (ref BR5) (pin 1))) -(net (code 17) (name "Bvin_sense.output") +(net (code 19) (name "Bvin_sense.output") (node (ref BU2) (pin 3)) (node (ref BR6) (pin 2)) (node (ref BR7) (pin 1))) -(net (code 18) (name "Bqwiic_pull.i2c.scl") +(net (code 20) (name "Bqwiic_pull.i2c.scl") (node (ref BU2) (pin 5)) (node (ref BR8) (pin 2)) (node (ref BJ5) (pin 4))) -(net (code 19) (name "Bqwiic_pull.i2c.sda") +(net (code 21) (name "Bqwiic_pull.i2c.sda") (node (ref BU2) (pin 6)) (node (ref BR9) (pin 2)) (node (ref BJ5) (pin 3))) -(net (code 20) (name "Bdrv.in1") +(net (code 22) (name "Bdrv.in1") (node (ref BU2) (pin 15)) (node (ref BU3) (pin 3))) -(net (code 21) (name "Bdrv.in2") +(net (code 23) (name "Bdrv.in2") (node (ref BU2) (pin 14)) (node (ref BU3) (pin 2))) -(net (code 22) (name "Bdrv.out1") - (node (ref BJ3) (pin 5)) - (node (ref BU3) (pin 6))) -(net (code 23) (name "Bdrv.out2") - (node (ref BJ3) (pin 6)) - (node (ref BU3) (pin 8))) (net (code 24) (name "Bdrv.ic.isen") (node (ref BU3) (pin 7)) (node (ref BR10) (pin 2)))) diff --git a/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js b/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js index c41d65f2f..6576903c5 100644 --- a/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js +++ b/examples/IotRollerBlinds/IotRollerBlinds.svgpcb.js @@ -203,23 +203,23 @@ board.setNetlist([ {name: "Bv3v3", pads: [["BR1", "1"], ["BL1", "2"], ["BC5", "1"], ["BTP3", "1"], ["BD1", "1"], ["BU2", "1"], ["BU2", "16"], ["BU2", "7"], ["BC6", "1"], ["BC7", "1"], ["BJ4", "1"], ["BR4", "1"], ["BD2", "2"], ["BR8", "1"], ["BR9", "1"], ["BJ5", "2"], ["BU3", "4"]]}, {name: "Bconn.enca", pads: [["BJ3", "2"], ["BU2", "13"]]}, {name: "Bconn.encb", pads: [["BJ3", "3"], ["BU2", "10"]]}, + {name: "Bconn.motor2", pads: [["BJ3", "5"], ["BU3", "6"]]}, + {name: "Bconn.motor1", pads: [["BJ3", "6"], ["BU3", "8"]]}, {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.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: "Breg_3v3.ic.sw", pads: [["BU1", "2"], ["BC2", "2"], ["BL1", "1"]]}, + {name: "Breg_3v3.ic.fb", pads: [["BU1", "4"], ["BR1", "2"], ["BR2", "1"]]}, + {name: "Breg_3v3.ic.boot", pads: [["BU1", "6"], ["BC2", "1"]]}, + {name: "Breg_3v3.ic.en", 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"]]}, {name: "Bmcu.program_en_node", pads: [["BU2", "2"], ["BJ4", "6"], ["BR4", "2"], ["BC8", "1"]]}, {name: "Bmcu.program_boot_node", pads: [["BU2", "8"], ["BJ4", "2"], ["BR5", "2"]]}, - {name: "Bledr.res.a", pads: [["BD2", "1"], ["BR5", "1"]]}, + {name: "Bledr.package.k", pads: [["BD2", "1"], ["BR5", "1"]]}, {name: "Bvin_sense.output", pads: [["BU2", "3"], ["BR6", "2"], ["BR7", "1"]]}, {name: "Bqwiic_pull.i2c.scl", pads: [["BU2", "5"], ["BR8", "2"], ["BJ5", "4"]]}, {name: "Bqwiic_pull.i2c.sda", pads: [["BU2", "6"], ["BR9", "2"], ["BJ5", "3"]]}, {name: "Bdrv.in1", pads: [["BU2", "15"], ["BU3", "3"]]}, {name: "Bdrv.in2", pads: [["BU2", "14"], ["BU3", "2"]]}, - {name: "Bdrv.out1", pads: [["BJ3", "5"], ["BU3", "6"]]}, - {name: "Bdrv.out2", pads: [["BJ3", "6"], ["BU3", "8"]]}, {name: "Bdrv.ic.isen", pads: [["BU3", "7"], ["BR10", "2"]]} ]) diff --git a/examples/IotThermalCamera/IotThermalCamera.net b/examples/IotThermalCamera/IotThermalCamera.net index 74db2ab91..9c78cf07d 100644 --- a/examples/IotThermalCamera/IotThermalCamera.net +++ b/examples/IotThermalCamera/IotThermalCamera.net @@ -778,18 +778,18 @@ (net (code 13) (name "Tusb.conn.cc.cc2") (node (ref TJ1) (pin B5)) (node (ref TR2) (pin 2))) -(net (code 14) (name "Treg_3v3.fb.output") +(net (code 14) (name "Treg_3v3.ic.sw") + (node (ref TU1) (pin 2)) + (node (ref TC2) (pin 2)) + (node (ref TL1) (pin 1))) +(net (code 15) (name "Treg_3v3.ic.fb") (node (ref TU1) (pin 4)) (node (ref TR3) (pin 2)) (node (ref TR4) (pin 1))) -(net (code 15) (name "Treg_3v3.boot_cap.pos") +(net (code 16) (name "Treg_3v3.ic.boot") (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 17) (name "Treg_3v3.en_res.b") +(net (code 17) (name "Treg_3v3.ic.en") (node (ref TU1) (pin 5)) (node (ref TR5) (pin 2))) (net (code 18) (name "Tmcu.program_uart_node.a_tx") @@ -810,7 +810,7 @@ (net (code 22) (name "Ttouch_duck.pad") (node (ref TU5) (pin 6)) (node (ref TU7) (pin 1))) -(net (code 23) (name "Tledr.res.a") +(net (code 23) (name "Tledr.package.k") (node (ref TD2) (pin 1)) (node (ref TR9) (pin 1))) (net (code 24) (name "Tcam.dvp8.xclk") @@ -879,7 +879,7 @@ (net (code 45) (name "Tflir.vsync") (node (ref TU5) (pin 7)) (node (ref TU8) (pin 2))) -(net (code 46) (name "Tflir.mclk.out") +(net (code 46) (name "Tflir.ic.master_clk") (node (ref TU8) (pin 26)) (node (ref TX1) (pin 3)))) ) \ No newline at end of file diff --git a/examples/IotThermalCamera/IotThermalCamera.svgpcb.js b/examples/IotThermalCamera/IotThermalCamera.svgpcb.js index 96f5e45b8..20e5bd492 100644 --- a/examples/IotThermalCamera/IotThermalCamera.svgpcb.js +++ b/examples/IotThermalCamera/IotThermalCamera.svgpcb.js @@ -280,16 +280,16 @@ board.setNetlist([ {name: "Tusb.pwr", pads: [["TJ1", "A4"], ["TJ1", "A9"], ["TJ1", "B4"], ["TJ1", "B9"], ["TFB1", "1"]]}, {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.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: "Treg_3v3.ic.sw", pads: [["TU1", "2"], ["TC2", "2"], ["TL1", "1"]]}, + {name: "Treg_3v3.ic.fb", pads: [["TU1", "4"], ["TR3", "2"], ["TR4", "1"]]}, + {name: "Treg_3v3.ic.boot", pads: [["TU1", "6"], ["TC2", "1"]]}, + {name: "Treg_3v3.ic.en", 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"]]}, {name: "Tmcu.program_en_node", pads: [["TU5", "3"], ["TJ2", "6"], ["TR6", "2"], ["TC13", "1"]]}, {name: "Tmcu.program_boot_node", pads: [["TU5", "27"], ["TJ2", "2"], ["TD2", "2"]]}, {name: "Ttouch_duck.pad", pads: [["TU5", "6"], ["TU7", "1"]]}, - {name: "Tledr.res.a", pads: [["TD2", "1"], ["TR9", "1"]]}, + {name: "Tledr.package.k", pads: [["TD2", "1"], ["TR9", "1"]]}, {name: "Tcam.dvp8.xclk", pads: [["TU5", "21"], ["TJ3", "13"]]}, {name: "Tcam.dvp8.pclk", pads: [["TU5", "19"], ["TJ3", "17"], ["TC16", "1"]]}, {name: "Tcam.dvp8.href", pads: [["TU5", "24"], ["TJ3", "9"]]}, @@ -312,7 +312,7 @@ board.setNetlist([ {name: "Tflir.spi.miso", pads: [["TU5", "4"], ["TU8", "12"]]}, {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"]]} + {name: "Tflir.ic.master_clk", pads: [["TU8", "26"], ["TX1", "3"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/JacdacKeyswitch/JacdacKeyswitch.net b/examples/JacdacKeyswitch/JacdacKeyswitch.net index 56633b698..8025ee661 100644 --- a/examples/JacdacKeyswitch/JacdacKeyswitch.net +++ b/examples/JacdacKeyswitch/JacdacKeyswitch.net @@ -498,42 +498,42 @@ (node (ref C4) (pin 1)) (node (ref D7) (pin 2)) (node (ref D8) (pin 1))) -(net (code 6) (name "edge.status_led.res.a") +(net (code 6) (name "edge.status_led.package.k") (node (ref D1) (pin 1)) (node (ref R1) (pin 1))) -(net (code 7) (name "edge2.status_led.res.a") +(net (code 7) (name "edge2.status_led.package.k") (node (ref D4) (pin 1)) (node (ref R2) (pin 1))) -(net (code 8) (name "mcu.swd_node.swdio") +(net (code 8) (name "mcu.gpio.rgb_red") + (node (ref U2) (pin 16)) + (node (ref R3) (pin 2))) +(net (code 9) (name "mcu.gpio.rgb_green") + (node (ref U2) (pin 17)) + (node (ref R4) (pin 2))) +(net (code 10) (name "mcu.gpio.rgb_blue") + (node (ref U2) (pin 15)) + (node (ref R5) (pin 2))) +(net (code 11) (name "mcu.swd_node.swdio") (node (ref J1) (pin 2)) (node (ref U2) (pin 20))) -(net (code 9) (name "mcu.swd_node.swclk") +(net (code 12) (name "mcu.swd_node.swclk") (node (ref J1) (pin 4)) (node (ref U2) (pin 21))) -(net (code 10) (name "mcu.reset_node") +(net (code 13) (name "mcu.reset_node") (node (ref J1) (pin 3)) (node (ref U2) (pin 5))) -(net (code 11) (name "mcu.swd.swo") +(net (code 14) (name "mcu.swd.swo") (node (ref J1) (pin 6))) -(net (code 12) (name "sw.out") +(net (code 15) (name "sw.out") (node (ref U2) (pin 19)) (node (ref SW1) (pin 1))) -(net (code 13) (name "rgb.signals.red") - (node (ref U2) (pin 16)) - (node (ref R3) (pin 2))) -(net (code 14) (name "rgb.signals.green") - (node (ref U2) (pin 17)) - (node (ref R4) (pin 2))) -(net (code 15) (name "rgb.signals.blue") - (node (ref U2) (pin 15)) - (node (ref R5) (pin 2))) -(net (code 16) (name "rgb.red_res.a") +(net (code 16) (name "rgb.package.k_red") (node (ref D7) (pin 3)) (node (ref R3) (pin 1))) -(net (code 17) (name "rgb.green_res.a") +(net (code 17) (name "rgb.package.k_green") (node (ref D7) (pin 4)) (node (ref R4) (pin 1))) -(net (code 18) (name "rgb.blue_res.a") +(net (code 18) (name "rgb.package.k_blue") (node (ref D7) (pin 1)) (node (ref R5) (pin 1))) (net (code 19) (name "jd_if.signal") diff --git a/examples/JacdacKeyswitch/JacdacKeyswitch.svgpcb.js b/examples/JacdacKeyswitch/JacdacKeyswitch.svgpcb.js index a79f7bc24..fc2178e12 100644 --- a/examples/JacdacKeyswitch/JacdacKeyswitch.svgpcb.js +++ b/examples/JacdacKeyswitch/JacdacKeyswitch.svgpcb.js @@ -192,19 +192,19 @@ board.setNetlist([ {name: "gnd", pads: [["EC1", "2"], ["R1", "2"], ["D2", "2"], ["D3", "2"], ["MH2", "MH2"], ["MH4", "MH4"], ["EC2", "2"], ["R2", "2"], ["D5", "2"], ["D6", "2"], ["TP1", "1"], ["U1", "2"], ["C1", "2"], ["C2", "2"], ["J1", "5"], ["U2", "4"], ["C3", "2"], ["C4", "2"], ["SW1", "2"], ["C5", "2"], ["D9", "2"]]}, {name: "jd_status", pads: [["D1", "2"], ["D4", "2"], ["U2", "1"]]}, {name: "v3v3", pads: [["U1", "5"], ["C2", "1"], ["TP3", "1"], ["J1", "1"], ["U2", "3"], ["C3", "1"], ["C4", "1"], ["D7", "2"], ["D8", "1"]]}, - {name: "edge.status_led.res.a", pads: [["D1", "1"], ["R1", "1"]]}, - {name: "edge2.status_led.res.a", pads: [["D4", "1"], ["R2", "1"]]}, + {name: "edge.status_led.package.k", pads: [["D1", "1"], ["R1", "1"]]}, + {name: "edge2.status_led.package.k", pads: [["D4", "1"], ["R2", "1"]]}, + {name: "mcu.gpio.rgb_red", pads: [["U2", "16"], ["R3", "2"]]}, + {name: "mcu.gpio.rgb_green", pads: [["U2", "17"], ["R4", "2"]]}, + {name: "mcu.gpio.rgb_blue", pads: [["U2", "15"], ["R5", "2"]]}, {name: "mcu.swd_node.swdio", pads: [["J1", "2"], ["U2", "20"]]}, {name: "mcu.swd_node.swclk", pads: [["J1", "4"], ["U2", "21"]]}, {name: "mcu.reset_node", pads: [["J1", "3"], ["U2", "5"]]}, {name: "mcu.swd.swo", pads: [["J1", "6"]]}, {name: "sw.out", pads: [["U2", "19"], ["SW1", "1"]]}, - {name: "rgb.signals.red", pads: [["U2", "16"], ["R3", "2"]]}, - {name: "rgb.signals.green", pads: [["U2", "17"], ["R4", "2"]]}, - {name: "rgb.signals.blue", pads: [["U2", "15"], ["R5", "2"]]}, - {name: "rgb.red_res.a", pads: [["D7", "3"], ["R3", "1"]]}, - {name: "rgb.green_res.a", pads: [["D7", "4"], ["R4", "1"]]}, - {name: "rgb.blue_res.a", pads: [["D7", "1"], ["R5", "1"]]}, + {name: "rgb.package.k_red", pads: [["D7", "3"], ["R3", "1"]]}, + {name: "rgb.package.k_green", pads: [["D7", "4"], ["R4", "1"]]}, + {name: "rgb.package.k_blue", pads: [["D7", "1"], ["R5", "1"]]}, {name: "jd_if.signal", pads: [["U2", "26"], ["R6", "1"], ["D8", "2"], ["D9", "1"]]}, {name: "jd_if.ferrite.b", pads: [["FB1", "2"], ["R6", "2"], ["C5", "1"]]} ]) diff --git a/examples/Keyboard/Keyboard.net b/examples/Keyboard/Keyboard.net index 571a7cbda..ed0f715cf 100644 --- a/examples/Keyboard/Keyboard.net +++ b/examples/Keyboard/Keyboard.net @@ -471,22 +471,22 @@ (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") +(net (code 20) (name "sw.sw[0,0].sw") (node (ref SW1) (pin 1)) (node (ref D1) (pin 1))) -(net (code 21) (name "sw.d[0,1].cathode") +(net (code 21) (name "sw.sw[0,1].sw") (node (ref SW2) (pin 1)) (node (ref D2) (pin 1))) -(net (code 22) (name "sw.d[0,2].cathode") +(net (code 22) (name "sw.sw[0,2].sw") (node (ref SW3) (pin 1)) (node (ref D3) (pin 1))) -(net (code 23) (name "sw.d[1,0].cathode") +(net (code 23) (name "sw.sw[1,0].sw") (node (ref SW4) (pin 1)) (node (ref D4) (pin 1))) -(net (code 24) (name "sw.d[1,1].cathode") +(net (code 24) (name "sw.sw[1,1].sw") (node (ref SW5) (pin 1)) (node (ref D5) (pin 1))) -(net (code 25) (name "sw.d[1,2].cathode") +(net (code 25) (name "sw.sw[1,2].sw") (node (ref SW6) (pin 1)) (node (ref D6) (pin 1)))) ) \ No newline at end of file diff --git a/examples/Keyboard/Keyboard.svgpcb.js b/examples/Keyboard/Keyboard.svgpcb.js index 0766103df..dd31bb686 100644 --- a/examples/Keyboard/Keyboard.svgpcb.js +++ b/examples/Keyboard/Keyboard.svgpcb.js @@ -112,12 +112,12 @@ board.setNetlist([ {name: "mcu.reset_node", pads: [["J2", "10"], ["U2", "7"]]}, {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"]]}, - {name: "sw.d[1,0].cathode", pads: [["SW4", "1"], ["D4", "1"]]}, - {name: "sw.d[1,1].cathode", pads: [["SW5", "1"], ["D5", "1"]]}, - {name: "sw.d[1,2].cathode", pads: [["SW6", "1"], ["D6", "1"]]} + {name: "sw.sw[0,0].sw", pads: [["SW1", "1"], ["D1", "1"]]}, + {name: "sw.sw[0,1].sw", pads: [["SW2", "1"], ["D2", "1"]]}, + {name: "sw.sw[0,2].sw", pads: [["SW3", "1"], ["D3", "1"]]}, + {name: "sw.sw[1,0].sw", pads: [["SW4", "1"], ["D4", "1"]]}, + {name: "sw.sw[1,1].sw", pads: [["SW5", "1"], ["D5", "1"]]}, + {name: "sw.sw[1,2].sw", pads: [["SW6", "1"], ["D6", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/LedMatrix/LedMatrix.net b/examples/LedMatrix/LedMatrix.net index dec24e56e..c181c6b74 100644 --- a/examples/LedMatrix/LedMatrix.net +++ b/examples/LedMatrix/LedMatrix.net @@ -791,7 +791,7 @@ (net (code 19) (name "sw1.out") (node (ref U2) (pin 18)) (node (ref SW2) (pin 1))) -(net (code 20) (name "matrix.led[0_0].k") +(net (code 20) (name "matrix.res[0].a") (node (ref R4) (pin 1)) (node (ref D2) (pin 1)) (node (ref D3) (pin 1)) @@ -799,7 +799,7 @@ (node (ref D5) (pin 1)) (node (ref D6) (pin 1)) (node (ref D7) (pin 1))) -(net (code 21) (name "matrix.led[0_1].k") +(net (code 21) (name "matrix.res[1].a") (node (ref R5) (pin 1)) (node (ref D8) (pin 1)) (node (ref D9) (pin 1)) @@ -807,7 +807,7 @@ (node (ref D11) (pin 1)) (node (ref D12) (pin 1)) (node (ref D13) (pin 1))) -(net (code 22) (name "matrix.led[0_2].k") +(net (code 22) (name "matrix.res[2].a") (node (ref R6) (pin 1)) (node (ref D14) (pin 1)) (node (ref D15) (pin 1)) @@ -815,7 +815,7 @@ (node (ref D17) (pin 1)) (node (ref D18) (pin 1)) (node (ref D19) (pin 1))) -(net (code 23) (name "matrix.led[0_3].k") +(net (code 23) (name "matrix.res[3].a") (node (ref R7) (pin 1)) (node (ref D20) (pin 1)) (node (ref D21) (pin 1)) @@ -823,7 +823,7 @@ (node (ref D23) (pin 1)) (node (ref D24) (pin 1)) (node (ref D25) (pin 1))) -(net (code 24) (name "matrix.led[0_4].k") +(net (code 24) (name "matrix.res[4].a") (node (ref R8) (pin 1)) (node (ref D26) (pin 1)) (node (ref D27) (pin 1)) diff --git a/examples/LedMatrix/LedMatrix.svgpcb.js b/examples/LedMatrix/LedMatrix.svgpcb.js index 2f03443ee..50088e348 100644 --- a/examples/LedMatrix/LedMatrix.svgpcb.js +++ b/examples/LedMatrix/LedMatrix.svgpcb.js @@ -127,11 +127,11 @@ board.setNetlist([ {name: "mcu.program_en_node", pads: [["U2", "2"], ["R3", "2"], ["C5", "1"]]}, {name: "mcu.program_boot_node", pads: [["U2", "8"], ["SW1", "1"]]}, {name: "sw1.out", pads: [["U2", "18"], ["SW2", "1"]]}, - {name: "matrix.led[0_0].k", pads: [["R4", "1"], ["D2", "1"], ["D3", "1"], ["D4", "1"], ["D5", "1"], ["D6", "1"], ["D7", "1"]]}, - {name: "matrix.led[0_1].k", pads: [["R5", "1"], ["D8", "1"], ["D9", "1"], ["D10", "1"], ["D11", "1"], ["D12", "1"], ["D13", "1"]]}, - {name: "matrix.led[0_2].k", pads: [["R6", "1"], ["D14", "1"], ["D15", "1"], ["D16", "1"], ["D17", "1"], ["D18", "1"], ["D19", "1"]]}, - {name: "matrix.led[0_3].k", pads: [["R7", "1"], ["D20", "1"], ["D21", "1"], ["D22", "1"], ["D23", "1"], ["D24", "1"], ["D25", "1"]]}, - {name: "matrix.led[0_4].k", pads: [["R8", "1"], ["D26", "1"], ["D27", "1"], ["D28", "1"], ["D29", "1"], ["D30", "1"], ["D31", "1"]]} + {name: "matrix.res[0].a", pads: [["R4", "1"], ["D2", "1"], ["D3", "1"], ["D4", "1"], ["D5", "1"], ["D6", "1"], ["D7", "1"]]}, + {name: "matrix.res[1].a", pads: [["R5", "1"], ["D8", "1"], ["D9", "1"], ["D10", "1"], ["D11", "1"], ["D12", "1"], ["D13", "1"]]}, + {name: "matrix.res[2].a", pads: [["R6", "1"], ["D14", "1"], ["D15", "1"], ["D16", "1"], ["D17", "1"], ["D18", "1"], ["D19", "1"]]}, + {name: "matrix.res[3].a", pads: [["R7", "1"], ["D20", "1"], ["D21", "1"], ["D22", "1"], ["D23", "1"], ["D24", "1"], ["D25", "1"]]}, + {name: "matrix.res[4].a", pads: [["R8", "1"], ["D26", "1"], ["D27", "1"], ["D28", "1"], ["D29", "1"], ["D30", "1"], ["D31", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/Multimeter/Multimeter.net b/examples/Multimeter/Multimeter.net index 8e196fafc..9ada53b2f 100644 --- a/examples/Multimeter/Multimeter.net +++ b/examples/Multimeter/Multimeter.net @@ -1462,84 +1462,84 @@ (node (ref U13) (pin 4)) (node (ref TP5) (pin 1)) (node (ref U14) (pin 5))) -(net (code 13) (name "data_usb.usb.dp") +(net (code 13) (name "data_usb.pwr") + (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 14) (name "data_usb.usb.dp") (node (ref J1) (pin A6)) (node (ref J1) (pin B6)) (node (ref R6) (pin 2)) (node (ref U6) (pin 2))) -(net (code 14) (name "data_usb.usb.dm") +(net (code 15) (name "data_usb.usb.dm") (node (ref J1) (pin A7)) (node (ref J1) (pin B7)) (node (ref R7) (pin 2)) (node (ref U6) (pin 1))) -(net (code 15) (name "data_usb.conn.cc.cc1") +(net (code 16) (name "data_usb.conn.cc.cc1") (node (ref J1) (pin A5)) (node (ref R1) (pin 2))) -(net (code 16) (name "data_usb.conn.cc.cc2") +(net (code 17) (name "data_usb.conn.cc.cc2") (node (ref J1) (pin B5)) (node (ref R2) (pin 2))) -(net (code 17) (name "gate.pwr_out") +(net (code 18) (name "gate.pwr_out") (node (ref Q1) (pin 3)) (node (ref U2) (pin 3)) (node (ref L1) (pin 1)) (node (ref C1) (pin 1)) (node (ref R5) (pin 1)) (node (ref R8) (pin 1))) -(net (code 18) (name "gate.btn_out") +(net (code 19) (name "gate.btn_out") (node (ref D2) (pin 2)) (node (ref U5) (pin 50))) -(net (code 19) (name "gate.control") +(net (code 20) (name "gate.control") (node (ref R4) (pin 2)) (node (ref Q2) (pin 1)) (node (ref U5) (pin 49))) -(net (code 20) (name "gate.pwr_gate.btn_in") +(net (code 21) (name "gate.pwr_gate.btn_in") (node (ref D1) (pin 1)) (node (ref D2) (pin 1)) (node (ref SW1) (pin 1))) -(net (code 21) (name "gate.pwr_gate.pull_res.b") +(net (code 22) (name "gate.pwr_gate.pull_res.b") (node (ref R3) (pin 2)) (node (ref Q1) (pin 1)) (node (ref Q2) (pin 3)) (node (ref D1) (pin 2))) -(net (code 22) (name "reg_5v.ic.ce") +(net (code 23) (name "reg_5v.ic.ce") (node (ref U2) (pin 1)) (node (ref R5) (pin 2))) -(net (code 23) (name "reg_5v.power_path.switch") +(net (code 24) (name "reg_5v.ic.sw") (node (ref U2) (pin 5)) (node (ref L1) (pin 2))) -(net (code 24) (name "mcu.gpio.rgb_red") +(net (code 25) (name "mcu.gpio.rgb_red") (node (ref U5) (pin 4)) (node (ref R10) (pin 2))) -(net (code 25) (name "mcu.gpio.rgb_green") +(net (code 26) (name "mcu.gpio.rgb_green") (node (ref U5) (pin 5)) (node (ref R11) (pin 2))) -(net (code 26) (name "mcu.gpio.rgb_blue") +(net (code 27) (name "mcu.gpio.rgb_blue") (node (ref U5) (pin 6)) (node (ref R12) (pin 2))) -(net (code 27) (name "mcu.gpio.inn_control_0") +(net (code 28) (name "mcu.gpio.inn_control_0") (node (ref U5) (pin 41)) (node (ref U9) (pin 6))) -(net (code 28) (name "mcu.gpio.measure_select_0_0") +(net (code 29) (name "mcu.gpio.measure_select_0_0") (node (ref U5) (pin 42)) (node (ref U10) (pin 6)) (node (ref U11) (pin 6))) -(net (code 29) (name "mcu.gpio.measure_select_1_0") +(net (code 30) (name "mcu.gpio.measure_select_1_0") (node (ref U5) (pin 43)) (node (ref U12) (pin 6))) -(net (code 30) (name "mcu.gpio.driver_select_0_0") +(net (code 31) (name "mcu.gpio.driver_select_0_0") (node (ref U5) (pin 46)) (node (ref U16) (pin 6)) (node (ref U17) (pin 6))) -(net (code 31) (name "mcu.gpio.driver_select_1_0") +(net (code 32) (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))) @@ -1564,13 +1564,13 @@ (node (ref U5) (pin 9)) (node (ref R8) (pin 2)) (node (ref R9) (pin 1))) -(net (code 41) (name "rgb.red_res.a") +(net (code 41) (name "rgb.package.k_red") (node (ref D6) (pin 3)) (node (ref R10) (pin 1))) -(net (code 42) (name "rgb.green_res.a") +(net (code 42) (name "rgb.package.k_green") (node (ref D6) (pin 4)) (node (ref R11) (pin 1))) -(net (code 43) (name "rgb.blue_res.a") +(net (code 43) (name "rgb.package.k_blue") (node (ref D6) (pin 1)) (node (ref R12) (pin 1))) (net (code 44) (name "sw1.out") @@ -1594,19 +1594,19 @@ (net (code 50) (name "lcd.spi.mosi") (node (ref U5) (pin 19)) (node (ref J3) (pin 5))) -(net (code 51) (name "lcd.led_res.b") +(net (code 51) (name "lcd.device.leda") (node (ref J3) (pin 1)) (node (ref R13) (pin 2))) -(net (code 52) (name "spk_drv.inp_res.b") +(net (code 52) (name "spk_drv.ic.inp") (node (ref U7) (pin 4)) (node (ref R15) (pin 2))) -(net (code 53) (name "spk_drv.inp_cap.pos") - (node (ref R15) (pin 1)) - (node (ref C13) (pin 1))) -(net (code 54) (name "spk_drv.inn_res.b") +(net (code 53) (name "spk_drv.ic.inn") (node (ref U7) (pin 3)) (node (ref R16) (pin 2))) -(net (code 55) (name "spk_drv.inn_cap.pos") +(net (code 54) (name "spk_drv.inp_res.a") + (node (ref R15) (pin 1)) + (node (ref C13) (pin 1))) +(net (code 55) (name "spk_drv.inn_res.a") (node (ref R16) (pin 1)) (node (ref C14) (pin 1))) (net (code 56) (name "ref_div.output") @@ -1678,46 +1678,46 @@ (net (code 78) (name "adc.ic.vrefp") (node (ref U14) (pin 4)) (node (ref C25) (pin 1))) -(net (code 79) (name "driver.enable") +(net (code 79) (name "driver.control") + (node (ref U15) (pin 3)) + (node (ref R29) (pin 2)) + (node (ref C31) (pin 1))) +(net (code 80) (name "driver.enable") (node (ref U5) (pin 48)) (node (ref U19) (pin 6))) -(net (code 80) (name "driver.fet.source") +(net (code 81) (name "driver.fet.source") (node (ref Q3) (pin 2)) (node (ref U15) (pin 4)) (node (ref U18) (pin 4)) (node (ref U19) (pin 3))) -(net (code 81) (name "driver.fet.drain") +(net (code 82) (name "driver.fet.drain") (node (ref Q3) (pin 3)) (node (ref D7) (pin 2))) -(net (code 82) (name "driver.fet.gate") +(net (code 83) (name "driver.fet.gate") (node (ref Q3) (pin 1)) (node (ref U19) (pin 4))) -(net (code 83) (name "driver.amp.out") +(net (code 84) (name "driver.amp.out") (node (ref U15) (pin 1)) (node (ref U19) (pin 1))) -(net (code 84) (name "driver.range.switch.sw[0_0].com") +(net (code 85) (name "driver.range.switch.sw[0_0].com") (node (ref U16) (pin 4)) (node (ref U18) (pin 3))) -(net (code 85) (name "driver.range.switch.sw[0_1].com") +(net (code 86) (name "driver.range.switch.sw[0_1].com") (node (ref U17) (pin 4)) (node (ref U18) (pin 1))) -(net (code 86) (name "driver.range.res[0].b") +(net (code 87) (name "driver.range.res[0].b") (node (ref U16) (pin 3)) (node (ref R25) (pin 2))) -(net (code 87) (name "driver.range.res[1].b") +(net (code 88) (name "driver.range.res[1].b") (node (ref U16) (pin 1)) (node (ref R26) (pin 2))) -(net (code 88) (name "driver.range.res[2].b") +(net (code 89) (name "driver.range.res[2].b") (node (ref U17) (pin 3)) (node (ref R27) (pin 2))) -(net (code 89) (name "driver.range.res[3].b") +(net (code 90) (name "driver.range.res[3].b") (node (ref U17) (pin 1)) (node (ref R28) (pin 2))) -(net (code 90) (name "driver_dac.input") +(net (code 91) (name "driver_dac.input") (node (ref U5) (pin 45)) - (node (ref R29) (pin 1))) -(net (code 91) (name "driver_dac.output") - (node (ref U15) (pin 3)) - (node (ref R29) (pin 2)) - (node (ref C31) (pin 1)))) + (node (ref R29) (pin 1)))) ) \ No newline at end of file diff --git a/examples/Multimeter/Multimeter.svgpcb.js b/examples/Multimeter/Multimeter.svgpcb.js index f8aa5c0a2..2c44e8d9d 100644 --- a/examples/Multimeter/Multimeter.svgpcb.js +++ b/examples/Multimeter/Multimeter.svgpcb.js @@ -549,6 +549,7 @@ board.setNetlist([ {name: "spk_chain_2.b", pads: [["U7", "5"], ["J4", "2"]]}, {name: "meas_chain_0", pads: [["R19", "2"], ["R20", "1"], ["R21", "1"], ["R22", "1"], ["U13", "3"]]}, {name: "meas_chain_1", pads: [["U13", "1"], ["U13", "4"], ["TP5", "1"], ["U14", "5"]]}, + {name: "data_usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["U5", "32"], ["C8", "1"]]}, {name: "data_usb.usb.dp", pads: [["J1", "A6"], ["J1", "B6"], ["R6", "2"], ["U6", "2"]]}, {name: "data_usb.usb.dm", pads: [["J1", "A7"], ["J1", "B7"], ["R7", "2"], ["U6", "1"]]}, {name: "data_usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, @@ -559,7 +560,7 @@ board.setNetlist([ {name: "gate.pwr_gate.btn_in", pads: [["D1", "1"], ["D2", "1"], ["SW1", "1"]]}, {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: "reg_5v.ic.sw", pads: [["U2", "5"], ["L1", "2"]]}, {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"]]}, @@ -568,7 +569,6 @@ 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"]]}, @@ -577,9 +577,9 @@ board.setNetlist([ {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"]]}, - {name: "rgb.blue_res.a", pads: [["D6", "1"], ["R12", "1"]]}, + {name: "rgb.package.k_red", pads: [["D6", "3"], ["R10", "1"]]}, + {name: "rgb.package.k_green", pads: [["D6", "4"], ["R11", "1"]]}, + {name: "rgb.package.k_blue", pads: [["D6", "1"], ["R12", "1"]]}, {name: "sw1.out", pads: [["U5", "16"], ["SW2", "1"]]}, {name: "sw2.out", pads: [["U5", "3"], ["SW3", "1"]]}, {name: "lcd.reset", pads: [["U5", "8"], ["J3", "3"]]}, @@ -587,11 +587,11 @@ board.setNetlist([ {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.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"]]}, - {name: "spk_drv.inn_res.b", pads: [["U7", "3"], ["R16", "2"]]}, - {name: "spk_drv.inn_cap.pos", pads: [["R16", "1"], ["C14", "1"]]}, + {name: "lcd.device.leda", pads: [["J3", "1"], ["R13", "2"]]}, + {name: "spk_drv.ic.inp", pads: [["U7", "4"], ["R15", "2"]]}, + {name: "spk_drv.ic.inn", pads: [["U7", "3"], ["R16", "2"]]}, + {name: "spk_drv.inp_res.a", pads: [["R15", "1"], ["C13", "1"]]}, + {name: "spk_drv.inn_res.a", pads: [["R16", "1"], ["C14", "1"]]}, {name: "ref_div.output", pads: [["R17", "2"], ["R18", "1"], ["U8", "3"]]}, {name: "inn_merge", pads: [["J5", "1"], ["U9", "4"], ["U12", "4"], ["U14", "6"]]}, {name: "inp.port", pads: [["J6", "1"], ["R19", "1"], ["D7", "1"]]}, @@ -615,6 +615,7 @@ board.setNetlist([ {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.control", pads: [["U15", "3"], ["R29", "2"], ["C31", "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.drain", pads: [["Q3", "3"], ["D7", "2"]]}, @@ -626,8 +627,7 @@ board.setNetlist([ {name: "driver.range.res[1].b", pads: [["U16", "1"], ["R26", "2"]]}, {name: "driver.range.res[2].b", pads: [["U17", "3"], ["R27", "2"]]}, {name: "driver.range.res[3].b", pads: [["U17", "1"], ["R28", "2"]]}, - {name: "driver_dac.input", pads: [["U5", "45"], ["R29", "1"]]}, - {name: "driver_dac.output", pads: [["U15", "3"], ["R29", "2"], ["C31", "1"]]} + {name: "driver_dac.input", pads: [["U5", "45"], ["R29", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/PcbBot/PcbBot.net b/examples/PcbBot/PcbBot.net index 28d2051e2..67a3d3794 100644 --- a/examples/PcbBot/PcbBot.net +++ b/examples/PcbBot/PcbBot.net @@ -1569,13 +1569,13 @@ (node (ref Q1) (pin 1)) (node (ref Q2) (pin 3)) (node (ref D1) (pin 2))) -(net (code 21) (name "charger.prog_res.a") - (node (ref U2) (pin 5)) - (node (ref R6) (pin 1))) -(net (code 22) (name "charge_led.signal") +(net (code 21) (name "charger.stat") (node (ref U2) (pin 1)) (node (ref R7) (pin 2))) -(net (code 23) (name "charge_led.res.a") +(net (code 22) (name "charger.ic.prog") + (node (ref U2) (pin 5)) + (node (ref R6) (pin 1))) +(net (code 23) (name "charge_led.package.k") (node (ref D6) (pin 1)) (node (ref R7) (pin 1))) (net (code 24) (name "mcu.program_uart_node.a_tx") @@ -1592,7 +1592,7 @@ (node (ref U3) (pin 27)) (node (ref SW2) (pin 1)) (node (ref D7) (pin 2))) -(net (code 28) (name "led.res.a") +(net (code 28) (name "led.package.k") (node (ref D7) (pin 1)) (node (ref R9) (pin 1))) (net (code 29) (name "tof.elt[0].ic.gpio1") @@ -1609,13 +1609,13 @@ (node (ref U5) (pin 9))) (net (code 35) (name "mag.drdy") (node (ref U6) (pin 15))) -(net (code 36) (name "mag.set_cap.pos") +(net (code 36) (name "mag.ic.setp") (node (ref U6) (pin 8)) (node (ref C11) (pin 1))) -(net (code 37) (name "mag.set_cap.neg") +(net (code 37) (name "mag.ic.setc") (node (ref U6) (pin 12)) (node (ref C11) (pin 2))) -(net (code 38) (name "mag.c1.pos") +(net (code 38) (name "mag.ic.c1") (node (ref U6) (pin 10)) (node (ref C12) (pin 1))) (net (code 39) (name "expander.io.tof_reset_1") @@ -1636,13 +1636,13 @@ (net (code 44) (name "expander.io.rgb_blue") (node (ref U7) (pin 10)) (node (ref R14) (pin 2))) -(net (code 45) (name "rgb.red_res.a") +(net (code 45) (name "rgb.package.k_red") (node (ref D8) (pin 1)) (node (ref R12) (pin 1))) -(net (code 46) (name "rgb.green_res.a") +(net (code 46) (name "rgb.package.k_green") (node (ref D8) (pin 3)) (node (ref R13) (pin 1))) -(net (code 47) (name "rgb.blue_res.a") +(net (code 47) (name "rgb.package.k_blue") (node (ref D8) (pin 4)) (node (ref R14) (pin 1))) (net (code 48) (name "oled.reset") @@ -1651,24 +1651,24 @@ (net (code 49) (name "oled.device.vcc") (node (ref J8) (pin 28)) (node (ref C19) (pin 1))) -(net (code 50) (name "oled.device.vcomh") +(net (code 50) (name "oled.device.iref") + (node (ref J8) (pin 26)) + (node (ref R15) (pin 1))) +(net (code 51) (name "oled.device.vcomh") (node (ref J8) (pin 27)) (node (ref C16) (pin 1))) -(net (code 51) (name "oled.c1_cap.pos") +(net (code 52) (name "oled.device.c1p") (node (ref J8) (pin 4)) (node (ref C14) (pin 1))) -(net (code 52) (name "oled.c1_cap.neg") +(net (code 53) (name "oled.device.c1n") (node (ref J8) (pin 5)) (node (ref C14) (pin 2))) -(net (code 53) (name "oled.c2_cap.pos") +(net (code 54) (name "oled.device.c2p") (node (ref J8) (pin 2)) (node (ref C15) (pin 1))) -(net (code 54) (name "oled.c2_cap.neg") +(net (code 55) (name "oled.device.c2n") (node (ref J8) (pin 3)) (node (ref C15) (pin 2))) -(net (code 55) (name "oled.iref_res.a") - (node (ref J8) (pin 26)) - (node (ref R15) (pin 1))) (net (code 56) (name "batt_sense.output") (node (ref U3) (pin 39)) (node (ref R16) (pin 2)) @@ -1779,7 +1779,7 @@ (node (ref J13) (pin 1))) (net (code 92) (name "cam.device.y.1") (node (ref J13) (pin 2))) -(net (code 93) (name "cam.reset_cap.pos") +(net (code 93) (name "cam.device.reset") (node (ref J13) (pin 19)) (node (ref C26) (pin 1)) (node (ref R18) (pin 2))) diff --git a/examples/PcbBot/PcbBot.svgpcb.js b/examples/PcbBot/PcbBot.svgpcb.js index 5a237d5d5..4e1fcde07 100644 --- a/examples/PcbBot/PcbBot.svgpcb.js +++ b/examples/PcbBot/PcbBot.svgpcb.js @@ -562,14 +562,14 @@ board.setNetlist([ {name: "gate.control", pads: [["R4", "2"], ["Q2", "1"], ["U3", "33"]]}, {name: "gate.pwr_gate.btn_in", pads: [["D1", "1"], ["D2", "1"], ["SW1", "1"]]}, {name: "gate.pwr_gate.pull_res.b", pads: [["R3", "2"], ["Q1", "1"], ["Q2", "3"], ["D1", "2"]]}, - {name: "charger.prog_res.a", pads: [["U2", "5"], ["R6", "1"]]}, - {name: "charge_led.signal", pads: [["U2", "1"], ["R7", "2"]]}, - {name: "charge_led.res.a", pads: [["D6", "1"], ["R7", "1"]]}, + {name: "charger.stat", pads: [["U2", "1"], ["R7", "2"]]}, + {name: "charger.ic.prog", pads: [["U2", "5"], ["R6", "1"]]}, + {name: "charge_led.package.k", pads: [["D6", "1"], ["R7", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U3", "37"], ["J3", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U3", "36"], ["J3", "3"]]}, {name: "mcu.program_en_node", pads: [["U3", "3"], ["R8", "2"], ["C7", "1"]]}, {name: "mcu.program_boot_node", pads: [["U3", "27"], ["SW2", "1"], ["D7", "2"]]}, - {name: "led.res.a", pads: [["D7", "1"], ["R9", "1"]]}, + {name: "led.package.k", pads: [["D7", "1"], ["R9", "1"]]}, {name: "tof.elt[0].ic.gpio1", pads: [["J4", "5"]]}, {name: "tof.elt[1].ic.gpio1", pads: [["J5", "5"]]}, {name: "tof.elt[2].ic.gpio1", pads: [["J6", "5"]]}, @@ -577,26 +577,26 @@ board.setNetlist([ {name: "imu.int1", pads: [["U5", "4"]]}, {name: "imu.int2", pads: [["U5", "9"]]}, {name: "mag.drdy", pads: [["U6", "15"]]}, - {name: "mag.set_cap.pos", pads: [["U6", "8"], ["C11", "1"]]}, - {name: "mag.set_cap.neg", pads: [["U6", "12"], ["C11", "2"]]}, - {name: "mag.c1.pos", pads: [["U6", "10"], ["C12", "1"]]}, + {name: "mag.ic.setp", pads: [["U6", "8"], ["C11", "1"]]}, + {name: "mag.ic.setc", pads: [["U6", "12"], ["C11", "2"]]}, + {name: "mag.ic.c1", pads: [["U6", "10"], ["C12", "1"]]}, {name: "expander.io.tof_reset_1", pads: [["J5", "6"], ["U7", "4"]]}, {name: "expander.io.tof_reset_2", pads: [["J6", "6"], ["U7", "5"]]}, {name: "expander.io.tof_reset_3", pads: [["J7", "6"], ["U7", "6"]]}, {name: "expander.io.rgb_red", pads: [["U7", "7"], ["R12", "2"]]}, {name: "expander.io.rgb_green", pads: [["U7", "9"], ["R13", "2"]]}, {name: "expander.io.rgb_blue", pads: [["U7", "10"], ["R14", "2"]]}, - {name: "rgb.red_res.a", pads: [["D8", "1"], ["R12", "1"]]}, - {name: "rgb.green_res.a", pads: [["D8", "3"], ["R13", "1"]]}, - {name: "rgb.blue_res.a", pads: [["D8", "4"], ["R14", "1"]]}, + {name: "rgb.package.k_red", pads: [["D8", "1"], ["R12", "1"]]}, + {name: "rgb.package.k_green", pads: [["D8", "3"], ["R13", "1"]]}, + {name: "rgb.package.k_blue", pads: [["D8", "4"], ["R14", "1"]]}, {name: "oled.reset", pads: [["U3", "31"], ["J8", "14"]]}, {name: "oled.device.vcc", pads: [["J8", "28"], ["C19", "1"]]}, + {name: "oled.device.iref", pads: [["J8", "26"], ["R15", "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"]]}, - {name: "oled.c2_cap.neg", pads: [["J8", "3"], ["C15", "2"]]}, - {name: "oled.iref_res.a", pads: [["J8", "26"], ["R15", "1"]]}, + {name: "oled.device.c1p", pads: [["J8", "4"], ["C14", "1"]]}, + {name: "oled.device.c1n", pads: [["J8", "5"], ["C14", "2"]]}, + {name: "oled.device.c2p", pads: [["J8", "2"], ["C15", "1"]]}, + {name: "oled.device.c2n", pads: [["J8", "3"], ["C15", "2"]]}, {name: "batt_sense.output", pads: [["U3", "39"], ["R16", "2"], ["R17", "1"]]}, {name: "servo[0].pwm", pads: [["U3", "5"], ["J9", "1"]]}, {name: "servo[1].pwm", pads: [["U3", "6"], ["J10", "1"]]}, @@ -634,7 +634,7 @@ board.setNetlist([ {name: "cam.dvp8.y7", pads: [["U3", "15"], ["J13", "13"]]}, {name: "cam.device.y.0", pads: [["J13", "1"]]}, {name: "cam.device.y.1", pads: [["J13", "2"]]}, - {name: "cam.reset_cap.pos", pads: [["J13", "19"], ["C26", "1"], ["R18", "2"]]}, + {name: "cam.device.reset", pads: [["J13", "19"], ["C26", "1"], ["R18", "2"]]}, {name: "switch.out", pads: [["U3", "34"], ["SW3", "1"]]} ]) diff --git a/examples/PicoProbe/PicoProbe.net b/examples/PicoProbe/PicoProbe.net index d7e906645..b18ccb4fa 100644 --- a/examples/PicoProbe/PicoProbe.net +++ b/examples/PicoProbe/PicoProbe.net @@ -600,71 +600,71 @@ (net (code 8) (name "Susb.conn.cc.cc2") (node (ref SJ1) (pin B5)) (node (ref SR2) (pin 2))) -(net (code 9) (name "Smcu.xtal_node.xi") +(net (code 9) (name "Starget_reg.reset") + (node (ref SU2) (pin 3)) + (node (ref SU3) (pin 17)) + (node (ref SR7) (pin 2))) +(net (code 10) (name "Smcu.xtal_node.xi") (node (ref SU3) (pin 20)) (node (ref SU5) (pin 1))) -(net (code 10) (name "Smcu.xtal_node.xo") +(net (code 11) (name "Smcu.xtal_node.xo") (node (ref SU3) (pin 21)) (node (ref SU5) (pin 3))) -(net (code 11) (name "Smcu.swd_node.swdio") +(net (code 12) (name "Smcu.swd_node.swdio") (node (ref SJ2) (pin 2)) (node (ref SU3) (pin 25))) -(net (code 12) (name "Smcu.swd_node.swclk") +(net (code 13) (name "Smcu.swd_node.swclk") (node (ref SJ2) (pin 4)) (node (ref SU3) (pin 24))) -(net (code 13) (name "Smcu.reset_node") +(net (code 14) (name "Smcu.reset_node") (node (ref SJ2) (pin 3)) (node (ref SU3) (pin 26))) -(net (code 14) (name "Smcu.usb_chain_0.d_P") +(net (code 15) (name "Smcu.usb_chain_0.d_P") (node (ref SU3) (pin 47)) (node (ref SR3) (pin 1))) -(net (code 15) (name "Smcu.usb_chain_0.d_N") +(net (code 16) (name "Smcu.usb_chain_0.d_N") (node (ref SU3) (pin 46)) (node (ref SR4) (pin 1))) -(net (code 16) (name "Smcu.swd.swo") +(net (code 17) (name "Smcu.swd.swo") (node (ref SJ2) (pin 6)) (node (ref SU3) (pin 15))) -(net (code 17) (name "Smcu.ic.vreg_vout") +(net (code 18) (name "Smcu.ic.dvdd") (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") +(net (code 19) (name "Smcu.ic.qspi.sck") (node (ref SU3) (pin 52)) (node (ref SU4) (pin 6))) -(net (code 19) (name "Smcu.ic.qspi.mosi") +(net (code 20) (name "Smcu.ic.qspi.mosi") (node (ref SU3) (pin 53)) (node (ref SU4) (pin 5))) -(net (code 20) (name "Smcu.ic.qspi.miso") +(net (code 21) (name "Smcu.ic.qspi.miso") (node (ref SU3) (pin 55)) (node (ref SU4) (pin 2))) -(net (code 21) (name "Smcu.ic.qspi_cs") +(net (code 22) (name "Smcu.ic.qspi_cs") (node (ref SU3) (pin 56)) (node (ref SU4) (pin 1))) -(net (code 22) (name "Smcu.ic.qspi_sd2") +(net (code 23) (name "Smcu.ic.qspi_sd2") (node (ref SU3) (pin 54)) (node (ref SU4) (pin 3))) -(net (code 23) (name "Smcu.ic.qspi_sd3") +(net (code 24) (name "Smcu.ic.qspi_sd3") (node (ref SU3) (pin 51)) (node (ref SU4) (pin 7))) -(net (code 24) (name "Sled_tgt.signal") +(net (code 25) (name "Sled_tgt.signal") (node (ref SU3) (pin 27)) (node (ref SD2) (pin 2))) -(net (code 25) (name "Sled_tgt.res.a") +(net (code 26) (name "Sled_tgt.package.k") (node (ref SD2) (pin 1)) (node (ref SR5) (pin 1))) -(net (code 26) (name "Sled_usb.signal") +(net (code 27) (name "Sled_usb.signal") (node (ref SU3) (pin 37)) (node (ref SD3) (pin 2))) -(net (code 27) (name "Sled_usb.res.a") +(net (code 28) (name "Sled_usb.package.k") (node (ref SD3) (pin 1)) (node (ref SR6) (pin 1))) -(net (code 28) (name "Sen_pull.io") - (node (ref SU2) (pin 3)) - (node (ref SU3) (pin 17)) - (node (ref SR7) (pin 2))) (net (code 29) (name "Starget_drv.swclk") (node (ref SU3) (pin 4)) (node (ref SJ3) (pin 4))) @@ -677,7 +677,7 @@ (net (code 32) (name "Starget.swo") (node (ref SU3) (pin 3)) (node (ref SJ3) (pin 6))) -(net (code 33) (name "Sled_target.res.a") +(net (code 33) (name "Sled_target.package.k") (node (ref SD4) (pin 1)) (node (ref SR8) (pin 1))) (net (code 34) (name "Starget_sense.output") diff --git a/examples/PicoProbe/PicoProbe.svgpcb.js b/examples/PicoProbe/PicoProbe.svgpcb.js index 2481b9f39..06317c592 100644 --- a/examples/PicoProbe/PicoProbe.svgpcb.js +++ b/examples/PicoProbe/PicoProbe.svgpcb.js @@ -220,6 +220,7 @@ board.setNetlist([ {name: "Susb_chain_0.d_N", pads: [["SJ1", "A7"], ["SJ1", "B7"], ["SR4", "2"], ["SU6", "1"]]}, {name: "Susb.conn.cc.cc1", pads: [["SJ1", "A5"], ["SR1", "2"]]}, {name: "Susb.conn.cc.cc2", pads: [["SJ1", "B5"], ["SR2", "2"]]}, + {name: "Starget_reg.reset", pads: [["SU2", "3"], ["SU3", "17"], ["SR7", "2"]]}, {name: "Smcu.xtal_node.xi", pads: [["SU3", "20"], ["SU5", "1"]]}, {name: "Smcu.xtal_node.xo", pads: [["SU3", "21"], ["SU5", "3"]]}, {name: "Smcu.swd_node.swdio", pads: [["SJ2", "2"], ["SU3", "25"]]}, @@ -228,7 +229,7 @@ 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.dvdd", 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"]]}, @@ -236,15 +237,14 @@ board.setNetlist([ {name: "Smcu.ic.qspi_sd2", pads: [["SU3", "54"], ["SU4", "3"]]}, {name: "Smcu.ic.qspi_sd3", pads: [["SU3", "51"], ["SU4", "7"]]}, {name: "Sled_tgt.signal", pads: [["SU3", "27"], ["SD2", "2"]]}, - {name: "Sled_tgt.res.a", pads: [["SD2", "1"], ["SR5", "1"]]}, + {name: "Sled_tgt.package.k", pads: [["SD2", "1"], ["SR5", "1"]]}, {name: "Sled_usb.signal", pads: [["SU3", "37"], ["SD3", "2"]]}, - {name: "Sled_usb.res.a", pads: [["SD3", "1"], ["SR6", "1"]]}, - {name: "Sen_pull.io", pads: [["SU2", "3"], ["SU3", "17"], ["SR7", "2"]]}, + {name: "Sled_usb.package.k", pads: [["SD3", "1"], ["SR6", "1"]]}, {name: "Starget_drv.swclk", pads: [["SU3", "4"], ["SJ3", "4"]]}, {name: "Starget_drv.swdio", pads: [["SU3", "5"], ["SJ3", "2"]]}, {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: "Sled_target.package.k", pads: [["SD4", "1"], ["SR8", "1"]]}, {name: "Starget_sense.output", pads: [["SU3", "40"], ["SR9", "2"], ["SR10", "1"]]} ]) diff --git a/examples/ProtectedCharger/ProtectedCharger.net b/examples/ProtectedCharger/ProtectedCharger.net index 6e28a1b14..035f081f3 100644 --- a/examples/ProtectedCharger/ProtectedCharger.net +++ b/examples/ProtectedCharger/ProtectedCharger.net @@ -297,24 +297,24 @@ (node (ref R4) (pin 2)) (node (ref Q1) (pin 1)) (node (ref Q2) (pin 3))) -(net (code 8) (name "pmos.r1.a") - (node (ref R3) (pin 1)) - (node (ref Q1) (pin 3)) - (node (ref Q2) (pin 1))) -(net (code 9) (name "charger.pwr_bat") +(net (code 8) (name "pmos.pwr_out") (node (ref R4) (pin 1)) (node (ref Q1) (pin 2)) (node (ref Q2) (pin 2)) (node (ref U1) (pin 3)) (node (ref C2) (pin 1)) (node (ref Q3) (pin 3))) -(net (code 10) (name "charger.prog_res.a") - (node (ref U1) (pin 5)) - (node (ref R5) (pin 1))) -(net (code 11) (name "charge_led.signal") +(net (code 9) (name "pmos.r1.a") + (node (ref R3) (pin 1)) + (node (ref Q1) (pin 3)) + (node (ref Q2) (pin 1))) +(net (code 10) (name "charger.stat") (node (ref U1) (pin 1)) (node (ref R6) (pin 2))) -(net (code 12) (name "charge_led.res.a") +(net (code 11) (name "charger.ic.prog") + (node (ref U1) (pin 5)) + (node (ref R5) (pin 1))) +(net (code 12) (name "charge_led.package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) (net (code 13) (name "pmos_load.pwr_out") diff --git a/examples/ProtectedCharger/ProtectedCharger.svgpcb.js b/examples/ProtectedCharger/ProtectedCharger.svgpcb.js index 44955031b..df72c9fbb 100644 --- a/examples/ProtectedCharger/ProtectedCharger.svgpcb.js +++ b/examples/ProtectedCharger/ProtectedCharger.svgpcb.js @@ -114,11 +114,11 @@ board.setNetlist([ {name: "usb.conn.cc.cc1", pads: [["J1", "A5"], ["R1", "2"]]}, {name: "usb.conn.cc.cc2", pads: [["J1", "B5"], ["R2", "2"]]}, {name: "batt.pwr", pads: [["J2", "2"], ["TP2", "1"], ["R4", "2"], ["Q1", "1"], ["Q2", "3"]]}, + {name: "pmos.pwr_out", pads: [["R4", "1"], ["Q1", "2"], ["Q2", "2"], ["U1", "3"], ["C2", "1"], ["Q3", "3"]]}, {name: "pmos.r1.a", pads: [["R3", "1"], ["Q1", "3"], ["Q2", "1"]]}, - {name: "charger.pwr_bat", pads: [["R4", "1"], ["Q1", "2"], ["Q2", "2"], ["U1", "3"], ["C2", "1"], ["Q3", "3"]]}, - {name: "charger.prog_res.a", pads: [["U1", "5"], ["R5", "1"]]}, - {name: "charge_led.signal", pads: [["U1", "1"], ["R6", "2"]]}, - {name: "charge_led.res.a", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "charger.stat", pads: [["U1", "1"], ["R6", "2"]]}, + {name: "charger.ic.prog", pads: [["U1", "5"], ["R5", "1"]]}, + {name: "charge_led.package.k", pads: [["D1", "1"], ["R6", "1"]]}, {name: "pmos_load.pwr_out", pads: [["Q3", "2"], ["J3", "2"]]} ]) diff --git a/examples/RobotCrawler/RobotCrawler.net b/examples/RobotCrawler/RobotCrawler.net index 281ae9681..f43d27f11 100644 --- a/examples/RobotCrawler/RobotCrawler.net +++ b/examples/RobotCrawler/RobotCrawler.net @@ -1816,15 +1816,15 @@ (net (code 38) (name "Rservos_cam[1].fb") (node (ref RJ15) (pin 4)) (node (ref RU7) (pin 16))) -(net (code 39) (name "Rreg_14v.fb.output") +(net (code 39) (name "Rreg_14v.ic.sw") + (node (ref RU3) (pin 1)) + (node (ref RL1) (pin 2)) + (node (ref RD1) (pin 2))) +(net (code 40) (name "Rreg_14v.ic.fb") (node (ref RU3) (pin 3)) (node (ref RR1) (pin 2)) (node (ref RR2) (pin 1)) (node (ref RC5) (pin 2))) -(net (code 40) (name "Rreg_14v.inductor.b") - (node (ref RU3) (pin 1)) - (node (ref RL1) (pin 2)) - (node (ref RD1) (pin 2))) (net (code 41) (name "Rmcu.program_uart_node.a_tx") (node (ref RU6) (pin 37)) (node (ref RJ16) (pin 3))) @@ -1880,7 +1880,7 @@ (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.vreg_vout") +(net (code 59) (name "Rmcu_test.ic.dvdd") (node (ref RU8) (pin 23)) (node (ref RU8) (pin 45)) (node (ref RU8) (pin 50)) @@ -1912,45 +1912,45 @@ (net (code 68) (name "Rled.signal") (node (ref RU6) (pin 33)) (node (ref RD2) (pin 2))) -(net (code 69) (name "Rled.res.a") +(net (code 69) (name "Rled.package.k") (node (ref RD2) (pin 1)) (node (ref RR6) (pin 1))) (net (code 70) (name "Rservo_led.signal") (node (ref RU7) (pin 33)) (node (ref RD3) (pin 2))) -(net (code 71) (name "Rservo_led.res.a") +(net (code 71) (name "Rservo_led.package.k") (node (ref RD3) (pin 1)) (node (ref RR7) (pin 1))) -(net (code 72) (name "Rtest_led.led[0].res.a") +(net (code 72) (name "Rtest_led.led[0].package.k") (node (ref RD4) (pin 1)) (node (ref RR8) (pin 1))) -(net (code 73) (name "Rtest_led.led[1].res.a") +(net (code 73) (name "Rtest_led.led[1].package.k") (node (ref RD5) (pin 1)) (node (ref RR9) (pin 1))) -(net (code 74) (name "Rtest_led.led[2].res.a") +(net (code 74) (name "Rtest_led.led[2].package.k") (node (ref RD6) (pin 1)) (node (ref RR10) (pin 1))) -(net (code 75) (name "Rtest_led.led[3].res.a") +(net (code 75) (name "Rtest_led.led[3].package.k") (node (ref RD7) (pin 1)) (node (ref RR11) (pin 1))) (net (code 76) (name "Roled.reset") (node (ref RU6) (pin 8)) (node (ref RJ19) (pin 9))) -(net (code 77) (name "Roled.device.vcomh") +(net (code 77) (name "Roled.device.iref") + (node (ref RJ19) (pin 6)) + (node (ref RR12) (pin 1))) +(net (code 78) (name "Roled.device.vcomh") (node (ref RJ19) (pin 29)) (node (ref RJ19) (pin 3)) (node (ref RC33) (pin 1))) -(net (code 78) (name "Roled.device.vsl") +(net (code 79) (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") +(net (code 80) (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))) (net (code 81) (name "Roled.vsl_res.b") (node (ref RR13) (pin 2)) (node (ref RD8) (pin 2))) @@ -1998,7 +1998,7 @@ (node (ref RJ20) (pin 1))) (net (code 96) (name "Rcam.device.y.1") (node (ref RJ20) (pin 2))) -(net (code 97) (name "Rcam.reset_cap.pos") +(net (code 97) (name "Rcam.device.reset") (node (ref RJ20) (pin 19)) (node (ref RC38) (pin 1)) (node (ref RR14) (pin 2))) diff --git a/examples/RobotCrawler/RobotCrawler.svgpcb.js b/examples/RobotCrawler/RobotCrawler.svgpcb.js index 92b03aad9..fc541e07f 100644 --- a/examples/RobotCrawler/RobotCrawler.svgpcb.js +++ b/examples/RobotCrawler/RobotCrawler.svgpcb.js @@ -650,8 +650,8 @@ board.setNetlist([ {name: "Rservos_cam[0].fb", pads: [["RJ14", "4"], ["RU7", "13"]]}, {name: "Rservos_cam[1].pwm", pads: [["RJ15", "1"], ["RU7", "29"]]}, {name: "Rservos_cam[1].fb", pads: [["RJ15", "4"], ["RU7", "16"]]}, - {name: "Rreg_14v.fb.output", pads: [["RU3", "3"], ["RR1", "2"], ["RR2", "1"], ["RC5", "2"]]}, - {name: "Rreg_14v.inductor.b", pads: [["RU3", "1"], ["RL1", "2"], ["RD1", "2"]]}, + {name: "Rreg_14v.ic.sw", pads: [["RU3", "1"], ["RL1", "2"], ["RD1", "2"]]}, + {name: "Rreg_14v.ic.fb", pads: [["RU3", "3"], ["RR1", "2"], ["RR2", "1"], ["RC5", "2"]]}, {name: "Rmcu.program_uart_node.a_tx", pads: [["RU6", "37"], ["RJ16", "3"]]}, {name: "Rmcu.program_uart_node.b_tx", pads: [["RU6", "36"], ["RJ16", "4"]]}, {name: "Rmcu.program_en_node", pads: [["RU6", "3"], ["RJ16", "6"], ["RR3", "2"], ["RC14", "1"]]}, @@ -670,7 +670,7 @@ 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.dvdd", 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"]]}, @@ -680,18 +680,18 @@ board.setNetlist([ {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"]]}, - {name: "Rled.res.a", pads: [["RD2", "1"], ["RR6", "1"]]}, + {name: "Rled.package.k", pads: [["RD2", "1"], ["RR6", "1"]]}, {name: "Rservo_led.signal", pads: [["RU7", "33"], ["RD3", "2"]]}, - {name: "Rservo_led.res.a", pads: [["RD3", "1"], ["RR7", "1"]]}, - {name: "Rtest_led.led[0].res.a", pads: [["RD4", "1"], ["RR8", "1"]]}, - {name: "Rtest_led.led[1].res.a", pads: [["RD5", "1"], ["RR9", "1"]]}, - {name: "Rtest_led.led[2].res.a", pads: [["RD6", "1"], ["RR10", "1"]]}, - {name: "Rtest_led.led[3].res.a", pads: [["RD7", "1"], ["RR11", "1"]]}, + {name: "Rservo_led.package.k", pads: [["RD3", "1"], ["RR7", "1"]]}, + {name: "Rtest_led.led[0].package.k", pads: [["RD4", "1"], ["RR8", "1"]]}, + {name: "Rtest_led.led[1].package.k", pads: [["RD5", "1"], ["RR9", "1"]]}, + {name: "Rtest_led.led[2].package.k", pads: [["RD6", "1"], ["RR10", "1"]]}, + {name: "Rtest_led.led[3].package.k", pads: [["RD7", "1"], ["RR11", "1"]]}, {name: "Roled.reset", pads: [["RU6", "8"], ["RJ19", "9"]]}, + {name: "Roled.device.iref", pads: [["RJ19", "6"], ["RR12", "1"]]}, {name: "Roled.device.vcomh", pads: [["RJ19", "29"], ["RJ19", "3"], ["RC33", "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"]]}, {name: "Rcam.dvp8.xclk", pads: [["RU6", "17"], ["RJ20", "12"]]}, @@ -708,7 +708,7 @@ board.setNetlist([ {name: "Rcam.dvp8.y7", pads: [["RU6", "15"], ["RJ20", "13"]]}, {name: "Rcam.device.y.0", pads: [["RJ20", "1"]]}, {name: "Rcam.device.y.1", pads: [["RJ20", "2"]]}, - {name: "Rcam.reset_cap.pos", pads: [["RJ20", "19"], ["RC38", "1"], ["RR14", "2"]]}, + {name: "Rcam.device.reset", pads: [["RJ20", "19"], ["RC38", "1"], ["RR14", "2"]]}, {name: "Rrgbs.din", pads: [["RU6", "32"], ["RD10", "1"]]}, {name: "Rrgbs.dout", pads: [["RD19", "3"]]}, {name: "Rrgbs.led[0].dout", pads: [["RD10", "3"], ["RD11", "1"]]}, diff --git a/examples/RobotDriver/RobotDriver.net b/examples/RobotDriver/RobotDriver.net index d2acc76ff..528f72113 100644 --- a/examples/RobotDriver/RobotDriver.net +++ b/examples/RobotDriver/RobotDriver.net @@ -1150,7 +1150,7 @@ (net (code 8) (name "spk_chain_1.b") (node (ref U7) (pin 5)) (node (ref J7) (pin 2))) -(net (code 9) (name "isense.pwr_in") +(net (code 9) (name "batt.pwr") (node (ref J1) (pin 2)) (node (ref R1) (pin 1)) (node (ref R3) (pin 1))) @@ -1158,21 +1158,21 @@ (node (ref U1) (pin 4)) (node (ref R4) (pin 1)) (node (ref U3) (pin 4))) -(net (code 11) (name "isense.amp.r1.b") - (node (ref U1) (pin 3)) - (node (ref R2) (pin 2)) - (node (ref R4) (pin 2))) -(net (code 12) (name "isense.amp.r2.b") +(net (code 11) (name "isense.amp.amp.inp") (node (ref U1) (pin 1)) (node (ref R3) (pin 2)) (node (ref R5) (pin 2))) -(net (code 13) (name "reg_3v3.fb.output") +(net (code 12) (name "isense.amp.amp.inn") + (node (ref U1) (pin 3)) + (node (ref R2) (pin 2)) + (node (ref R4) (pin 2))) +(net (code 13) (name "reg_3v3.ic.sw") + (node (ref U2) (pin 3)) + (node (ref L1) (pin 1))) +(net (code 14) (name "reg_3v3.ic.fb") (node (ref U2) (pin 5)) (node (ref R6) (pin 2)) (node (ref R7) (pin 1))) -(net (code 14) (name "reg_3v3.power_path.switch") - (node (ref U2) (pin 3)) - (node (ref L1) (pin 1))) (net (code 15) (name "mcu.program_uart_node.a_tx") (node (ref U3) (pin 35)) (node (ref J2) (pin 2))) @@ -1216,21 +1216,21 @@ (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))) -(net (code 31) (name "lcd.c1_cap.neg") - (node (ref J6) (pin 4)) - (node (ref C7) (pin 2))) -(net (code 32) (name "lcd.c2_cap.pos") +(net (code 30) (name "lcd.device.iref") + (node (ref J6) (pin 13)) + (node (ref R11) (pin 1))) +(net (code 31) (name "lcd.device.c2p") (node (ref J6) (pin 1)) (node (ref C8) (pin 1))) -(net (code 33) (name "lcd.c2_cap.neg") +(net (code 32) (name "lcd.device.c2n") (node (ref J6) (pin 2)) (node (ref C8) (pin 2))) -(net (code 34) (name "lcd.iref_res.a") - (node (ref J6) (pin 13)) - (node (ref R11) (pin 1))) +(net (code 33) (name "lcd.device.c1p") + (node (ref J6) (pin 3)) + (node (ref C7) (pin 1))) +(net (code 34) (name "lcd.device.c1n") + (node (ref J6) (pin 4)) + (node (ref C7) (pin 2))) (net (code 35) (name "imu.int1") (node (ref U5) (pin 4))) (net (code 36) (name "imu.int2") @@ -1256,16 +1256,16 @@ (net (code 43) (name "expander.io.led_3") (node (ref U6) (pin 7)) (node (ref RN1) (pin 5))) -(net (code 44) (name "spk_drv.inp_res.b") +(net (code 44) (name "spk_drv.ic.inp") (node (ref U7) (pin 4)) (node (ref R12) (pin 2))) -(net (code 45) (name "spk_drv.inp_cap.pos") - (node (ref R12) (pin 1)) - (node (ref C19) (pin 1))) -(net (code 46) (name "spk_drv.inn_res.b") +(net (code 45) (name "spk_drv.ic.inn") (node (ref U7) (pin 3)) (node (ref R13) (pin 2))) -(net (code 47) (name "spk_drv.inn_cap.pos") +(net (code 46) (name "spk_drv.inp_res.a") + (node (ref R12) (pin 1)) + (node (ref C19) (pin 1))) +(net (code 47) (name "spk_drv.inn_res.a") (node (ref R13) (pin 1)) (node (ref C20) (pin 1))) (net (code 48) (name "ws2812bArray.din") @@ -1298,24 +1298,24 @@ (net (code 57) (name "motor_driver1.bin2") (node (ref U3) (pin 33)) (node (ref U8) (pin 10))) -(net (code 58) (name "motor_driver1.ic.vint") - (node (ref U8) (pin 14)) - (node (ref C22) (pin 1))) -(net (code 59) (name "motor_driver1.vcp_cap.pos") - (node (ref U8) (pin 11)) - (node (ref C23) (pin 1))) -(net (code 60) (name "m1_a.a") +(net (code 58) (name "motor_driver1.aout1") (node (ref U8) (pin 2)) (node (ref J9) (pin 2))) -(net (code 61) (name "m1_a.b") +(net (code 59) (name "motor_driver1.aout2") (node (ref U8) (pin 4)) (node (ref J9) (pin 1))) -(net (code 62) (name "m1_b.a") +(net (code 60) (name "motor_driver1.bout1") (node (ref U8) (pin 7)) (node (ref J10) (pin 2))) -(net (code 63) (name "m1_b.b") +(net (code 61) (name "motor_driver1.bout2") (node (ref U8) (pin 5)) (node (ref J10) (pin 1))) +(net (code 62) (name "motor_driver1.ic.vint") + (node (ref U8) (pin 14)) + (node (ref C22) (pin 1))) +(net (code 63) (name "motor_driver1.ic.vcp") + (node (ref U8) (pin 11)) + (node (ref C23) (pin 1))) (net (code 64) (name "motor_driver2.ain1") (node (ref U3) (pin 26)) (node (ref U9) (pin 16))) @@ -1328,24 +1328,24 @@ (net (code 67) (name "motor_driver2.bin2") (node (ref U3) (pin 28)) (node (ref U9) (pin 10))) -(net (code 68) (name "motor_driver2.ic.vint") - (node (ref U9) (pin 14)) - (node (ref C25) (pin 1))) -(net (code 69) (name "motor_driver2.vcp_cap.pos") - (node (ref U9) (pin 11)) - (node (ref C26) (pin 1))) -(net (code 70) (name "m2_a.a") +(net (code 68) (name "motor_driver2.aout1") (node (ref U9) (pin 2)) (node (ref J11) (pin 2))) -(net (code 71) (name "m2_a.b") +(net (code 69) (name "motor_driver2.aout2") (node (ref U9) (pin 4)) (node (ref J11) (pin 1))) -(net (code 72) (name "m2_b.a") +(net (code 70) (name "motor_driver2.bout1") (node (ref U9) (pin 7)) (node (ref J12) (pin 2))) -(net (code 73) (name "m2_b.b") +(net (code 71) (name "motor_driver2.bout2") (node (ref U9) (pin 5)) (node (ref J12) (pin 1))) +(net (code 72) (name "motor_driver2.ic.vint") + (node (ref U9) (pin 14)) + (node (ref C25) (pin 1))) +(net (code 73) (name "motor_driver2.ic.vcp") + (node (ref U9) (pin 11)) + (node (ref C26) (pin 1))) (net (code 74) (name "servo.pwm") (node (ref U3) (pin 37)) (node (ref J13) (pin 1))) diff --git a/examples/RobotDriver/RobotDriver.svgpcb.js b/examples/RobotDriver/RobotDriver.svgpcb.js index 41710b5d2..da1c92f44 100644 --- a/examples/RobotDriver/RobotDriver.svgpcb.js +++ b/examples/RobotDriver/RobotDriver.svgpcb.js @@ -425,12 +425,12 @@ board.setNetlist([ {name: "spk_chain_0", pads: [["U3", "11"], ["TP6", "1"], ["C19", "2"]]}, {name: "spk_chain_1.a", pads: [["U7", "8"], ["J7", "1"]]}, {name: "spk_chain_1.b", pads: [["U7", "5"], ["J7", "2"]]}, - {name: "isense.pwr_in", pads: [["J1", "2"], ["R1", "1"], ["R3", "1"]]}, + {name: "batt.pwr", pads: [["J1", "2"], ["R1", "1"], ["R3", "1"]]}, {name: "isense.out", pads: [["U1", "4"], ["R4", "1"], ["U3", "4"]]}, - {name: "isense.amp.r1.b", pads: [["U1", "3"], ["R2", "2"], ["R4", "2"]]}, - {name: "isense.amp.r2.b", pads: [["U1", "1"], ["R3", "2"], ["R5", "2"]]}, - {name: "reg_3v3.fb.output", pads: [["U2", "5"], ["R6", "2"], ["R7", "1"]]}, - {name: "reg_3v3.power_path.switch", pads: [["U2", "3"], ["L1", "1"]]}, + {name: "isense.amp.amp.inp", pads: [["U1", "1"], ["R3", "2"], ["R5", "2"]]}, + {name: "isense.amp.amp.inn", pads: [["U1", "3"], ["R2", "2"], ["R4", "2"]]}, + {name: "reg_3v3.ic.sw", pads: [["U2", "3"], ["L1", "1"]]}, + {name: "reg_3v3.ic.fb", pads: [["U2", "5"], ["R6", "2"], ["R7", "1"]]}, {name: "mcu.program_uart_node.a_tx", pads: [["U3", "35"], ["J2", "2"]]}, {name: "mcu.program_uart_node.b_tx", pads: [["U3", "34"], ["J2", "3"]]}, {name: "mcu.program_en_node", pads: [["U3", "3"], ["R8", "2"], ["C6", "1"]]}, @@ -446,11 +446,11 @@ board.setNetlist([ {name: "lcd.dc", pads: [["U3", "10"], ["J6", "10"]]}, {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"]]}, - {name: "lcd.c2_cap.neg", pads: [["J6", "2"], ["C8", "2"]]}, - {name: "lcd.iref_res.a", pads: [["J6", "13"], ["R11", "1"]]}, + {name: "lcd.device.iref", pads: [["J6", "13"], ["R11", "1"]]}, + {name: "lcd.device.c2p", pads: [["J6", "1"], ["C8", "1"]]}, + {name: "lcd.device.c2n", pads: [["J6", "2"], ["C8", "2"]]}, + {name: "lcd.device.c1p", pads: [["J6", "3"], ["C7", "1"]]}, + {name: "lcd.device.c1n", pads: [["J6", "4"], ["C7", "2"]]}, {name: "imu.int1", pads: [["U5", "4"]]}, {name: "imu.int2", pads: [["U5", "9"]]}, {name: "expander.io.tof_reset_0", pads: [["J3", "6"], ["U6", "10"]]}, @@ -460,10 +460,10 @@ board.setNetlist([ {name: "expander.io.led_1", pads: [["U6", "5"], ["RN1", "7"]]}, {name: "expander.io.led_2", pads: [["U6", "6"], ["RN1", "6"]]}, {name: "expander.io.led_3", pads: [["U6", "7"], ["RN1", "5"]]}, - {name: "spk_drv.inp_res.b", pads: [["U7", "4"], ["R12", "2"]]}, - {name: "spk_drv.inp_cap.pos", pads: [["R12", "1"], ["C19", "1"]]}, - {name: "spk_drv.inn_res.b", pads: [["U7", "3"], ["R13", "2"]]}, - {name: "spk_drv.inn_cap.pos", pads: [["R13", "1"], ["C20", "1"]]}, + {name: "spk_drv.ic.inp", pads: [["U7", "4"], ["R12", "2"]]}, + {name: "spk_drv.ic.inn", pads: [["U7", "3"], ["R13", "2"]]}, + {name: "spk_drv.inp_res.a", pads: [["R12", "1"], ["C19", "1"]]}, + {name: "spk_drv.inn_res.a", pads: [["R13", "1"], ["C20", "1"]]}, {name: "ws2812bArray.din", pads: [["U3", "23"], ["D6", "4"]]}, {name: "ws2812bArray.dout", pads: [["D10", "2"], ["J8", "2"]]}, {name: "ws2812bArray.led[0].dout", pads: [["D6", "2"], ["D7", "4"]]}, @@ -474,22 +474,22 @@ board.setNetlist([ {name: "motor_driver1.ain2", pads: [["U3", "31"], ["U8", "15"]]}, {name: "motor_driver1.bin1", pads: [["U3", "36"], ["U8", "9"]]}, {name: "motor_driver1.bin2", pads: [["U3", "33"], ["U8", "10"]]}, + {name: "motor_driver1.aout1", pads: [["U8", "2"], ["J9", "2"]]}, + {name: "motor_driver1.aout2", pads: [["U8", "4"], ["J9", "1"]]}, + {name: "motor_driver1.bout1", pads: [["U8", "7"], ["J10", "2"]]}, + {name: "motor_driver1.bout2", pads: [["U8", "5"], ["J10", "1"]]}, {name: "motor_driver1.ic.vint", pads: [["U8", "14"], ["C22", "1"]]}, - {name: "motor_driver1.vcp_cap.pos", pads: [["U8", "11"], ["C23", "1"]]}, - {name: "m1_a.a", pads: [["U8", "2"], ["J9", "2"]]}, - {name: "m1_a.b", pads: [["U8", "4"], ["J9", "1"]]}, - {name: "m1_b.a", pads: [["U8", "7"], ["J10", "2"]]}, - {name: "m1_b.b", pads: [["U8", "5"], ["J10", "1"]]}, + {name: "motor_driver1.ic.vcp", pads: [["U8", "11"], ["C23", "1"]]}, {name: "motor_driver2.ain1", pads: [["U3", "26"], ["U9", "16"]]}, {name: "motor_driver2.ain2", pads: [["U3", "27"], ["U9", "15"]]}, {name: "motor_driver2.bin1", pads: [["U3", "29"], ["U9", "9"]]}, {name: "motor_driver2.bin2", pads: [["U3", "28"], ["U9", "10"]]}, + {name: "motor_driver2.aout1", pads: [["U9", "2"], ["J11", "2"]]}, + {name: "motor_driver2.aout2", pads: [["U9", "4"], ["J11", "1"]]}, + {name: "motor_driver2.bout1", pads: [["U9", "7"], ["J12", "2"]]}, + {name: "motor_driver2.bout2", pads: [["U9", "5"], ["J12", "1"]]}, {name: "motor_driver2.ic.vint", pads: [["U9", "14"], ["C25", "1"]]}, - {name: "motor_driver2.vcp_cap.pos", pads: [["U9", "11"], ["C26", "1"]]}, - {name: "m2_a.a", pads: [["U9", "2"], ["J11", "2"]]}, - {name: "m2_a.b", pads: [["U9", "4"], ["J11", "1"]]}, - {name: "m2_b.a", pads: [["U9", "7"], ["J12", "2"]]}, - {name: "m2_b.b", pads: [["U9", "5"], ["J12", "1"]]}, + {name: "motor_driver2.ic.vcp", pads: [["U9", "11"], ["C26", "1"]]}, {name: "servo.pwm", pads: [["U3", "37"], ["J13", "1"]]}, {name: "led_res.a.0", pads: [["D2", "1"], ["RN1", "1"]]}, {name: "led_res.a.1", pads: [["D3", "1"], ["RN1", "2"]]}, diff --git a/examples/RobotOwl/RobotOwl.net b/examples/RobotOwl/RobotOwl.net index 96ce056f5..a6ae07f9d 100644 --- a/examples/RobotOwl/RobotOwl.net +++ b/examples/RobotOwl/RobotOwl.net @@ -673,14 +673,14 @@ (node (ref J1) (pin 23)) (node (ref C7) (pin 1)) (node (ref C8) (pin 1))) -(net (code 5) (name "reg_12v.fb.output") - (node (ref U2) (pin 3)) - (node (ref R1) (pin 2)) - (node (ref R2) (pin 1))) -(net (code 6) (name "reg_12v.power_path.switch") +(net (code 5) (name "reg_12v.ic.sw") (node (ref U2) (pin 1)) (node (ref L1) (pin 2)) (node (ref D1) (pin 2))) +(net (code 6) (name "reg_12v.ic.fb") + (node (ref U2) (pin 3)) + (node (ref R1) (pin 2)) + (node (ref R2) (pin 1))) (net (code 7) (name "mic.clk") (node (ref U1) (pin 12)) (node (ref U3) (pin 4))) @@ -691,23 +691,23 @@ (node (ref U1) (pin 38)) (node (ref R3) (pin 2)) (node (ref D2) (pin 1))) -(net (code 10) (name "oled22.i2c.scl") +(net (code 10) (name "oled22.reset") + (node (ref J1) (pin 9)) + (node (ref U5) (pin 2)) + (node (ref R5) (pin 2))) +(net (code 11) (name "oled22.i2c.scl") (node (ref U1) (pin 4)) (node (ref J1) (pin 13))) -(net (code 11) (name "oled22.i2c.sda") +(net (code 12) (name "oled22.i2c.sda") (node (ref U1) (pin 3)) (node (ref J1) (pin 14)) (node (ref J1) (pin 15))) -(net (code 12) (name "oled22.device.vcomh") - (node (ref J1) (pin 22)) - (node (ref C4) (pin 1))) -(net (code 13) (name "oled22.iref_res.a") +(net (code 13) (name "oled22.device.iref") (node (ref J1) (pin 21)) (node (ref R4) (pin 1))) -(net (code 14) (name "oled_rst.nreset") - (node (ref J1) (pin 9)) - (node (ref U5) (pin 2)) - (node (ref R5) (pin 2))) +(net (code 14) (name "oled22.device.vcomh") + (node (ref J1) (pin 22)) + (node (ref C4) (pin 1))) (net (code 15) (name "spk_drv.i2s.sck") (node (ref U1) (pin 35)) (node (ref U6) (pin C1))) diff --git a/examples/RobotOwl/RobotOwl.svgpcb.js b/examples/RobotOwl/RobotOwl.svgpcb.js index 87e1f9374..6f6094ff7 100644 --- a/examples/RobotOwl/RobotOwl.svgpcb.js +++ b/examples/RobotOwl/RobotOwl.svgpcb.js @@ -246,16 +246,16 @@ board.setNetlist([ {name: "vusb", pads: [["U1", "20"], ["TP2", "1"], ["U2", "4"], ["U2", "5"], ["L1", "1"], ["C1", "1"], ["U6", "A1"], ["U6", "A2"], ["C9", "1"], ["C10", "1"], ["J3", "2"], ["J4", "2"], ["D3", "1"], ["D4", "1"], ["D5", "1"], ["D6", "1"], ["D7", "1"], ["D8", "1"], ["D9", "1"], ["D10", "1"], ["D11", "1"], ["D12", "1"], ["D13", "1"], ["D14", "1"], ["J5", "1"]]}, {name: "v3v3", pads: [["U1", "1"], ["TP3", "1"], ["U3", "5"], ["C3", "1"], ["R3", "1"], ["J1", "5"], ["J1", "6"], ["C5", "1"], ["C6", "1"], ["U5", "3"], ["R5", "1"]]}, {name: "v12", pads: [["R1", "1"], ["C2", "1"], ["D1", "1"], ["TP4", "1"], ["J1", "23"], ["C7", "1"], ["C8", "1"]]}, - {name: "reg_12v.fb.output", pads: [["U2", "3"], ["R1", "2"], ["R2", "1"]]}, - {name: "reg_12v.power_path.switch", pads: [["U2", "1"], ["L1", "2"], ["D1", "2"]]}, + {name: "reg_12v.ic.sw", pads: [["U2", "1"], ["L1", "2"], ["D1", "2"]]}, + {name: "reg_12v.ic.fb", pads: [["U2", "3"], ["R1", "2"], ["R2", "1"]]}, {name: "mic.clk", pads: [["U1", "12"], ["U3", "4"]]}, {name: "mic.data", pads: [["U1", "19"], ["U3", "1"]]}, {name: "photodiode.out", pads: [["U1", "38"], ["R3", "2"], ["D2", "1"]]}, + {name: "oled22.reset", pads: [["J1", "9"], ["U5", "2"], ["R5", "2"]]}, {name: "oled22.i2c.scl", pads: [["U1", "4"], ["J1", "13"]]}, {name: "oled22.i2c.sda", pads: [["U1", "3"], ["J1", "14"], ["J1", "15"]]}, + {name: "oled22.device.iref", pads: [["J1", "21"], ["R4", "1"]]}, {name: "oled22.device.vcomh", pads: [["J1", "22"], ["C4", "1"]]}, - {name: "oled22.iref_res.a", pads: [["J1", "21"], ["R4", "1"]]}, - {name: "oled_rst.nreset", pads: [["J1", "9"], ["U5", "2"], ["R5", "2"]]}, {name: "spk_drv.i2s.sck", pads: [["U1", "35"], ["U6", "C1"]]}, {name: "spk_drv.i2s.ws", pads: [["U1", "37"], ["U6", "C3"]]}, {name: "spk_drv.i2s.sd", pads: [["U1", "36"], ["U6", "B1"]]}, diff --git a/examples/SevenSegment/SevenSegment.net b/examples/SevenSegment/SevenSegment.net index 3d5c16536..c3a211980 100644 --- a/examples/SevenSegment/SevenSegment.net +++ b/examples/SevenSegment/SevenSegment.net @@ -2444,19 +2444,19 @@ (net (code 14) (name "Cledr.signal") (node (ref CU2) (pin 4)) (node (ref CD2) (pin 2))) -(net (code 15) (name "Cledr.res.a") +(net (code 15) (name "Cledr.package.k") (node (ref CD2) (pin 1)) (node (ref CR2) (pin 1))) (net (code 16) (name "Cledg.signal") (node (ref CU2) (pin 5)) (node (ref CD3) (pin 2))) -(net (code 17) (name "Cledg.res.a") +(net (code 17) (name "Cledg.package.k") (node (ref CD3) (pin 1)) (node (ref CR3) (pin 1))) (net (code 18) (name "Cledb.signal") (node (ref CU2) (pin 6)) (node (ref CD4) (pin 2))) -(net (code 19) (name "Cledb.res.a") +(net (code 19) (name "Cledb.package.k") (node (ref CD4) (pin 1)) (node (ref CR4) (pin 1))) (net (code 20) (name "Csw[0].out") @@ -2471,7 +2471,7 @@ (net (code 23) (name "Csw[3].out") (node (ref CU2) (pin 35)) (node (ref CSW4) (pin 2))) -(net (code 24) (name "Cals.dvi_res.b") +(net (code 24) (name "Cals.ic.dvi") (node (ref CU4) (pin 5)) (node (ref CR7) (pin 2)) (node (ref CC9) (pin 1))) @@ -2566,111 +2566,111 @@ (net (code 54) (name "Cdigit[1].led[12].dout") (node (ref CD31) (pin 3)) (node (ref CD32) (pin 1))) -(net (code 55) (name "Cdigit[2].dout") +(net (code 55) (name "Cdigit[2].din") + (node (ref CD33) (pin 1)) + (node (ref CD62) (pin 3))) +(net (code 56) (name "Cdigit[2].dout") (node (ref CD46) (pin 3)) (node (ref CD47) (pin 1))) -(net (code 56) (name "Cdigit[2].led[0].dout") +(net (code 57) (name "Cdigit[2].led[0].dout") (node (ref CD33) (pin 3)) (node (ref CD34) (pin 1))) -(net (code 57) (name "Cdigit[2].led[1].dout") +(net (code 58) (name "Cdigit[2].led[1].dout") (node (ref CD34) (pin 3)) (node (ref CD35) (pin 1))) -(net (code 58) (name "Cdigit[2].led[2].dout") +(net (code 59) (name "Cdigit[2].led[2].dout") (node (ref CD35) (pin 3)) (node (ref CD36) (pin 1))) -(net (code 59) (name "Cdigit[2].led[3].dout") +(net (code 60) (name "Cdigit[2].led[3].dout") (node (ref CD36) (pin 3)) (node (ref CD37) (pin 1))) -(net (code 60) (name "Cdigit[2].led[4].dout") +(net (code 61) (name "Cdigit[2].led[4].dout") (node (ref CD37) (pin 3)) (node (ref CD38) (pin 1))) -(net (code 61) (name "Cdigit[2].led[5].dout") +(net (code 62) (name "Cdigit[2].led[5].dout") (node (ref CD38) (pin 3)) (node (ref CD39) (pin 1))) -(net (code 62) (name "Cdigit[2].led[6].dout") +(net (code 63) (name "Cdigit[2].led[6].dout") (node (ref CD39) (pin 3)) (node (ref CD40) (pin 1))) -(net (code 63) (name "Cdigit[2].led[7].dout") +(net (code 64) (name "Cdigit[2].led[7].dout") (node (ref CD40) (pin 3)) (node (ref CD41) (pin 1))) -(net (code 64) (name "Cdigit[2].led[8].dout") +(net (code 65) (name "Cdigit[2].led[8].dout") (node (ref CD41) (pin 3)) (node (ref CD42) (pin 1))) -(net (code 65) (name "Cdigit[2].led[9].dout") +(net (code 66) (name "Cdigit[2].led[9].dout") (node (ref CD42) (pin 3)) (node (ref CD43) (pin 1))) -(net (code 66) (name "Cdigit[2].led[10].dout") +(net (code 67) (name "Cdigit[2].led[10].dout") (node (ref CD43) (pin 3)) (node (ref CD44) (pin 1))) -(net (code 67) (name "Cdigit[2].led[11].dout") +(net (code 68) (name "Cdigit[2].led[11].dout") (node (ref CD44) (pin 3)) (node (ref CD45) (pin 1))) -(net (code 68) (name "Cdigit[2].led[12].dout") +(net (code 69) (name "Cdigit[2].led[12].dout") (node (ref CD45) (pin 3)) (node (ref CD46) (pin 1))) -(net (code 69) (name "Cdigit[3].dout") +(net (code 70) (name "Cdigit[3].dout") (node (ref CD60) (pin 3))) -(net (code 70) (name "Cdigit[3].led[0].dout") +(net (code 71) (name "Cdigit[3].led[0].dout") (node (ref CD47) (pin 3)) (node (ref CD48) (pin 1))) -(net (code 71) (name "Cdigit[3].led[1].dout") +(net (code 72) (name "Cdigit[3].led[1].dout") (node (ref CD48) (pin 3)) (node (ref CD49) (pin 1))) -(net (code 72) (name "Cdigit[3].led[2].dout") +(net (code 73) (name "Cdigit[3].led[2].dout") (node (ref CD49) (pin 3)) (node (ref CD50) (pin 1))) -(net (code 73) (name "Cdigit[3].led[3].dout") +(net (code 74) (name "Cdigit[3].led[3].dout") (node (ref CD50) (pin 3)) (node (ref CD51) (pin 1))) -(net (code 74) (name "Cdigit[3].led[4].dout") +(net (code 75) (name "Cdigit[3].led[4].dout") (node (ref CD51) (pin 3)) (node (ref CD52) (pin 1))) -(net (code 75) (name "Cdigit[3].led[5].dout") +(net (code 76) (name "Cdigit[3].led[5].dout") (node (ref CD52) (pin 3)) (node (ref CD53) (pin 1))) -(net (code 76) (name "Cdigit[3].led[6].dout") +(net (code 77) (name "Cdigit[3].led[6].dout") (node (ref CD53) (pin 3)) (node (ref CD54) (pin 1))) -(net (code 77) (name "Cdigit[3].led[7].dout") +(net (code 78) (name "Cdigit[3].led[7].dout") (node (ref CD54) (pin 3)) (node (ref CD55) (pin 1))) -(net (code 78) (name "Cdigit[3].led[8].dout") +(net (code 79) (name "Cdigit[3].led[8].dout") (node (ref CD55) (pin 3)) (node (ref CD56) (pin 1))) -(net (code 79) (name "Cdigit[3].led[9].dout") +(net (code 80) (name "Cdigit[3].led[9].dout") (node (ref CD56) (pin 3)) (node (ref CD57) (pin 1))) -(net (code 80) (name "Cdigit[3].led[10].dout") +(net (code 81) (name "Cdigit[3].led[10].dout") (node (ref CD57) (pin 3)) (node (ref CD58) (pin 1))) -(net (code 81) (name "Cdigit[3].led[11].dout") +(net (code 82) (name "Cdigit[3].led[11].dout") (node (ref CD58) (pin 3)) (node (ref CD59) (pin 1))) -(net (code 82) (name "Cdigit[3].led[12].dout") +(net (code 83) (name "Cdigit[3].led[12].dout") (node (ref CD59) (pin 3)) (node (ref CD60) (pin 1))) -(net (code 83) (name "Ccenter.dout") - (node (ref CD33) (pin 1)) - (node (ref CD62) (pin 3))) -(net (code 84) (name "Ccenter.led[0].dout") - (node (ref CD61) (pin 3)) - (node (ref CD62) (pin 1))) -(net (code 85) (name "Cmeta.dout") +(net (code 84) (name "Ccenter.din") (node (ref CD61) (pin 1)) (node (ref CD64) (pin 3))) +(net (code 85) (name "Ccenter.led[0].dout") + (node (ref CD61) (pin 3)) + (node (ref CD62) (pin 1))) (net (code 86) (name "Cmeta.led[0].dout") (node (ref CD63) (pin 3)) (node (ref CD64) (pin 1))) -(net (code 87) (name "Cspk_drv.inp_res.b") +(net (code 87) (name "Cspk_drv.ic.inp") (node (ref CU6) (pin 4)) (node (ref CR9) (pin 2))) -(net (code 88) (name "Cspk_drv.inp_cap.pos") - (node (ref CR9) (pin 1)) - (node (ref CC74) (pin 1))) -(net (code 89) (name "Cspk_drv.inn_res.b") +(net (code 88) (name "Cspk_drv.ic.inn") (node (ref CU6) (pin 3)) (node (ref CR10) (pin 2))) -(net (code 90) (name "Cspk_drv.inn_cap.pos") +(net (code 89) (name "Cspk_drv.inp_res.a") + (node (ref CR9) (pin 1)) + (node (ref CC74) (pin 1))) +(net (code 90) (name "Cspk_drv.inn_res.a") (node (ref CR10) (pin 1)) (node (ref CC75) (pin 1))) (net (code 91) (name "Cv5v_sense.output") diff --git a/examples/SevenSegment/SevenSegment.svgpcb.js b/examples/SevenSegment/SevenSegment.svgpcb.js index d82b7f7cb..1177ff29c 100644 --- a/examples/SevenSegment/SevenSegment.svgpcb.js +++ b/examples/SevenSegment/SevenSegment.svgpcb.js @@ -886,16 +886,16 @@ board.setNetlist([ {name: "Cmcu.program_en_node", pads: [["CU2", "3"], ["CJ2", "6"], ["CR1", "2"], ["CC5", "1"]]}, {name: "Cmcu.program_boot_node", pads: [["CU2", "27"], ["CJ2", "2"]]}, {name: "Cledr.signal", pads: [["CU2", "4"], ["CD2", "2"]]}, - {name: "Cledr.res.a", pads: [["CD2", "1"], ["CR2", "1"]]}, + {name: "Cledr.package.k", pads: [["CD2", "1"], ["CR2", "1"]]}, {name: "Cledg.signal", pads: [["CU2", "5"], ["CD3", "2"]]}, - {name: "Cledg.res.a", pads: [["CD3", "1"], ["CR3", "1"]]}, + {name: "Cledg.package.k", pads: [["CD3", "1"], ["CR3", "1"]]}, {name: "Cledb.signal", pads: [["CU2", "6"], ["CD4", "2"]]}, - {name: "Cledb.res.a", pads: [["CD4", "1"], ["CR4", "1"]]}, + {name: "Cledb.package.k", pads: [["CD4", "1"], ["CR4", "1"]]}, {name: "Csw[0].out", pads: [["CU2", "32"], ["CSW1", "2"]]}, {name: "Csw[1].out", pads: [["CU2", "33"], ["CSW2", "2"]]}, {name: "Csw[2].out", pads: [["CU2", "34"], ["CSW3", "2"]]}, {name: "Csw[3].out", pads: [["CU2", "35"], ["CSW4", "2"]]}, - {name: "Cals.dvi_res.b", pads: [["CU4", "5"], ["CR7", "2"], ["CC9", "1"]]}, + {name: "Cals.ic.dvi", pads: [["CU4", "5"], ["CR7", "2"], ["CC9", "1"]]}, {name: "Crgb_shift.input", pads: [["CU2", "12"], ["CU5", "2"]]}, {name: "Crgb_shift.output", pads: [["CU5", "4"], ["CTP6", "1"], ["CD5", "1"]]}, {name: "Cdigit[0].dout", pads: [["CD18", "3"], ["CD19", "1"]]}, @@ -926,6 +926,7 @@ board.setNetlist([ {name: "Cdigit[1].led[10].dout", pads: [["CD29", "3"], ["CD30", "1"]]}, {name: "Cdigit[1].led[11].dout", pads: [["CD30", "3"], ["CD31", "1"]]}, {name: "Cdigit[1].led[12].dout", pads: [["CD31", "3"], ["CD32", "1"]]}, + {name: "Cdigit[2].din", pads: [["CD33", "1"], ["CD62", "3"]]}, {name: "Cdigit[2].dout", pads: [["CD46", "3"], ["CD47", "1"]]}, {name: "Cdigit[2].led[0].dout", pads: [["CD33", "3"], ["CD34", "1"]]}, {name: "Cdigit[2].led[1].dout", pads: [["CD34", "3"], ["CD35", "1"]]}, @@ -954,14 +955,13 @@ board.setNetlist([ {name: "Cdigit[3].led[10].dout", pads: [["CD57", "3"], ["CD58", "1"]]}, {name: "Cdigit[3].led[11].dout", pads: [["CD58", "3"], ["CD59", "1"]]}, {name: "Cdigit[3].led[12].dout", pads: [["CD59", "3"], ["CD60", "1"]]}, - {name: "Ccenter.dout", pads: [["CD33", "1"], ["CD62", "3"]]}, + {name: "Ccenter.din", pads: [["CD61", "1"], ["CD64", "3"]]}, {name: "Ccenter.led[0].dout", pads: [["CD61", "3"], ["CD62", "1"]]}, - {name: "Cmeta.dout", pads: [["CD61", "1"], ["CD64", "3"]]}, {name: "Cmeta.led[0].dout", pads: [["CD63", "3"], ["CD64", "1"]]}, - {name: "Cspk_drv.inp_res.b", pads: [["CU6", "4"], ["CR9", "2"]]}, - {name: "Cspk_drv.inp_cap.pos", pads: [["CR9", "1"], ["CC74", "1"]]}, - {name: "Cspk_drv.inn_res.b", pads: [["CU6", "3"], ["CR10", "2"]]}, - {name: "Cspk_drv.inn_cap.pos", pads: [["CR10", "1"], ["CC75", "1"]]}, + {name: "Cspk_drv.ic.inp", pads: [["CU6", "4"], ["CR9", "2"]]}, + {name: "Cspk_drv.ic.inn", pads: [["CU6", "3"], ["CR10", "2"]]}, + {name: "Cspk_drv.inp_res.a", pads: [["CR9", "1"], ["CC74", "1"]]}, + {name: "Cspk_drv.inn_res.a", pads: [["CR10", "1"], ["CC75", "1"]]}, {name: "Cv5v_sense.output", pads: [["CU2", "7"], ["CR11", "2"], ["CR12", "1"]]} ]) diff --git a/examples/Simon/Simon.net b/examples/Simon/Simon.net index ea521536c..7cb0cf45a 100644 --- a/examples/Simon/Simon.net +++ b/examples/Simon/Simon.net @@ -564,60 +564,60 @@ (net (code 10) (name "spk_drv.spk.b") (node (ref U2) (pin 8)) (node (ref J1) (pin 2))) -(net (code 11) (name "spk_drv.byp_cap.pos") +(net (code 11) (name "spk_drv.ic.inp") (node (ref U2) (pin 2)) (node (ref U2) (pin 3)) (node (ref C2) (pin 1))) -(net (code 12) (name "spk_drv.sig_cap.pos") - (node (ref C3) (pin 1)) - (node (ref R1) (pin 1))) -(net (code 13) (name "spk_drv.sig_res.b") +(net (code 12) (name "spk_drv.ic.inm") (node (ref U2) (pin 4)) (node (ref R1) (pin 2)) (node (ref R2) (pin 1))) -(net (code 14) (name "rgb.red_res.a") +(net (code 13) (name "spk_drv.sig_cap.pos") + (node (ref C3) (pin 1)) + (node (ref R1) (pin 1))) +(net (code 14) (name "rgb.package.k_red") (node (ref D1) (pin 3)) (node (ref R3) (pin 1))) -(net (code 15) (name "rgb.green_res.a") +(net (code 15) (name "rgb.package.k_green") (node (ref D1) (pin 4)) (node (ref R4) (pin 1))) -(net (code 16) (name "rgb.blue_res.a") +(net (code 16) (name "rgb.package.k_blue") (node (ref D1) (pin 1)) (node (ref R5) (pin 1))) (net (code 17) (name "sw.out") (node (ref U1) (pin 27)) (node (ref SW1) (pin 1)) (node (ref R6) (pin 2))) -(net (code 18) (name "btn_pull[0].io") +(net (code 18) (name "btn[0].led_a") + (node (ref J2) (pin 1)) + (node (ref Q2) (pin 2))) +(net (code 19) (name "btn[0].sw1") (node (ref U1) (pin 6)) (node (ref J2) (pin 3)) (node (ref R7) (pin 2))) -(net (code 19) (name "btn_pull[1].io") +(net (code 20) (name "btn[1].sw1") (node (ref U1) (pin 8)) (node (ref J3) (pin 3)) (node (ref R8) (pin 2))) -(net (code 20) (name "btn_pull[2].io") +(net (code 21) (name "btn[2].sw1") (node (ref U1) (pin 10)) (node (ref J4) (pin 3)) (node (ref R9) (pin 2))) -(net (code 21) (name "btn_pull[3].io") +(net (code 22) (name "btn[3].sw1") (node (ref U1) (pin 12)) (node (ref J5) (pin 3)) (node (ref R10) (pin 2))) -(net (code 22) (name "pwr.fb.output") - (node (ref U3) (pin 3)) - (node (ref R11) (pin 2)) - (node (ref R12) (pin 1))) -(net (code 23) (name "pwr.power_path.switch") +(net (code 23) (name "pwr.ic.sw") (node (ref U3) (pin 1)) (node (ref L1) (pin 2)) (node (ref D2) (pin 2))) -(net (code 24) (name "btn_drv[0].control") +(net (code 24) (name "pwr.ic.fb") + (node (ref U3) (pin 3)) + (node (ref R11) (pin 2)) + (node (ref R12) (pin 1))) +(net (code 25) (name "btn_drv[0].control") (node (ref U1) (pin 5)) (node (ref Q1) (pin 1))) -(net (code 25) (name "btn_drv[0].output") - (node (ref J2) (pin 1)) - (node (ref Q2) (pin 2))) (net (code 26) (name "btn_drv[0].pre.drain") (node (ref Q1) (pin 3)) (node (ref R13) (pin 2)) diff --git a/examples/Simon/Simon.svgpcb.js b/examples/Simon/Simon.svgpcb.js index 114aceda0..2968fe238 100644 --- a/examples/Simon/Simon.svgpcb.js +++ b/examples/Simon/Simon.svgpcb.js @@ -217,21 +217,21 @@ board.setNetlist([ {name: "spk_drv.sig", pads: [["U1", "24"], ["C3", "2"]]}, {name: "spk_drv.spk.a", pads: [["U2", "5"], ["R2", "2"], ["J1", "1"]]}, {name: "spk_drv.spk.b", pads: [["U2", "8"], ["J1", "2"]]}, - {name: "spk_drv.byp_cap.pos", pads: [["U2", "2"], ["U2", "3"], ["C2", "1"]]}, + {name: "spk_drv.ic.inp", pads: [["U2", "2"], ["U2", "3"], ["C2", "1"]]}, + {name: "spk_drv.ic.inm", pads: [["U2", "4"], ["R1", "2"], ["R2", "1"]]}, {name: "spk_drv.sig_cap.pos", pads: [["C3", "1"], ["R1", "1"]]}, - {name: "spk_drv.sig_res.b", pads: [["U2", "4"], ["R1", "2"], ["R2", "1"]]}, - {name: "rgb.red_res.a", pads: [["D1", "3"], ["R3", "1"]]}, - {name: "rgb.green_res.a", pads: [["D1", "4"], ["R4", "1"]]}, - {name: "rgb.blue_res.a", pads: [["D1", "1"], ["R5", "1"]]}, + {name: "rgb.package.k_red", pads: [["D1", "3"], ["R3", "1"]]}, + {name: "rgb.package.k_green", pads: [["D1", "4"], ["R4", "1"]]}, + {name: "rgb.package.k_blue", pads: [["D1", "1"], ["R5", "1"]]}, {name: "sw.out", pads: [["U1", "27"], ["SW1", "1"], ["R6", "2"]]}, - {name: "btn_pull[0].io", pads: [["U1", "6"], ["J2", "3"], ["R7", "2"]]}, - {name: "btn_pull[1].io", pads: [["U1", "8"], ["J3", "3"], ["R8", "2"]]}, - {name: "btn_pull[2].io", pads: [["U1", "10"], ["J4", "3"], ["R9", "2"]]}, - {name: "btn_pull[3].io", pads: [["U1", "12"], ["J5", "3"], ["R10", "2"]]}, - {name: "pwr.fb.output", pads: [["U3", "3"], ["R11", "2"], ["R12", "1"]]}, - {name: "pwr.power_path.switch", pads: [["U3", "1"], ["L1", "2"], ["D2", "2"]]}, + {name: "btn[0].led_a", pads: [["J2", "1"], ["Q2", "2"]]}, + {name: "btn[0].sw1", pads: [["U1", "6"], ["J2", "3"], ["R7", "2"]]}, + {name: "btn[1].sw1", pads: [["U1", "8"], ["J3", "3"], ["R8", "2"]]}, + {name: "btn[2].sw1", pads: [["U1", "10"], ["J4", "3"], ["R9", "2"]]}, + {name: "btn[3].sw1", pads: [["U1", "12"], ["J5", "3"], ["R10", "2"]]}, + {name: "pwr.ic.sw", pads: [["U3", "1"], ["L1", "2"], ["D2", "2"]]}, + {name: "pwr.ic.fb", pads: [["U3", "3"], ["R11", "2"], ["R12", "1"]]}, {name: "btn_drv[0].control", pads: [["U1", "5"], ["Q1", "1"]]}, - {name: "btn_drv[0].output", pads: [["J2", "1"], ["Q2", "2"]]}, {name: "btn_drv[0].pre.drain", pads: [["Q1", "3"], ["R13", "2"], ["Q2", "1"]]}, {name: "btn_drv[1].control", pads: [["U1", "7"], ["Q3", "1"]]}, {name: "btn_drv[1].pre.drain", pads: [["Q3", "3"], ["R14", "2"], ["Q4", "1"]]}, diff --git a/examples/SwdDebugger/SwdDebugger.net b/examples/SwdDebugger/SwdDebugger.net index 9d8fcbbcd..02534c9a2 100644 --- a/examples/SwdDebugger/SwdDebugger.net +++ b/examples/SwdDebugger/SwdDebugger.net @@ -584,75 +584,75 @@ (net (code 8) (name "Susb.conn.cc.cc2") (node (ref SJ1) (pin B5)) (node (ref SR2) (pin 2))) -(net (code 9) (name "Smcu.xtal_node.xi") +(net (code 9) (name "Starget_reg.reset") + (node (ref SU2) (pin 3)) + (node (ref SU3) (pin 28)) + (node (ref SR6) (pin 2))) +(net (code 10) (name "Smcu.xtal_node.xi") (node (ref SU3) (pin 5)) (node (ref SU4) (pin 1))) -(net (code 10) (name "Smcu.xtal_node.xo") +(net (code 11) (name "Smcu.xtal_node.xo") (node (ref SU3) (pin 6)) (node (ref SU4) (pin 3))) -(net (code 11) (name "Smcu.swd_node.swdio") +(net (code 12) (name "Smcu.swd_node.swdio") (node (ref SJ2) (pin 2)) (node (ref SU3) (pin 34))) -(net (code 12) (name "Smcu.swd_node.swclk") +(net (code 13) (name "Smcu.swd_node.swclk") (node (ref SJ2) (pin 4)) (node (ref SU3) (pin 37))) -(net (code 13) (name "Smcu.reset_node") +(net (code 14) (name "Smcu.reset_node") (node (ref SJ2) (pin 10)) (node (ref SU3) (pin 7))) -(net (code 14) (name "Smcu.swd.tdi") +(net (code 15) (name "Smcu.swd.tdi") (node (ref SJ2) (pin 8))) -(net (code 15) (name "Smcu.swd.swo") +(net (code 16) (name "Smcu.swd.swo") (node (ref SJ2) (pin 6)) (node (ref SU3) (pin 39))) -(net (code 16) (name "Sled_tgt.signal") +(net (code 17) (name "Sled_tgt.signal") (node (ref SU3) (pin 30)) (node (ref SD2) (pin 2))) -(net (code 17) (name "Sled_tgt.res.a") +(net (code 18) (name "Sled_tgt.package.k") (node (ref SD2) (pin 1)) (node (ref SR4) (pin 1))) -(net (code 18) (name "Sled_usb.signal") +(net (code 19) (name "Sled_usb.signal") (node (ref SU3) (pin 42)) (node (ref SD3) (pin 2))) -(net (code 19) (name "Sled_usb.res.a") +(net (code 20) (name "Sled_usb.package.k") (node (ref SD3) (pin 1)) (node (ref SR5) (pin 1))) -(net (code 20) (name "Sen_pull.io") - (node (ref SU2) (pin 3)) - (node (ref SU3) (pin 28)) - (node (ref SR6) (pin 2))) -(net (code 21) (name "Starget_drv.swclk_in") +(net (code 21) (name "Starget_drv.reset_in") + (node (ref SU3) (pin 18)) + (node (ref SR10) (pin 1)) + (node (ref SR12) (pin 2)) + (node (ref SSW1) (pin 1))) +(net (code 22) (name "Starget_drv.swclk_in") (node (ref SU3) (pin 26)) (node (ref SR7) (pin 1))) -(net (code 22) (name "Starget_drv.swdio_in") +(net (code 23) (name "Starget_drv.swdio_in") (node (ref SU3) (pin 25)) (node (ref SR9) (pin 1))) -(net (code 23) (name "Starget_drv.swdio_out") +(net (code 24) (name "Starget_drv.swdio_out") (node (ref SU3) (pin 27)) (node (ref SR8) (pin 1)) (node (ref SR9) (pin 2))) -(net (code 24) (name "Starget_drv.reset_out") +(net (code 25) (name "Starget_drv.reset_out") (node (ref SR10) (pin 2)) (node (ref SJ3) (pin 10))) -(net (code 25) (name "Starget_drv.swo_out") +(net (code 26) (name "Starget_drv.swo_out") (node (ref SU3) (pin 31)) (node (ref SR11) (pin 1))) -(net (code 26) (name "Starget_drv.swd.swdio") +(net (code 27) (name "Starget_drv.swd.swdio") (node (ref SR8) (pin 2)) (node (ref SJ3) (pin 2))) -(net (code 27) (name "Starget_drv.swd.swclk") +(net (code 28) (name "Starget_drv.swd.swclk") (node (ref SR7) (pin 2)) (node (ref SJ3) (pin 4))) -(net (code 28) (name "Starget_drv.swo_in") +(net (code 29) (name "Starget_drv.swo_in") (node (ref SR11) (pin 2)) (node (ref SJ3) (pin 6))) -(net (code 29) (name "Sreset_pull.io") - (node (ref SU3) (pin 18)) - (node (ref SR10) (pin 1)) - (node (ref SR12) (pin 2)) - (node (ref SSW1) (pin 1))) (net (code 30) (name "Starget.tdi") (node (ref SJ3) (pin 8))) -(net (code 31) (name "Sled_target.res.a") +(net (code 31) (name "Sled_target.package.k") (node (ref SD4) (pin 1)) (node (ref SR13) (pin 1))) (net (code 32) (name "Starget_sense.output") diff --git a/examples/SwdDebugger/SwdDebugger.svgpcb.js b/examples/SwdDebugger/SwdDebugger.svgpcb.js index 64728d0e8..20d5280d3 100644 --- a/examples/SwdDebugger/SwdDebugger.svgpcb.js +++ b/examples/SwdDebugger/SwdDebugger.svgpcb.js @@ -215,6 +215,7 @@ board.setNetlist([ {name: "Susb_chain_0.d_N", pads: [["SJ1", "A7"], ["SJ1", "B7"], ["SU3", "32"], ["SU5", "1"]]}, {name: "Susb.conn.cc.cc1", pads: [["SJ1", "A5"], ["SR1", "2"]]}, {name: "Susb.conn.cc.cc2", pads: [["SJ1", "B5"], ["SR2", "2"]]}, + {name: "Starget_reg.reset", pads: [["SU2", "3"], ["SU3", "28"], ["SR6", "2"]]}, {name: "Smcu.xtal_node.xi", pads: [["SU3", "5"], ["SU4", "1"]]}, {name: "Smcu.xtal_node.xo", pads: [["SU3", "6"], ["SU4", "3"]]}, {name: "Smcu.swd_node.swdio", pads: [["SJ2", "2"], ["SU3", "34"]]}, @@ -223,10 +224,10 @@ board.setNetlist([ {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_tgt.package.k", 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: "Sled_usb.package.k", pads: [["SD3", "1"], ["SR5", "1"]]}, + {name: "Starget_drv.reset_in", pads: [["SU3", "18"], ["SR10", "1"], ["SR12", "2"], ["SSW1", "1"]]}, {name: "Starget_drv.swclk_in", pads: [["SU3", "26"], ["SR7", "1"]]}, {name: "Starget_drv.swdio_in", pads: [["SU3", "25"], ["SR9", "1"]]}, {name: "Starget_drv.swdio_out", pads: [["SU3", "27"], ["SR8", "1"], ["SR9", "2"]]}, @@ -235,9 +236,8 @@ board.setNetlist([ {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: "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"]]}, + {name: "Sled_target.package.k", pads: [["SD4", "1"], ["SR13", "1"]]}, {name: "Starget_sense.output", pads: [["SU3", "10"], ["SR14", "2"], ["SR15", "1"]]} ]) diff --git a/examples/TestBlinkyArray/TestBlinkyArray.net b/examples/TestBlinkyArray/TestBlinkyArray.net index 91b283ea2..70e3764d0 100644 --- a/examples/TestBlinkyArray/TestBlinkyArray.net +++ b/examples/TestBlinkyArray/TestBlinkyArray.net @@ -382,17 +382,17 @@ (node (ref C6) (pin 1)) (node (ref J2) (pin 1)) (node (ref R5) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.gpio.led_0") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) @@ -423,16 +423,16 @@ (net (code 20) (name "sw.out") (node (ref U2) (pin 8)) (node (ref SW2) (pin 1))) -(net (code 21) (name "led.led[0].res.a") +(net (code 21) (name "led.led[0].package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) -(net (code 22) (name "led.led[1].res.a") +(net (code 22) (name "led.led[1].package.k") (node (ref D2) (pin 1)) (node (ref R7) (pin 1))) -(net (code 23) (name "led.led[2].res.a") +(net (code 23) (name "led.led[2].package.k") (node (ref D3) (pin 1)) (node (ref R8) (pin 1))) -(net (code 24) (name "led.led[3].res.a") +(net (code 24) (name "led.led[3].package.k") (node (ref D4) (pin 1)) (node (ref R9) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js b/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js index 55aa3fd2d..6c66c8649 100644 --- a/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js +++ b/examples/TestBlinkyArray/TestBlinkyArray.svgpcb.js @@ -144,9 +144,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -157,10 +157,10 @@ board.setNetlist([ {name: "mcu.program_boot_node", pads: [["U2", "25"], ["SW1", "1"]]}, {name: "mcu.ic.io2", pads: [["U2", "24"]]}, {name: "sw.out", pads: [["U2", "8"], ["SW2", "1"]]}, - {name: "led.led[0].res.a", pads: [["D1", "1"], ["R6", "1"]]}, - {name: "led.led[1].res.a", pads: [["D2", "1"], ["R7", "1"]]}, - {name: "led.led[2].res.a", pads: [["D3", "1"], ["R8", "1"]]}, - {name: "led.led[3].res.a", pads: [["D4", "1"], ["R9", "1"]]} + {name: "led.led[0].package.k", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "led.led[1].package.k", pads: [["D2", "1"], ["R7", "1"]]}, + {name: "led.led[2].package.k", pads: [["D3", "1"], ["R8", "1"]]}, + {name: "led.led[3].package.k", pads: [["D4", "1"], ["R9", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyBasic/TestBlinkyBasic.net b/examples/TestBlinkyBasic/TestBlinkyBasic.net index e487763f1..a4166c46f 100644 --- a/examples/TestBlinkyBasic/TestBlinkyBasic.net +++ b/examples/TestBlinkyBasic/TestBlinkyBasic.net @@ -48,7 +48,7 @@ (net (code 4) (name "led.signal") (node (ref U1) (pin 10)) (node (ref D1) (pin 2))) -(net (code 5) (name "led.res.a") +(net (code 5) (name "led.package.k") (node (ref D1) (pin 1)) (node (ref R1) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyBasic/TestBlinkyBasic.svgpcb.js b/examples/TestBlinkyBasic/TestBlinkyBasic.svgpcb.js index 88e81f686..252493c03 100644 --- a/examples/TestBlinkyBasic/TestBlinkyBasic.svgpcb.js +++ b/examples/TestBlinkyBasic/TestBlinkyBasic.svgpcb.js @@ -21,7 +21,7 @@ board.setNetlist([ {name: "mcu.pwr_out", pads: [["U1", "29"]]}, {name: "mcu.vusb_out", pads: [["U1", "19"]]}, {name: "led.signal", pads: [["U1", "10"], ["D1", "2"]]}, - {name: "led.res.a", pads: [["D1", "1"], ["R1", "1"]]} + {name: "led.package.k", pads: [["D1", "1"], ["R1", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net index 08679db52..22f5fd0b7 100644 --- a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net +++ b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.net @@ -85,21 +85,21 @@ (sheetpath (names "/led/") (tstamps "/02750136/")) (tstamps "0296014b"))) (nets -(net (code 1) (name "bat.cell[0].pwr") +(net (code 1) (name "bat.pwr") + (node (ref U4) (pin 1))) +(net (code 2) (name "bat.gnd") + (node (ref U1) (pin 2)) + (node (ref U5) (pin 13)) + (node (ref R1) (pin 2))) +(net (code 3) (name "bat.cell[0].pwr") (node (ref U1) (pin 1)) (node (ref U2) (pin 2))) -(net (code 2) (name "bat.cell[1].pwr") +(net (code 4) (name "bat.cell[1].pwr") (node (ref U2) (pin 1)) (node (ref U3) (pin 2))) -(net (code 3) (name "bat.cell[2].pwr") +(net (code 5) (name "bat.cell[2].pwr") (node (ref U3) (pin 1)) (node (ref U4) (pin 2))) -(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") @@ -107,7 +107,7 @@ (net (code 8) (name "led.signal") (node (ref U5) (pin 7)) (node (ref D1) (pin 2))) -(net (code 9) (name "led.res.a") +(net (code 9) (name "led.package.k") (node (ref D1) (pin 1)) (node (ref R1) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js index 5d2283d4f..f7df9e946 100644 --- a/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js +++ b/examples/TestBlinkyBasicBattery/TestBlinkyBasicBattery.svgpcb.js @@ -37,15 +37,15 @@ const R1 = board.add(R_0603_1608Metric, { }) board.setNetlist([ + {name: "bat.pwr", pads: [["U4", "1"]]}, + {name: "bat.gnd", pads: [["U1", "2"], ["U5", "13"], ["R1", "2"]]}, {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.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"]]}, - {name: "led.res.a", pads: [["D1", "1"], ["R1", "1"]]} + {name: "led.package.k", pads: [["D1", "1"], ["R1", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyChain/TestBlinkyChain.net b/examples/TestBlinkyChain/TestBlinkyChain.net index ffec1ef38..30b1fcd5c 100644 --- a/examples/TestBlinkyChain/TestBlinkyChain.net +++ b/examples/TestBlinkyChain/TestBlinkyChain.net @@ -406,17 +406,17 @@ (node (ref C8) (pin 1)) (node (ref C9) (pin 1)) (node (ref C10) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -440,25 +440,25 @@ (net (code 19) (name "led[0].signal") (node (ref U2) (pin 11)) (node (ref D1) (pin 2))) -(net (code 20) (name "led[0].res.a") +(net (code 20) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R5) (pin 1))) (net (code 21) (name "led[1].signal") (node (ref U2) (pin 12)) (node (ref D2) (pin 2))) -(net (code 22) (name "led[1].res.a") +(net (code 22) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R6) (pin 1))) (net (code 23) (name "led[2].signal") (node (ref U2) (pin 13)) (node (ref D3) (pin 2))) -(net (code 24) (name "led[2].res.a") +(net (code 24) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R7) (pin 1))) (net (code 25) (name "led[3].signal") (node (ref U2) (pin 14)) (node (ref D4) (pin 2))) -(net (code 26) (name "led[3].res.a") +(net (code 26) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R8) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js b/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js index c0b033df7..34a79e1c9 100644 --- a/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js +++ b/examples/TestBlinkyChain/TestBlinkyChain.svgpcb.js @@ -149,9 +149,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -161,13 +161,13 @@ board.setNetlist([ {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, {name: "led[0].signal", pads: [["U2", "11"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R5", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R5", "1"]]}, {name: "led[1].signal", pads: [["U2", "12"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R6", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R6", "1"]]}, {name: "led[2].signal", pads: [["U2", "13"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R7", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R7", "1"]]}, {name: "led[3].signal", pads: [["U2", "14"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R8", "1"]]} + {name: "led[3].package.k", pads: [["D4", "1"], ["R8", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyComplete/TestBlinkyComplete.net b/examples/TestBlinkyComplete/TestBlinkyComplete.net index d2a1c470c..47d100fb9 100644 --- a/examples/TestBlinkyComplete/TestBlinkyComplete.net +++ b/examples/TestBlinkyComplete/TestBlinkyComplete.net @@ -318,17 +318,17 @@ (node (ref C8) (pin 1)) (node (ref C9) (pin 1)) (node (ref C10) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -349,7 +349,7 @@ (net (code 18) (name "led.signal") (node (ref U2) (pin 10)) (node (ref D1) (pin 2))) -(net (code 19) (name "led.res.a") +(net (code 19) (name "led.package.k") (node (ref D1) (pin 1)) (node (ref R5) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js b/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js index e916563f7..1d77a8919 100644 --- a/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js +++ b/examples/TestBlinkyComplete/TestBlinkyComplete.svgpcb.js @@ -114,9 +114,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -125,7 +125,7 @@ board.setNetlist([ {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"]]}, - {name: "led.res.a", pads: [["D1", "1"], ["R5", "1"]]} + {name: "led.package.k", pads: [["D1", "1"], ["R5", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyExpanded/TestBlinkyExpanded.net b/examples/TestBlinkyExpanded/TestBlinkyExpanded.net index ffec1ef38..30b1fcd5c 100644 --- a/examples/TestBlinkyExpanded/TestBlinkyExpanded.net +++ b/examples/TestBlinkyExpanded/TestBlinkyExpanded.net @@ -406,17 +406,17 @@ (node (ref C8) (pin 1)) (node (ref C9) (pin 1)) (node (ref C10) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -440,25 +440,25 @@ (net (code 19) (name "led[0].signal") (node (ref U2) (pin 11)) (node (ref D1) (pin 2))) -(net (code 20) (name "led[0].res.a") +(net (code 20) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R5) (pin 1))) (net (code 21) (name "led[1].signal") (node (ref U2) (pin 12)) (node (ref D2) (pin 2))) -(net (code 22) (name "led[1].res.a") +(net (code 22) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R6) (pin 1))) (net (code 23) (name "led[2].signal") (node (ref U2) (pin 13)) (node (ref D3) (pin 2))) -(net (code 24) (name "led[2].res.a") +(net (code 24) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R7) (pin 1))) (net (code 25) (name "led[3].signal") (node (ref U2) (pin 14)) (node (ref D4) (pin 2))) -(net (code 26) (name "led[3].res.a") +(net (code 26) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R8) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js b/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js index c0b033df7..34a79e1c9 100644 --- a/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js +++ b/examples/TestBlinkyExpanded/TestBlinkyExpanded.svgpcb.js @@ -149,9 +149,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -161,13 +161,13 @@ board.setNetlist([ {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, {name: "led[0].signal", pads: [["U2", "11"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R5", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R5", "1"]]}, {name: "led[1].signal", pads: [["U2", "12"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R6", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R6", "1"]]}, {name: "led[2].signal", pads: [["U2", "13"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R7", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R7", "1"]]}, {name: "led[3].signal", pads: [["U2", "14"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R8", "1"]]} + {name: "led[3].package.k", pads: [["D4", "1"], ["R8", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyImplicit/TestBlinkyImplicit.net b/examples/TestBlinkyImplicit/TestBlinkyImplicit.net index ffec1ef38..30b1fcd5c 100644 --- a/examples/TestBlinkyImplicit/TestBlinkyImplicit.net +++ b/examples/TestBlinkyImplicit/TestBlinkyImplicit.net @@ -406,17 +406,17 @@ (node (ref C8) (pin 1)) (node (ref C9) (pin 1)) (node (ref C10) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 34))) @@ -440,25 +440,25 @@ (net (code 19) (name "led[0].signal") (node (ref U2) (pin 11)) (node (ref D1) (pin 2))) -(net (code 20) (name "led[0].res.a") +(net (code 20) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R5) (pin 1))) (net (code 21) (name "led[1].signal") (node (ref U2) (pin 12)) (node (ref D2) (pin 2))) -(net (code 22) (name "led[1].res.a") +(net (code 22) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R6) (pin 1))) (net (code 23) (name "led[2].signal") (node (ref U2) (pin 13)) (node (ref D3) (pin 2))) -(net (code 24) (name "led[2].res.a") +(net (code 24) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R7) (pin 1))) (net (code 25) (name "led[3].signal") (node (ref U2) (pin 14)) (node (ref D4) (pin 2))) -(net (code 26) (name "led[3].res.a") +(net (code 26) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R8) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js b/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js index c0b033df7..34a79e1c9 100644 --- a/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js +++ b/examples/TestBlinkyImplicit/TestBlinkyImplicit.svgpcb.js @@ -149,9 +149,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -161,13 +161,13 @@ board.setNetlist([ {name: "mcu.ic.osc.xtal_out", pads: [["U2", "6"]]}, {name: "sw.out", pads: [["U2", "10"], ["SW1", "1"]]}, {name: "led[0].signal", pads: [["U2", "11"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R5", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R5", "1"]]}, {name: "led[1].signal", pads: [["U2", "12"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R6", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R6", "1"]]}, {name: "led[2].signal", pads: [["U2", "13"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R7", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R7", "1"]]}, {name: "led[3].signal", pads: [["U2", "14"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R8", "1"]]} + {name: "led[3].package.k", pads: [["D4", "1"], ["R8", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyMicro/TestBlinkyMicro.net b/examples/TestBlinkyMicro/TestBlinkyMicro.net index 67c0fb768..1b28e8597 100644 --- a/examples/TestBlinkyMicro/TestBlinkyMicro.net +++ b/examples/TestBlinkyMicro/TestBlinkyMicro.net @@ -382,17 +382,17 @@ (node (ref C6) (pin 1)) (node (ref J2) (pin 1)) (node (ref R5) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) @@ -414,25 +414,25 @@ (net (code 17) (name "led[0].signal") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) -(net (code 18) (name "led[0].res.a") +(net (code 18) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) (net (code 19) (name "led[1].signal") (node (ref U2) (pin 27)) (node (ref D2) (pin 2))) -(net (code 20) (name "led[1].res.a") +(net (code 20) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R7) (pin 1))) (net (code 21) (name "led[2].signal") (node (ref U2) (pin 28)) (node (ref D3) (pin 2))) -(net (code 22) (name "led[2].res.a") +(net (code 22) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R8) (pin 1))) (net (code 23) (name "led[3].signal") (node (ref U2) (pin 29)) (node (ref D4) (pin 2))) -(net (code 24) (name "led[3].res.a") +(net (code 24) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R9) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js b/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js index 0ed24c902..45240e603 100644 --- a/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js +++ b/examples/TestBlinkyMicro/TestBlinkyMicro.svgpcb.js @@ -144,9 +144,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -154,13 +154,13 @@ board.setNetlist([ {name: "mcu.ic.io2", pads: [["U2", "24"]]}, {name: "sw.out", pads: [["U2", "8"], ["SW2", "1"]]}, {name: "led[0].signal", pads: [["U2", "26"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R6", "1"]]}, {name: "led[1].signal", pads: [["U2", "27"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R7", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R7", "1"]]}, {name: "led[2].signal", pads: [["U2", "28"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R8", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R8", "1"]]}, {name: "led[3].signal", pads: [["U2", "29"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R9", "1"]]} + {name: "led[3].package.k", pads: [["D4", "1"], ["R9", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TestBlinkyPacked/TestBlinkyPacked.net b/examples/TestBlinkyPacked/TestBlinkyPacked.net index 389124056..ef575813a 100644 --- a/examples/TestBlinkyPacked/TestBlinkyPacked.net +++ b/examples/TestBlinkyPacked/TestBlinkyPacked.net @@ -346,17 +346,17 @@ (node (ref C6) (pin 1)) (node (ref J2) (pin 1)) (node (ref R5) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 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 025d0e5eb..984813989 100644 --- a/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js +++ b/examples/TestBlinkyPacked/TestBlinkyPacked.svgpcb.js @@ -129,9 +129,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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 1596bfb3c..305db18f2 100644 --- a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net +++ b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.net @@ -410,17 +410,17 @@ (node (ref R5) (pin 1)) (node (ref U3) (pin 1)) (node (ref C8) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) @@ -442,25 +442,25 @@ (net (code 17) (name "led[0].signal") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) -(net (code 18) (name "led[0].res.a") +(net (code 18) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) (net (code 19) (name "led[1].signal") (node (ref U2) (pin 27)) (node (ref D2) (pin 2))) -(net (code 20) (name "led[1].res.a") +(net (code 20) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R7) (pin 1))) (net (code 21) (name "led[2].signal") (node (ref U2) (pin 28)) (node (ref D3) (pin 2))) -(net (code 22) (name "led[2].res.a") +(net (code 22) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R8) (pin 1))) (net (code 23) (name "led[3].signal") (node (ref U2) (pin 29)) (node (ref D4) (pin 2))) -(net (code 24) (name "led[3].res.a") +(net (code 24) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R9) (pin 1))) (net (code 25) (name "mag.out") diff --git a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js index 02f07254f..61a5ca110 100644 --- a/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js +++ b/examples/TestBlinkyWithLibrary/TestBlinkyWithLibrary.svgpcb.js @@ -154,9 +154,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -164,13 +164,13 @@ board.setNetlist([ {name: "mcu.ic.io2", pads: [["U2", "24"]]}, {name: "sw.out", pads: [["U2", "8"], ["SW2", "1"]]}, {name: "led[0].signal", pads: [["U2", "26"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R6", "1"]]}, {name: "led[1].signal", pads: [["U2", "27"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R7", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R7", "1"]]}, {name: "led[2].signal", pads: [["U2", "28"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R8", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R8", "1"]]}, {name: "led[3].signal", pads: [["U2", "29"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R9", "1"]]}, + {name: "led[3].package.k", pads: [["D4", "1"], ["R9", "1"]]}, {name: "mag.out", pads: [["U2", "9"], ["U3", "2"]]} ]) diff --git a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net index 500b4f809..735d977f4 100644 --- a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net +++ b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.net @@ -410,17 +410,17 @@ (node (ref R5) (pin 1)) (node (ref U3) (pin 1)) (node (ref C8) (pin 1))) -(net (code 8) (name "reg.fb.output") +(net (code 8) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 9) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 9) (name "reg.vbst_cap.pos") +(net (code 10) (name "reg.ic.vbst") (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 11) (name "mcu.program_uart_node.a_tx") (node (ref U2) (pin 35)) (node (ref J2) (pin 2))) @@ -442,25 +442,25 @@ (net (code 17) (name "led[0].signal") (node (ref U2) (pin 26)) (node (ref D1) (pin 2))) -(net (code 18) (name "led[0].res.a") +(net (code 18) (name "led[0].package.k") (node (ref D1) (pin 1)) (node (ref R6) (pin 1))) (net (code 19) (name "led[1].signal") (node (ref U2) (pin 27)) (node (ref D2) (pin 2))) -(net (code 20) (name "led[1].res.a") +(net (code 20) (name "led[1].package.k") (node (ref D2) (pin 1)) (node (ref R7) (pin 1))) (net (code 21) (name "led[2].signal") (node (ref U2) (pin 28)) (node (ref D3) (pin 2))) -(net (code 22) (name "led[2].res.a") +(net (code 22) (name "led[2].package.k") (node (ref D3) (pin 1)) (node (ref R8) (pin 1))) (net (code 23) (name "led[3].signal") (node (ref U2) (pin 29)) (node (ref D4) (pin 2))) -(net (code 24) (name "led[3].res.a") +(net (code 24) (name "led[3].package.k") (node (ref D4) (pin 1)) (node (ref R9) (pin 1))) (net (code 25) (name "mag.out") diff --git a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js index 02f07254f..61a5ca110 100644 --- a/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js +++ b/examples/TestBlinkyWithLibraryExport/TestBlinkyWithLibraryExport.svgpcb.js @@ -154,9 +154,9 @@ board.setNetlist([ {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.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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"]]}, @@ -164,13 +164,13 @@ board.setNetlist([ {name: "mcu.ic.io2", pads: [["U2", "24"]]}, {name: "sw.out", pads: [["U2", "8"], ["SW2", "1"]]}, {name: "led[0].signal", pads: [["U2", "26"], ["D1", "2"]]}, - {name: "led[0].res.a", pads: [["D1", "1"], ["R6", "1"]]}, + {name: "led[0].package.k", pads: [["D1", "1"], ["R6", "1"]]}, {name: "led[1].signal", pads: [["U2", "27"], ["D2", "2"]]}, - {name: "led[1].res.a", pads: [["D2", "1"], ["R7", "1"]]}, + {name: "led[1].package.k", pads: [["D2", "1"], ["R7", "1"]]}, {name: "led[2].signal", pads: [["U2", "28"], ["D3", "2"]]}, - {name: "led[2].res.a", pads: [["D3", "1"], ["R8", "1"]]}, + {name: "led[2].package.k", pads: [["D3", "1"], ["R8", "1"]]}, {name: "led[3].signal", pads: [["U2", "29"], ["D4", "2"]]}, - {name: "led[3].res.a", pads: [["D4", "1"], ["R9", "1"]]}, + {name: "led[3].package.k", pads: [["D4", "1"], ["R9", "1"]]}, {name: "mag.out", pads: [["U2", "9"], ["U3", "2"]]} ]) diff --git a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net index 2a74b281f..58dbacf9b 100644 --- a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net +++ b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.net @@ -370,17 +370,17 @@ (net (code 5) (name "usb.conn.cc.cc2") (node (ref J1) (pin B5)) (node (ref R2) (pin 2))) -(net (code 6) (name "reg.fb.output") +(net (code 6) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 7) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 7) (name "reg.vbst_cap.pos") +(net (code 8) (name "reg.ic.vbst") (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 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 6d06b4b6d..2f22e7dcc 100644 --- a/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js +++ b/examples/TestBlinkyWithModeledSchematicImport/TestBlinkyWithModeledSchematicImport.svgpcb.js @@ -152,9 +152,9 @@ board.setNetlist([ {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.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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 b70ce82fc..2ad0fc21f 100644 --- a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net +++ b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.net @@ -370,17 +370,17 @@ (net (code 5) (name "usb.conn.cc.cc2") (node (ref J1) (pin B5)) (node (ref R2) (pin 2))) -(net (code 6) (name "reg.fb.output") +(net (code 6) (name "reg.ic.sw") + (node (ref U1) (pin 2)) + (node (ref C2) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 7) (name "reg.ic.fb") (node (ref U1) (pin 4)) (node (ref R3) (pin 2)) (node (ref R4) (pin 1))) -(net (code 7) (name "reg.vbst_cap.pos") +(net (code 8) (name "reg.ic.vbst") (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 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 6d06b4b6d..2f22e7dcc 100644 --- a/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js +++ b/examples/TestBlinkyWithSchematicImport/TestBlinkyWithSchematicImport.svgpcb.js @@ -152,9 +152,9 @@ board.setNetlist([ {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.fb.output", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, - {name: "reg.vbst_cap.pos", pads: [["U1", "6"], ["C2", "1"]]}, - {name: "reg.vbst_cap.neg", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.sw", pads: [["U1", "2"], ["C2", "2"], ["L1", "1"]]}, + {name: "reg.ic.fb", pads: [["U1", "4"], ["R3", "2"], ["R4", "1"]]}, + {name: "reg.ic.vbst", pads: [["U1", "6"], ["C2", "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/TestLed/TestLed.net b/examples/TestLed/TestLed.net index 88f9191a0..aca881d8c 100644 --- a/examples/TestLed/TestLed.net +++ b/examples/TestLed/TestLed.net @@ -27,9 +27,9 @@ (nets (net (code 1) (name "gnd.gnd") (node (ref R1) (pin 2))) -(net (code 2) (name "led.signal") +(net (code 2) (name "src.io") (node (ref D1) (pin 2))) -(net (code 3) (name "led.res.a") +(net (code 3) (name "led.package.k") (node (ref D1) (pin 1)) (node (ref R1) (pin 1)))) ) \ No newline at end of file diff --git a/examples/TestLed/TestLed.svgpcb.js b/examples/TestLed/TestLed.svgpcb.js index c0121f4bf..79b361deb 100644 --- a/examples/TestLed/TestLed.svgpcb.js +++ b/examples/TestLed/TestLed.svgpcb.js @@ -13,8 +13,8 @@ const R1 = board.add(R_0603_1608Metric, { board.setNetlist([ {name: "gnd.gnd", pads: [["R1", "2"]]}, - {name: "led.signal", pads: [["D1", "2"]]}, - {name: "led.res.a", pads: [["D1", "1"], ["R1", "1"]]} + {name: "src.io", pads: [["D1", "2"]]}, + {name: "led.package.k", pads: [["D1", "1"], ["R1", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496); diff --git a/examples/TofArray/TofArray.net b/examples/TofArray/TofArray.net index 63876d132..6c428cfbe 100644 --- a/examples/TofArray/TofArray.net +++ b/examples/TofArray/TofArray.net @@ -1146,16 +1146,16 @@ (node (ref U6) (pin 7))) (net (code 44) (name "tof.elt[4].ic.gpio1") (node (ref U7) (pin 7))) -(net (code 45) (name "spk_drv.inp_res.b") +(net (code 45) (name "spk_drv.ic.inp") (node (ref U11) (pin 4)) (node (ref R7) (pin 2))) -(net (code 46) (name "spk_drv.inp_cap.pos") - (node (ref R7) (pin 1)) - (node (ref C25) (pin 1))) -(net (code 47) (name "spk_drv.inn_res.b") +(net (code 46) (name "spk_drv.ic.inn") (node (ref U11) (pin 3)) (node (ref R8) (pin 2))) -(net (code 48) (name "spk_drv.inn_cap.pos") +(net (code 47) (name "spk_drv.inp_res.a") + (node (ref R7) (pin 1)) + (node (ref C25) (pin 1))) +(net (code 48) (name "spk_drv.inn_res.a") (node (ref R8) (pin 1)) (node (ref C26) (pin 1))) (net (code 49) (name "res1.a.0") diff --git a/examples/TofArray/TofArray.svgpcb.js b/examples/TofArray/TofArray.svgpcb.js index e89a6929f..46394b19e 100644 --- a/examples/TofArray/TofArray.svgpcb.js +++ b/examples/TofArray/TofArray.svgpcb.js @@ -406,10 +406,10 @@ board.setNetlist([ {name: "tof.elt[2].ic.gpio1", pads: [["U5", "7"]]}, {name: "tof.elt[3].ic.gpio1", pads: [["U6", "7"]]}, {name: "tof.elt[4].ic.gpio1", pads: [["U7", "7"]]}, - {name: "spk_drv.inp_res.b", pads: [["U11", "4"], ["R7", "2"]]}, - {name: "spk_drv.inp_cap.pos", pads: [["R7", "1"], ["C25", "1"]]}, - {name: "spk_drv.inn_res.b", pads: [["U11", "3"], ["R8", "2"]]}, - {name: "spk_drv.inn_cap.pos", pads: [["R8", "1"], ["C26", "1"]]}, + {name: "spk_drv.ic.inp", pads: [["U11", "4"], ["R7", "2"]]}, + {name: "spk_drv.ic.inn", pads: [["U11", "3"], ["R8", "2"]]}, + {name: "spk_drv.inp_res.a", pads: [["R7", "1"], ["C25", "1"]]}, + {name: "spk_drv.inn_res.a", pads: [["R8", "1"], ["C26", "1"]]}, {name: "res1.a.0", pads: [["D2", "1"], ["RN1", "1"]]}, {name: "res1.a.1", pads: [["D3", "1"], ["RN1", "2"]]}, {name: "res1.a.2", pads: [["RN1", "3"], ["D7", "3"]]}, diff --git a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net index 23c24b726..25c2b0f69 100644 --- a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net +++ b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net @@ -570,53 +570,53 @@ (node (ref FU1) (pin 8)) (node (ref FFB3) (pin 2)) (node (ref FC4) (pin 1))) -(net (code 23) (name "Fft232.ic.adbus.3") - (node (ref FU1) (pin 16))) -(net (code 24) (name "Fft232.ic.adbus.5") - (node (ref FU1) (pin 18))) -(net (code 25) (name "Fft232.ic.adbus.6") - (node (ref FU1) (pin 19))) -(net (code 26) (name "Fft232.ref_res.a") - (node (ref FU1) (pin 5)) - (node (ref FR3) (pin 1))) -(net (code 27) (name "Fft232.crystal.crystal.xtal_in") +(net (code 23) (name "Fft232.ic.osc.xtal_in") (node (ref FU1) (pin 1)) (node (ref FX1) (pin 1)) (node (ref FC11) (pin 1))) -(net (code 28) (name "Fft232.crystal.crystal.xtal_out") +(net (code 24) (name "Fft232.ic.osc.xtal_out") (node (ref FU1) (pin 2)) (node (ref FX1) (pin 3)) (node (ref FC12) (pin 1))) -(net (code 29) (name "Fft232.eeprom.cs") +(net (code 25) (name "Fft232.ic.ref") + (node (ref FU1) (pin 5)) + (node (ref FR3) (pin 1))) +(net (code 26) (name "Fft232.ic.eecs") (node (ref FU1) (pin 45)) (node (ref FU2) (pin 5))) -(net (code 30) (name "Fft232.eeprom_spi.eeclk") +(net (code 27) (name "Fft232.ic.eeclk") (node (ref FU1) (pin 44)) (node (ref FU2) (pin 4))) -(net (code 31) (name "Fft232.eeprom_spi.eedata") +(net (code 28) (name "Fft232.ic.eedata") (node (ref FU1) (pin 43)) (node (ref FU2) (pin 3)) (node (ref FR5) (pin 2))) -(net (code 32) (name "Fft232.eeprom_spi.spi.miso") +(net (code 29) (name "Fft232.ic.adbus.3") + (node (ref FU1) (pin 16))) +(net (code 30) (name "Fft232.ic.adbus.5") + (node (ref FU1) (pin 18))) +(net (code 31) (name "Fft232.ic.adbus.6") + (node (ref FU1) (pin 19))) +(net (code 32) (name "Fft232.eeprom.spi.miso") (node (ref FU2) (pin 1)) (node (ref FR4) (pin 2)) (node (ref FR5) (pin 1))) (net (code 33) (name "Fled0.signal") (node (ref FU1) (pin 21)) (node (ref FD2) (pin 2))) -(net (code 34) (name "Fled0.res.a") +(net (code 34) (name "Fled0.package.k") (node (ref FD2) (pin 1)) (node (ref FR6) (pin 1))) (net (code 35) (name "Fled1.signal") (node (ref FU1) (pin 27)) (node (ref FD3) (pin 2))) -(net (code 36) (name "Fled1.res.a") +(net (code 36) (name "Fled1.package.k") (node (ref FD3) (pin 1)) (node (ref FR7) (pin 1))) (net (code 37) (name "Fled2.signal") (node (ref FU1) (pin 28)) (node (ref FD4) (pin 2))) -(net (code 38) (name "Fled2.res.a") +(net (code 38) (name "Fled2.package.k") (node (ref FD4) (pin 1)) (node (ref FR8) (pin 1))) (net (code 39) (name "Fout.pwr") diff --git a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js index a503f874e..c38b923e5 100644 --- a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js +++ b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.svgpcb.js @@ -209,22 +209,22 @@ board.setNetlist([ {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.osc.xtal_in", pads: [["FU1", "1"], ["FX1", "1"], ["FC11", "1"]]}, + {name: "Fft232.ic.osc.xtal_out", pads: [["FU1", "2"], ["FX1", "3"], ["FC12", "1"]]}, + {name: "Fft232.ic.ref", pads: [["FU1", "5"], ["FR3", "1"]]}, + {name: "Fft232.ic.eecs", pads: [["FU1", "45"], ["FU2", "5"]]}, + {name: "Fft232.ic.eeclk", pads: [["FU1", "44"], ["FU2", "4"]]}, + {name: "Fft232.ic.eedata", pads: [["FU1", "43"], ["FU2", "3"], ["FR5", "2"]]}, {name: "Fft232.ic.adbus.3", pads: [["FU1", "16"]]}, {name: "Fft232.ic.adbus.5", pads: [["FU1", "18"]]}, {name: "Fft232.ic.adbus.6", pads: [["FU1", "19"]]}, - {name: "Fft232.ref_res.a", pads: [["FU1", "5"], ["FR3", "1"]]}, - {name: "Fft232.crystal.crystal.xtal_in", pads: [["FU1", "1"], ["FX1", "1"], ["FC11", "1"]]}, - {name: "Fft232.crystal.crystal.xtal_out", pads: [["FU1", "2"], ["FX1", "3"], ["FC12", "1"]]}, - {name: "Fft232.eeprom.cs", pads: [["FU1", "45"], ["FU2", "5"]]}, - {name: "Fft232.eeprom_spi.eeclk", pads: [["FU1", "44"], ["FU2", "4"]]}, - {name: "Fft232.eeprom_spi.eedata", pads: [["FU1", "43"], ["FU2", "3"], ["FR5", "2"]]}, - {name: "Fft232.eeprom_spi.spi.miso", pads: [["FU2", "1"], ["FR4", "2"], ["FR5", "1"]]}, + {name: "Fft232.eeprom.spi.miso", pads: [["FU2", "1"], ["FR4", "2"], ["FR5", "1"]]}, {name: "Fled0.signal", pads: [["FU1", "21"], ["FD2", "2"]]}, - {name: "Fled0.res.a", pads: [["FD2", "1"], ["FR6", "1"]]}, + {name: "Fled0.package.k", pads: [["FD2", "1"], ["FR6", "1"]]}, {name: "Fled1.signal", pads: [["FU1", "27"], ["FD3", "2"]]}, - {name: "Fled1.res.a", pads: [["FD3", "1"], ["FR7", "1"]]}, + {name: "Fled1.package.k", pads: [["FD3", "1"], ["FR7", "1"]]}, {name: "Fled2.signal", pads: [["FU1", "28"], ["FD4", "2"]]}, - {name: "Fled2.res.a", pads: [["FD4", "1"], ["FR8", "1"]]}, + {name: "Fled2.package.k", 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"]]} diff --git a/examples/UsbKey/UsbKey.net b/examples/UsbKey/UsbKey.net index fa59c827e..42d07f2bb 100644 --- a/examples/UsbKey/UsbKey.net +++ b/examples/UsbKey/UsbKey.net @@ -239,34 +239,34 @@ (net (code 5) (name "usb.usb.dm") (node (ref J1) (pin 2)) (node (ref U2) (pin 21))) -(net (code 6) (name "mcu.swd_node.swdio") +(net (code 6) (name "mcu.gpio.rgb_red") + (node (ref U2) (pin 7)) + (node (ref R1) (pin 2))) +(net (code 7) (name "mcu.gpio.rgb_green") + (node (ref U2) (pin 8)) + (node (ref R2) (pin 2))) +(net (code 8) (name "mcu.gpio.rgb_blue") + (node (ref U2) (pin 9)) + (node (ref R3) (pin 2))) +(net (code 9) (name "mcu.swd_node.swdio") (node (ref J2) (pin 2)) (node (ref U2) (pin 23))) -(net (code 7) (name "mcu.swd_node.swclk") +(net (code 10) (name "mcu.swd_node.swclk") (node (ref J2) (pin 4)) (node (ref U2) (pin 24))) -(net (code 8) (name "mcu.swd.swo") +(net (code 11) (name "mcu.swd.swo") (node (ref J2) (pin 6))) -(net (code 9) (name "mcu.swd.reset") +(net (code 12) (name "mcu.swd.reset") (node (ref J2) (pin 3))) -(net (code 10) (name "mcu.ic.nrst") +(net (code 13) (name "mcu.ic.nrst") (node (ref U2) (pin 4))) -(net (code 11) (name "rgb.signals.red") - (node (ref U2) (pin 7)) - (node (ref R1) (pin 2))) -(net (code 12) (name "rgb.signals.green") - (node (ref U2) (pin 8)) - (node (ref R2) (pin 2))) -(net (code 13) (name "rgb.signals.blue") - (node (ref U2) (pin 9)) - (node (ref R3) (pin 2))) -(net (code 14) (name "rgb.red_res.a") +(net (code 14) (name "rgb.package.k_red") (node (ref D1) (pin 2)) (node (ref R1) (pin 1))) -(net (code 15) (name "rgb.green_res.a") +(net (code 15) (name "rgb.package.k_green") (node (ref D1) (pin 3)) (node (ref R2) (pin 1))) -(net (code 16) (name "rgb.blue_res.a") +(net (code 16) (name "rgb.package.k_blue") (node (ref D1) (pin 4)) (node (ref R3) (pin 1))) (net (code 17) (name "ts1.io") diff --git a/examples/UsbKey/UsbKey.svgpcb.js b/examples/UsbKey/UsbKey.svgpcb.js index 3536c11d8..3498854b6 100644 --- a/examples/UsbKey/UsbKey.svgpcb.js +++ b/examples/UsbKey/UsbKey.svgpcb.js @@ -92,17 +92,17 @@ board.setNetlist([ {name: "usb.pwr", pads: [["J1", "1"], ["U1", "3"], ["U1", "4"], ["C1", "1"]]}, {name: "usb.usb.dp", pads: [["J1", "3"], ["U2", "22"]]}, {name: "usb.usb.dm", pads: [["J1", "2"], ["U2", "21"]]}, + {name: "mcu.gpio.rgb_red", pads: [["U2", "7"], ["R1", "2"]]}, + {name: "mcu.gpio.rgb_green", pads: [["U2", "8"], ["R2", "2"]]}, + {name: "mcu.gpio.rgb_blue", pads: [["U2", "9"], ["R3", "2"]]}, {name: "mcu.swd_node.swdio", pads: [["J2", "2"], ["U2", "23"]]}, {name: "mcu.swd_node.swclk", pads: [["J2", "4"], ["U2", "24"]]}, {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"]]}, - {name: "rgb.signals.blue", pads: [["U2", "9"], ["R3", "2"]]}, - {name: "rgb.red_res.a", pads: [["D1", "2"], ["R1", "1"]]}, - {name: "rgb.green_res.a", pads: [["D1", "3"], ["R2", "1"]]}, - {name: "rgb.blue_res.a", pads: [["D1", "4"], ["R3", "1"]]}, + {name: "rgb.package.k_red", pads: [["D1", "2"], ["R1", "1"]]}, + {name: "rgb.package.k_green", pads: [["D1", "3"], ["R2", "1"]]}, + {name: "rgb.package.k_blue", pads: [["D1", "4"], ["R3", "1"]]}, {name: "ts1.io", pads: [["U2", "27"], ["R4", "1"]]}, {name: "ts1.res.b", pads: [["R4", "2"]]}, {name: "ts2.io", pads: [["U2", "28"], ["R5", "1"]]}, diff --git a/examples/UsbSourceMeasure/UsbSourceMeasure.net b/examples/UsbSourceMeasure/UsbSourceMeasure.net index 4292991a4..d6849c3f2 100644 --- a/examples/UsbSourceMeasure/UsbSourceMeasure.net +++ b/examples/UsbSourceMeasure/UsbSourceMeasure.net @@ -4310,61 +4310,106 @@ (node (ref J1) (pin B5)) (node (ref U25) (pin 1)) (node (ref U25) (pin 14))) -(net (code 19) (name "fuse_vusb.pwr_out") - (node (ref F1) (pin 2)) - (node (ref FB1) (pin 1))) -(net (code 20) (name "filt_vusb.pwr_out") +(net (code 19) (name "vusb_sense.i2c.scl") + (node (ref U1) (pin 5)) + (node (ref U5) (pin 5)) + (node (ref U25) (pin 6)) + (node (ref U26) (pin 8)) + (node (ref TP10) (pin 1)) + (node (ref R68) (pin 2)) + (node (ref J5) (pin 12)) + (node (ref U29) (pin 14)) + (node (ref U32) (pin 1)) + (node (ref U33) (pin 1)) + (node (ref U34) (pin 14)) + (node (ref U37) (pin 2))) +(net (code 20) (name "vusb_sense.i2c.sda") + (node (ref U1) (pin 6)) + (node (ref U5) (pin 6)) + (node (ref U25) (pin 7)) + (node (ref U26) (pin 7)) + (node (ref TP11) (pin 1)) + (node (ref R69) (pin 2)) + (node (ref J5) (pin 10)) + (node (ref J5) (pin 11)) + (node (ref U29) (pin 15)) + (node (ref U32) (pin 6)) + (node (ref U33) (pin 6)) + (node (ref U34) (pin 15)) + (node (ref U37) (pin 3))) +(net (code 21) (name "vusb_sense.sense_pos") (node (ref U1) (pin 1)) (node (ref R1) (pin 1)) (node (ref FB1) (pin 2)) (node (ref D1) (pin 1))) -(net (code 21) (name "ramp.div.center") +(net (code 22) (name "fuse_vusb.pwr_out") + (node (ref F1) (pin 2)) + (node (ref FB1) (pin 1))) +(net (code 23) (name "ramp.control") + (node (ref Q2) (pin 1)) + (node (ref U29) (pin 4)) + (node (ref R72) (pin 2))) +(net (code 24) (name "ramp.drv.gate") (node (ref Q1) (pin 4)) (node (ref C2) (pin 2)) (node (ref C3) (pin 2)) (node (ref R2) (pin 2)) (node (ref R3) (pin 1))) -(net (code 22) (name "ramp.ctl_fet.drain") +(net (code 25) (name "ramp.div.bottom") (node (ref R3) (pin 2)) (node (ref Q2) (pin 3))) -(net (code 23) (name "reg_v5.fb.output") +(net (code 26) (name "reg_v5.ic.sw") + (node (ref U2) (pin 2)) + (node (ref C6) (pin 2)) + (node (ref L1) (pin 1))) +(net (code 27) (name "reg_v5.ic.fb") (node (ref U2) (pin 4)) (node (ref R4) (pin 2)) (node (ref R5) (pin 1))) -(net (code 24) (name "reg_v5.boot_cap.pos") +(net (code 28) (name "reg_v5.ic.boot") (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 26) (name "reg_v5.en_res.b") +(net (code 29) (name "reg_v5.ic.en") (node (ref U2) (pin 5)) (node (ref R6) (pin 2))) -(net (code 27) (name "reg_3v3.fb.output") +(net (code 30) (name "reg_3v3.ic.sw") + (node (ref U3) (pin 2)) + (node (ref C10) (pin 2)) + (node (ref L2) (pin 1))) +(net (code 31) (name "reg_3v3.ic.fb") (node (ref U3) (pin 4)) (node (ref R7) (pin 2)) (node (ref R8) (pin 1))) -(net (code 28) (name "reg_3v3.boot_cap.pos") +(net (code 32) (name "reg_3v3.ic.boot") (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 30) (name "reg_3v3.en_res.b") +(net (code 33) (name "reg_3v3.ic.en") (node (ref U3) (pin 5)) (node (ref R9) (pin 2))) -(net (code 31) (name "reg_v12.fb.output") +(net (code 34) (name "reg_v12.ic.sw") + (node (ref U4) (pin 1)) + (node (ref L3) (pin 2)) + (node (ref D3) (pin 2))) +(net (code 35) (name "reg_v12.ic.fb") (node (ref U4) (pin 3)) (node (ref R10) (pin 2)) (node (ref R11) (pin 1)) (node (ref C16) (pin 2))) -(net (code 32) (name "reg_v12.power_path.switch") - (node (ref U4) (pin 1)) - (node (ref L3) (pin 2)) - (node (ref D3) (pin 2))) -(net (code 33) (name "conv.l1") +(net (code 36) (name "conv.reset") + (node (ref U6) (pin 3)) + (node (ref U7) (pin 3)) + (node (ref U29) (pin 7)) + (node (ref U31) (pin 6)) + (node (ref U31) (pin 7))) +(net (code 37) (name "conv.buck_pwm") + (node (ref U6) (pin 2)) + (node (ref R73) (pin 2)) + (node (ref C79) (pin 1))) +(net (code 38) (name "conv.boost_pwm") + (node (ref U7) (pin 2)) + (node (ref R74) (pin 2)) + (node (ref C80) (pin 1))) +(net (code 39) (name "conv.l1") (node (ref L4) (pin 1)) (node (ref U6) (pin 7)) (node (ref C34) (pin 2)) @@ -4372,7 +4417,7 @@ (node (ref Q4) (pin 1)) (node (ref Q4) (pin 2)) (node (ref Q4) (pin 3))) -(net (code 34) (name "conv.l2") +(net (code 40) (name "conv.l2") (node (ref L4) (pin 2)) (node (ref U7) (pin 7)) (node (ref C36) (pin 2)) @@ -4380,112 +4425,137 @@ (node (ref Q6) (pin 1)) (node (ref Q6) (pin 2)) (node (ref Q6) (pin 3))) -(net (code 35) (name "conv.buck_sw.driver.ic.bst") +(net (code 41) (name "conv.buck_sw.driver.low_out") + (node (ref U6) (pin 5)) + (node (ref R13) (pin 1))) +(net (code 42) (name "conv.buck_sw.driver.high_out") + (node (ref U6) (pin 8)) + (node (ref R14) (pin 1))) +(net (code 43) (name "conv.buck_sw.driver.ic.bst") (node (ref U6) (pin 1)) (node (ref C34) (pin 1)) (node (ref D4) (pin 1))) -(net (code 36) (name "conv.buck_sw.low_gate_res.a") - (node (ref U6) (pin 5)) - (node (ref R13) (pin 1))) -(net (code 37) (name "conv.buck_sw.low_gate_res.b") +(net (code 44) (name "conv.buck_sw.low_fet.gate") (node (ref Q3) (pin 4)) (node (ref R13) (pin 2))) -(net (code 38) (name "conv.buck_sw.high_gate_res.a") - (node (ref U6) (pin 8)) - (node (ref R14) (pin 1))) -(net (code 39) (name "conv.buck_sw.high_gate_res.b") +(net (code 45) (name "conv.buck_sw.high_fet.gate") (node (ref Q4) (pin 4)) (node (ref R14) (pin 2))) -(net (code 40) (name "conv.boost_sw.driver.ic.bst") +(net (code 46) (name "conv.boost_sw.driver.low_out") + (node (ref U7) (pin 5)) + (node (ref R15) (pin 1))) +(net (code 47) (name "conv.boost_sw.driver.high_out") + (node (ref U7) (pin 8)) + (node (ref R16) (pin 1))) +(net (code 48) (name "conv.boost_sw.driver.ic.bst") (node (ref U7) (pin 1)) (node (ref C36) (pin 1)) (node (ref D5) (pin 1))) -(net (code 41) (name "conv.boost_sw.low_gate_res.a") - (node (ref U7) (pin 5)) - (node (ref R15) (pin 1))) -(net (code 42) (name "conv.boost_sw.low_gate_res.b") +(net (code 49) (name "conv.boost_sw.low_fet.gate") (node (ref Q5) (pin 4)) (node (ref R15) (pin 2))) -(net (code 43) (name "conv.boost_sw.high_gate_res.a") - (node (ref U7) (pin 8)) - (node (ref R16) (pin 1))) -(net (code 44) (name "conv.boost_sw.high_gate_res.b") +(net (code 50) (name "conv.boost_sw.high_fet.gate") (node (ref Q6) (pin 4)) (node (ref R16) (pin 2))) -(net (code 45) (name "ref_div.output") +(net (code 51) (name "ref_div.output") (node (ref R17) (pin 2)) (node (ref R18) (pin 1)) (node (ref U40) (pin 3))) -(net (code 46) (name "ref_buf.output") +(net (code 52) (name "ref_buf.output") (node (ref R19) (pin 1)) (node (ref U40) (pin 1)) (node (ref U40) (pin 2))) -(net (code 47) (name "reg_vcontrol.fb.output") +(net (code 53) (name "reg_vcontrol.ic.sw") + (node (ref U10) (pin 1)) + (node (ref L5) (pin 2)) + (node (ref D7) (pin 2))) +(net (code 54) (name "reg_vcontrol.ic.fb") (node (ref U10) (pin 3)) (node (ref R20) (pin 2)) (node (ref R21) (pin 1)) (node (ref C43) (pin 2))) -(net (code 48) (name "reg_vcontrol.power_path.switch") - (node (ref U10) (pin 1)) - (node (ref L5) (pin 2)) - (node (ref D7) (pin 2))) -(net (code 49) (name "filt_vcontroln.pwr_out") +(net (code 55) (name "filt_vcontroln.pwr_out") (node (ref FB2) (pin 2)) (node (ref U11) (pin 4)) (node (ref U11) (pin 5))) -(net (code 50) (name "reg_vcontroln.cf.pos") - (node (ref U11) (pin 6)) - (node (ref C44) (pin 1))) -(net (code 51) (name "reg_vcontroln.cf.neg") +(net (code 56) (name "reg_vcontroln.ic.capn") (node (ref U11) (pin 3)) (node (ref C44) (pin 2))) -(net (code 52) (name "control.high_gate_ctl") +(net (code 57) (name "reg_vcontroln.ic.capp") + (node (ref U11) (pin 6)) + (node (ref C44) (pin 1))) +(net (code 58) (name "control.control_voltage") + (node (ref R26) (pin 1)) + (node (ref U37) (pin 6)) + (node (ref C97) (pin 1))) +(net (code 59) (name "control.control_voltage_fine") + (node (ref R29) (pin 1)) + (node (ref U37) (pin 8)) + (node (ref C99) (pin 1))) +(net (code 60) (name "control.control_current_source") + (node (ref R30) (pin 1)) + (node (ref U37) (pin 9)) + (node (ref C100) (pin 1))) +(net (code 61) (name "control.control_current_sink") + (node (ref R32) (pin 1)) + (node (ref U37) (pin 7)) + (node (ref C98) (pin 1))) +(net (code 62) (name "control.high_gate_ctl") (node (ref U15) (pin 3)) (node (ref U29) (pin 11))) -(net (code 53) (name "control.low_gate_ctl") +(net (code 63) (name "control.low_gate_ctl") (node (ref U16) (pin 3)) (node (ref U29) (pin 12))) -(net (code 54) (name "control.limit_source") +(net (code 64) (name "control.out") + (node (ref R36) (pin 1)) + (node (ref U18) (pin 6)) + (node (ref U20) (pin 4)) + (node (ref U22) (pin 4)) + (node (ref R64) (pin 1)) + (node (ref D12) (pin 1)) + (node (ref J14) (pin 1)) + (node (ref J15) (pin 2))) +(net (code 65) (name "control.limit_source") (node (ref U12) (pin 4)) (node (ref U26) (pin 22))) -(net (code 55) (name "control.limit_sink") +(net (code 66) (name "control.limit_sink") (node (ref U13) (pin 4)) (node (ref U26) (pin 23))) -(net (code 56) (name "control.tp_int") +(net (code 67) (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") +(net (code 68) (name "control.drive") (node (ref R23) (pin 1)) (node (ref R37) (pin 1)) (node (ref R39) (pin 1)) (node (ref U39) (pin 1))) -(net (code 58) (name "control.outa") +(net (code 69) (name "control.outa") (node (ref R22) (pin 1)) (node (ref R51) (pin 1)) (node (ref U39) (pin 6)) (node (ref U39) (pin 7))) -(net (code 59) (name "control.meas_v") +(net (code 70) (name "control.meas_v") (node (ref R27) (pin 1)) (node (ref Q10) (pin 2)) (node (ref J11) (pin 1)) (node (ref R91) (pin 1))) -(net (code 60) (name "control.meas_i") +(net (code 71) (name "control.meas_i") (node (ref R31) (pin 1)) (node (ref R33) (pin 1)) (node (ref Q12) (pin 2)) (node (ref J12) (pin 1)) (node (ref R92) (pin 1))) -(net (code 61) (name "control.int_link") +(net (code 72) (name "control.int_link") (node (ref U14) (pin 4)) (node (ref R34) (pin 1)) (node (ref J2) (pin 1))) -(net (code 62) (name "control.int.r2.b") +(net (code 73) (name "control.int.c1.neg") (node (ref C53) (pin 2)) (node (ref R35) (pin 2))) -(net (code 63) (name "control.driver.out") +(net (code 74) (name "control.driver.out") (node (ref D11) (pin 2)) (node (ref Q7) (pin 3)) (node (ref Q8) (pin 3)) @@ -4495,427 +4565,357 @@ (node (ref R55) (pin 1)) (node (ref R57) (pin 1)) (node (ref R59) (pin 1))) -(net (code 64) (name "control.driver.clamp1.cathode") +(net (code 75) (name "control.driver.clamp1.anode") + (node (ref D10) (pin 2)) + (node (ref R48) (pin 2)) + (node (ref U15) (pin 1)) + (node (ref U16) (pin 1))) +(net (code 76) (name "control.driver.clamp1.cathode") (node (ref D10) (pin 1)) (node (ref D11) (pin 1))) -(net (code 65) (name "control.driver.high_fet.gate") +(net (code 77) (name "control.driver.high_fet.gate") (node (ref Q7) (pin 1)) (node (ref U15) (pin 6)) (node (ref R49) (pin 1))) -(net (code 66) (name "control.driver.low_fet.gate") +(net (code 78) (name "control.driver.low_fet.gate") (node (ref Q8) (pin 1)) (node (ref U16) (pin 6)) (node (ref R50) (pin 1))) -(net (code 67) (name "control.driver.res.b") - (node (ref D10) (pin 2)) - (node (ref R48) (pin 2)) - (node (ref U15) (pin 1)) - (node (ref U16) (pin 1))) -(net (code 68) (name "control.driver.res.res[0].b") +(net (code 79) (name "control.driver.res.res[0].b") (node (ref R39) (pin 2)) (node (ref R40) (pin 1))) -(net (code 69) (name "control.driver.res.res[1].b") +(net (code 80) (name "control.driver.res.res[1].b") (node (ref R40) (pin 2)) (node (ref R41) (pin 1))) -(net (code 70) (name "control.driver.res.res[2].b") +(net (code 81) (name "control.driver.res.res[2].b") (node (ref R41) (pin 2)) (node (ref R42) (pin 1))) -(net (code 71) (name "control.driver.res.res[3].b") +(net (code 82) (name "control.driver.res.res[3].b") (node (ref R42) (pin 2)) (node (ref R43) (pin 1))) -(net (code 72) (name "control.driver.res.res[4].b") +(net (code 83) (name "control.driver.res.res[4].b") (node (ref R43) (pin 2)) (node (ref R44) (pin 1))) -(net (code 73) (name "control.driver.res.res[5].b") +(net (code 84) (name "control.driver.res.res[5].b") (node (ref R44) (pin 2)) (node (ref R45) (pin 1))) -(net (code 74) (name "control.driver.res.res[6].b") +(net (code 85) (name "control.driver.res.res[6].b") (node (ref R45) (pin 2)) (node (ref R46) (pin 1))) -(net (code 75) (name "control.driver.res.res[7].b") +(net (code 86) (name "control.driver.res.res[7].b") (node (ref R46) (pin 2)) (node (ref R47) (pin 1))) -(net (code 76) (name "control.driver.res.res[8].b") +(net (code 87) (name "control.driver.res.res[8].b") (node (ref R47) (pin 2)) (node (ref R48) (pin 1))) -(net (code 77) (name "control.vdiv.output") +(net (code 88) (name "control.vdiv.output") (node (ref R51) (pin 2)) (node (ref R52) (pin 1)) (node (ref C59) (pin 1)) (node (ref U23) (pin 4))) -(net (code 78) (name "control.isense.sense_out") +(net (code 89) (name "control.isense.sense_out") (node (ref U17) (pin 6)) (node (ref U19) (pin 6)) (node (ref U21) (pin 6)) (node (ref R60) (pin 1))) -(net (code 79) (name "control.isense.ranges[0].isense.pwr_out") +(net (code 90) (name "control.isense.ranges[0].isense.pwr_out") (node (ref R53) (pin 2)) (node (ref U17) (pin 1)) (node (ref U18) (pin 4))) -(net (code 80) (name "control.isense.ranges[0].pwr_sw.res.a") +(net (code 91) (name "control.isense.ranges[0].pwr_sw.ic.ledk") (node (ref U18) (pin 2)) (node (ref R54) (pin 1))) -(net (code 81) (name "control.isense.ranges[1].isense.pwr_out") +(net (code 92) (name "control.isense.ranges[1].isense.pwr_out") (node (ref R55) (pin 2)) (node (ref U19) (pin 1)) (node (ref U20) (pin 3))) -(net (code 82) (name "control.isense.ranges[1].pwr_sw.res.a") +(net (code 93) (name "control.isense.ranges[1].pwr_sw.ic.ledk") (node (ref U20) (pin 2)) (node (ref R56) (pin 1))) -(net (code 83) (name "control.isense.ranges[2].isense.pwr_out") +(net (code 94) (name "control.isense.ranges[2].isense.pwr_out") (node (ref R57) (pin 2)) (node (ref U21) (pin 1)) (node (ref U22) (pin 3))) -(net (code 84) (name "control.isense.ranges[2].pwr_sw.res.a") +(net (code 95) (name "control.isense.ranges[2].pwr_sw.ic.ledk") (node (ref U22) (pin 2)) (node (ref R58) (pin 1))) -(net (code 85) (name "control.ifilt.outn") +(net (code 96) (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") +(net (code 97) (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") +(net (code 98) (name "control.vmeas.output") (node (ref U23) (pin 7)) (node (ref Q9) (pin 2))) -(net (code 88) (name "control.vmeas.rg.a") +(net (code 99) (name "control.vmeas.ic.rg2") (node (ref U23) (pin 2)) (node (ref R61) (pin 1))) -(net (code 89) (name "control.vmeas.rg.b") +(net (code 100) (name "control.vmeas.ic.rg3") (node (ref U23) (pin 3)) (node (ref R61) (pin 2))) -(net (code 90) (name "control.imeas.output") +(net (code 101) (name "control.imeas.output") (node (ref U24) (pin 7)) (node (ref Q11) (pin 2))) -(net (code 91) (name "control.imeas.rg.a") +(net (code 102) (name "control.imeas.ic.rg2") (node (ref U24) (pin 2)) (node (ref R62) (pin 1))) -(net (code 92) (name "control.imeas.rg.b") +(net (code 103) (name "control.imeas.ic.rg3") (node (ref U24) (pin 3)) (node (ref R62) (pin 2))) -(net (code 93) (name "control.vclamp.r.a") +(net (code 104) (name "control.vclamp.r.a") (node (ref Q9) (pin 1)) (node (ref R63) (pin 1)) (node (ref Q10) (pin 3))) -(net (code 94) (name "control.vclamp.r.b") +(net (code 105) (name "control.vclamp.r.b") (node (ref Q9) (pin 3)) (node (ref R63) (pin 2)) (node (ref Q10) (pin 1))) -(net (code 95) (name "control.snub_r.pwr_out") +(net (code 106) (name "control.snub_r.pwr_out") (node (ref R64) (pin 2)) (node (ref C66) (pin 1))) -(net (code 96) (name "control.iclamp.r.a") +(net (code 107) (name "control.iclamp.r.a") (node (ref Q11) (pin 1)) (node (ref R65) (pin 1)) (node (ref Q12) (pin 3))) -(net (code 97) (name "control.iclamp.r.b") +(net (code 108) (name "control.iclamp.r.b") (node (ref Q11) (pin 3)) (node (ref R65) (pin 2)) (node (ref Q12) (pin 1))) -(net (code 98) (name "control.tvs_p.ports.2") +(net (code 109) (name "control.tvs_p.ports.2") (node (ref D12) (pin 2)) (node (ref D13) (pin 2))) -(net (code 99) (name "pd.int") +(net (code 110) (name "pd.int") (node (ref U25) (pin 5)) (node (ref U26) (pin 9))) -(net (code 100) (name "pd.ic.vconn") +(net (code 111) (name "pd.ic.vconn") (node (ref U25) (pin 12)) (node (ref U25) (pin 13))) -(net (code 101) (name "mcu.program_uart_node.a_tx") +(net (code 112) (name "mcu.program_uart_node.a_tx") (node (ref U26) (pin 37)) (node (ref J4) (pin 3))) -(net (code 102) (name "mcu.program_uart_node.b_tx") +(net (code 113) (name "mcu.program_uart_node.b_tx") (node (ref U26) (pin 36)) (node (ref J4) (pin 4))) -(net (code 103) (name "mcu.program_en_node") +(net (code 114) (name "mcu.program_en_node") (node (ref U26) (pin 3)) (node (ref J4) (pin 6)) (node (ref R66) (pin 2)) (node (ref C71) (pin 1))) -(net (code 104) (name "mcu.program_boot_node") +(net (code 115) (name "mcu.program_boot_node") (node (ref U26) (pin 27)) (node (ref J4) (pin 2)) (node (ref R67) (pin 2))) -(net (code 105) (name "led.res.a") +(net (code 116) (name "led.package.k") (node (ref D14) (pin 1)) (node (ref R67) (pin 1))) -(net (code 106) (name "i2c_pull.i2c.scl") - (node (ref U1) (pin 5)) - (node (ref U5) (pin 5)) - (node (ref U25) (pin 6)) - (node (ref U26) (pin 8)) - (node (ref TP10) (pin 1)) - (node (ref R68) (pin 2)) - (node (ref J5) (pin 12)) - (node (ref U29) (pin 14)) - (node (ref U32) (pin 1)) - (node (ref U33) (pin 1)) - (node (ref U34) (pin 14)) - (node (ref U37) (pin 2))) -(net (code 107) (name "i2c_pull.i2c.sda") - (node (ref U1) (pin 6)) - (node (ref U5) (pin 6)) - (node (ref U25) (pin 7)) - (node (ref U26) (pin 7)) - (node (ref TP11) (pin 1)) - (node (ref R69) (pin 2)) - (node (ref J5) (pin 10)) - (node (ref J5) (pin 11)) - (node (ref U29) (pin 15)) - (node (ref U32) (pin 6)) - (node (ref U33) (pin 6)) - (node (ref U34) (pin 15)) - (node (ref U37) (pin 3))) -(net (code 108) (name "oled.reset") +(net (code 117) (name "oled.reset") (node (ref J5) (pin 16)) (node (ref R71) (pin 2)) (node (ref C77) (pin 1))) -(net (code 109) (name "oled.device.vcomh") - (node (ref J5) (pin 3)) - (node (ref C72) (pin 1))) -(net (code 110) (name "oled.iref_res.a") +(net (code 118) (name "oled.device.iref") (node (ref J5) (pin 4)) (node (ref R70) (pin 1))) -(net (code 111) (name "ioe_ctl.io.off_0") +(net (code 119) (name "oled.device.vcomh") + (node (ref J5) (pin 3)) + (node (ref C72) (pin 1))) +(net (code 120) (name "ioe_ctl.io.off_0") (node (ref U14) (pin 6)) (node (ref U29) (pin 9))) -(net (code 112) (name "ramp_pull.io") - (node (ref Q2) (pin 1)) - (node (ref U29) (pin 4)) - (node (ref R72) (pin 2))) -(net (code 113) (name "buck_rc.input") +(net (code 121) (name "buck_rc.input") (node (ref U26) (pin 10)) (node (ref R73) (pin 1))) -(net (code 114) (name "buck_rc.output") - (node (ref U6) (pin 2)) - (node (ref R73) (pin 2)) - (node (ref C79) (pin 1))) -(net (code 115) (name "boost_rc.input") +(net (code 122) (name "boost_rc.input") (node (ref U26) (pin 11)) (node (ref R74) (pin 1))) -(net (code 116) (name "boost_rc.output") - (node (ref U7) (pin 2)) - (node (ref R74) (pin 2)) - (node (ref C80) (pin 1))) -(net (code 117) (name "conv_ovp.output") +(net (code 123) (name "conv_ovp.output") (node (ref U30) (pin 4)) (node (ref U31) (pin 1)) (node (ref R80) (pin 2))) -(net (code 118) (name "conv_ovp.comp.inn") +(net (code 124) (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") +(net (code 125) (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)) - (node (ref U29) (pin 7)) - (node (ref U31) (pin 6)) - (node (ref U31) (pin 7))) -(net (code 121) (name "conv_latch.ic.out2") - (node (ref U31) (pin 2)) - (node (ref U31) (pin 3))) -(net (code 122) (name "conv_en_pull.io") +(net (code 126) (name "conv_latch.rst") (node (ref U29) (pin 6)) (node (ref U31) (pin 5)) (node (ref R79) (pin 2))) -(net (code 123) (name "pass_temp.alert") +(net (code 127) (name "conv_latch.ic.in1b") + (node (ref U31) (pin 2)) + (node (ref U31) (pin 3))) +(net (code 128) (name "pass_temp.alert") (node (ref U32) (pin 3))) -(net (code 124) (name "conv_temp.alert") +(net (code 129) (name "conv_temp.alert") (node (ref U33) (pin 3))) -(net (code 125) (name "conv_sense.output") +(net (code 130) (name "conv_sense.output") (node (ref U26) (pin 12)) (node (ref R81) (pin 2)) (node (ref R82) (pin 1))) -(net (code 126) (name "ioe_ui.io.irange_0") +(net (code 131) (name "ioe_ui.io.irange_0") (node (ref U17) (pin 3)) (node (ref U18) (pin 1)) (node (ref U34) (pin 11))) -(net (code 127) (name "ioe_ui.io.irange_1") +(net (code 132) (name "ioe_ui.io.irange_1") (node (ref U19) (pin 3)) (node (ref U20) (pin 1)) (node (ref U34) (pin 9))) -(net (code 128) (name "ioe_ui.io.irange_2") +(net (code 133) (name "ioe_ui.io.irange_2") (node (ref U21) (pin 3)) (node (ref U22) (pin 1)) (node (ref U34) (pin 10))) -(net (code 129) (name "enc.a") +(net (code 134) (name "enc.a") (node (ref U26) (pin 35)) (node (ref SW1) (pin A))) -(net (code 130) (name "enc.b") +(net (code 135) (name "enc.b") (node (ref U26) (pin 34)) (node (ref SW1) (pin B))) -(net (code 131) (name "enc.sw") +(net (code 136) (name "enc.sw") (node (ref U26) (pin 33)) (node (ref SW1) (pin S1))) -(net (code 132) (name "dir.a") +(net (code 137) (name "dir.a") (node (ref U34) (pin 4)) (node (ref SW2) (pin 1))) -(net (code 133) (name "dir.b") +(net (code 138) (name "dir.b") (node (ref U34) (pin 12)) (node (ref SW2) (pin 4))) -(net (code 134) (name "dir.c") +(net (code 139) (name "dir.c") (node (ref U34) (pin 6)) (node (ref SW2) (pin 3))) -(net (code 135) (name "dir.d") +(net (code 140) (name "dir.d") (node (ref U34) (pin 7)) (node (ref SW2) (pin 6))) -(net (code 136) (name "dir.center") +(net (code 141) (name "dir.center") (node (ref U34) (pin 5)) (node (ref SW2) (pin 2))) -(net (code 137) (name "qwiic_pull.i2c.scl") +(net (code 142) (name "qwiic_pull.i2c.scl") (node (ref U26) (pin 39)) (node (ref R83) (pin 2)) (node (ref J6) (pin 4))) -(net (code 138) (name "qwiic_pull.i2c.sda") +(net (code 143) (name "qwiic_pull.i2c.sda") (node (ref U26) (pin 38)) (node (ref R84) (pin 2)) (node (ref J6) (pin 3))) -(net (code 139) (name "dutio.io0") +(net (code 144) (name "dutio.io0") (node (ref J7) (pin 2)) (node (ref R85) (pin 1))) -(net (code 140) (name "dutio.io1") +(net (code 145) (name "dutio.io1") (node (ref J7) (pin 3)) (node (ref R86) (pin 1))) -(net (code 141) (name "dut0_clamp.signal_out") +(net (code 146) (name "dut0_clamp.signal_out") (node (ref U26) (pin 24)) (node (ref R85) (pin 2))) -(net (code 142) (name "dut1_clamp.signal_out") +(net (code 147) (name "dut1_clamp.signal_out") (node (ref U26) (pin 25)) (node (ref R86) (pin 2))) -(net (code 143) (name "touch_duck.pad") +(net (code 148) (name "touch_duck.pad") (node (ref U26) (pin 21)) (node (ref U35) (pin 1))) -(net (code 144) (name "rgbs.din") +(net (code 149) (name "rgbs.din") (node (ref U26) (pin 31)) (node (ref D15) (pin 3))) -(net (code 145) (name "rgbs.dout") +(net (code 150) (name "rgbs.dout") (node (ref D20) (pin 1))) -(net (code 146) (name "rgbs.led[0].dout") +(net (code 151) (name "rgbs.led[0].dout") (node (ref D15) (pin 1)) (node (ref D16) (pin 3))) -(net (code 147) (name "rgbs.led[1].dout") +(net (code 152) (name "rgbs.led[1].dout") (node (ref D16) (pin 1)) (node (ref D17) (pin 3))) -(net (code 148) (name "rgbs.led[2].dout") +(net (code 153) (name "rgbs.led[2].dout") (node (ref D17) (pin 1)) (node (ref D18) (pin 3))) -(net (code 149) (name "rgbs.led[3].dout") +(net (code 154) (name "rgbs.led[3].dout") (node (ref D18) (pin 1)) (node (ref D19) (pin 3))) -(net (code 150) (name "rgbs.led[4].dout") +(net (code 155) (name "rgbs.led[4].dout") (node (ref D19) (pin 1)) (node (ref D20) (pin 3))) -(net (code 151) (name "fan_drv.control") +(net (code 156) (name "fan_drv.control") (node (ref U26) (pin 32)) (node (ref Q13) (pin 1))) -(net (code 152) (name "fan_drv.pre.drain") +(net (code 157) (name "fan_drv.output") + (node (ref Q14) (pin 3)) + (node (ref J8) (pin 2))) +(net (code 158) (name "fan_drv.pre.drain") (node (ref Q13) (pin 3)) (node (ref R87) (pin 2)) (node (ref Q14) (pin 1))) -(net (code 153) (name "fan.pwr") - (node (ref Q14) (pin 3)) - (node (ref J8) (pin 2))) -(net (code 154) (name "spk_drv.i2s.sck") +(net (code 159) (name "spk_drv.i2s.sck") (node (ref U26) (pin 5)) (node (ref U36) (pin 16))) -(net (code 155) (name "spk_drv.i2s.ws") +(net (code 160) (name "spk_drv.i2s.ws") (node (ref U26) (pin 6)) (node (ref U36) (pin 14))) -(net (code 156) (name "spk_drv.i2s.sd") +(net (code 161) (name "spk_drv.i2s.sd") (node (ref U26) (pin 4)) (node (ref U36) (pin 1))) -(net (code 157) (name "spk_drv.out.a") +(net (code 162) (name "spk_drv.out.a") (node (ref U36) (pin 9)) (node (ref J9) (pin 1))) -(net (code 158) (name "spk_drv.out.b") +(net (code 163) (name "spk_drv.out.b") (node (ref U36) (pin 10)) (node (ref J9) (pin 2))) -(net (code 159) (name "dac.out0") - (node (ref R26) (pin 1)) - (node (ref U37) (pin 6)) - (node (ref C97) (pin 1))) -(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)) - (node (ref C100) (pin 1))) -(net (code 163) (name "dac.rdy") - (node (ref U37) (pin 5))) -(net (code 164) (name "dac_ferrite.pwr_out") +(net (code 164) (name "dac.pwr") (node (ref U37) (pin 1)) (node (ref U37) (pin 4)) (node (ref C95) (pin 1)) (node (ref C96) (pin 1)) (node (ref FB3) (pin 2))) -(net (code 165) (name "adc.mclkin") +(net (code 165) (name "dac.rdy") + (node (ref U37) (pin 5))) +(net (code 166) (name "adc.mclkin") (node (ref U26) (pin 20)) (node (ref U38) (pin 18))) -(net (code 166) (name "adc.vins.3") +(net (code 167) (name "adc.vins.3") (node (ref U38) (pin 8))) -(net (code 167) (name "adc.vins.4") +(net (code 168) (name "adc.vins.4") (node (ref U38) (pin 9))) -(net (code 168) (name "adc.vins.5") +(net (code 169) (name "adc.vins.5") (node (ref U38) (pin 10))) -(net (code 169) (name "adc.vins.6") +(net (code 170) (name "adc.vins.6") (node (ref U38) (pin 11))) -(net (code 170) (name "adc.vins.7") +(net (code 171) (name "adc.vins.7") (node (ref U38) (pin 12))) -(net (code 171) (name "adc.spi.sck") +(net (code 172) (name "adc.spi.sck") (node (ref U26) (pin 17)) (node (ref U38) (pin 14))) -(net (code 172) (name "adc.spi.mosi") +(net (code 173) (name "adc.spi.mosi") (node (ref U26) (pin 18)) (node (ref U38) (pin 15))) -(net (code 173) (name "adc.spi.miso") +(net (code 174) (name "adc.spi.miso") (node (ref U26) (pin 19)) (node (ref U38) (pin 16))) -(net (code 174) (name "adc.cs") +(net (code 175) (name "adc.cs") (node (ref U26) (pin 15)) (node (ref U38) (pin 13))) -(net (code 175) (name "adc.ic.avdd") +(net (code 176) (name "adc.ic.avdd") (node (ref U38) (pin 1)) (node (ref R88) (pin 2)) (node (ref C101) (pin 1)) (node (ref C102) (pin 1))) -(net (code 176) (name "adc.ic.dvdd") +(net (code 177) (name "adc.ic.dvdd") (node (ref U38) (pin 20)) (node (ref R89) (pin 2)) (node (ref C103) (pin 1)) (node (ref C104) (pin 1))) -(net (code 177) (name "vcen_rc.output") +(net (code 178) (name "vcen_rc.output") (node (ref U38) (pin 7)) (node (ref R90) (pin 2)) (node (ref C106) (pin 1))) -(net (code 178) (name "mv_rc.output") +(net (code 179) (name "mv_rc.output") (node (ref U38) (pin 5)) (node (ref R91) (pin 2)) (node (ref C107) (pin 1))) -(net (code 179) (name "mi_rc.output") +(net (code 180) (name "mi_rc.output") (node (ref U38) (pin 6)) (node (ref R92) (pin 2)) (node (ref C108) (pin 1))) -(net (code 180) (name "outp.port") - (node (ref R36) (pin 1)) - (node (ref U18) (pin 6)) - (node (ref U20) (pin 4)) - (node (ref U22) (pin 4)) - (node (ref R64) (pin 1)) - (node (ref D12) (pin 1)) - (node (ref J14) (pin 1)) - (node (ref J15) (pin 2))) (net (code 181) (name "vimeas_amps.inp.1") (node (ref R36) (pin 2)) (node (ref U39) (pin 5))) diff --git a/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js b/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js index 48d7d04c6..be7eb180d 100644 --- a/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js +++ b/examples/UsbSourceMeasure/UsbSourceMeasure.svgpcb.js @@ -1620,41 +1620,52 @@ board.setNetlist([ {name: "usb.pwr", pads: [["J1", "A4"], ["J1", "A9"], ["J1", "B4"], ["J1", "B9"], ["F1", "1"]]}, {name: "usb.cc.cc1", pads: [["J1", "A5"], ["U25", "10"], ["U25", "11"]]}, {name: "usb.cc.cc2", pads: [["J1", "B5"], ["U25", "1"], ["U25", "14"]]}, + {name: "vusb_sense.i2c.scl", pads: [["U1", "5"], ["U5", "5"], ["U25", "6"], ["U26", "8"], ["TP10", "1"], ["R68", "2"], ["J5", "12"], ["U29", "14"], ["U32", "1"], ["U33", "1"], ["U34", "14"], ["U37", "2"]]}, + {name: "vusb_sense.i2c.sda", pads: [["U1", "6"], ["U5", "6"], ["U25", "7"], ["U26", "7"], ["TP11", "1"], ["R69", "2"], ["J5", "10"], ["J5", "11"], ["U29", "15"], ["U32", "6"], ["U33", "6"], ["U34", "15"], ["U37", "3"]]}, + {name: "vusb_sense.sense_pos", pads: [["U1", "1"], ["R1", "1"], ["FB1", "2"], ["D1", "1"]]}, {name: "fuse_vusb.pwr_out", pads: [["F1", "2"], ["FB1", "1"]]}, - {name: "filt_vusb.pwr_out", pads: [["U1", "1"], ["R1", "1"], ["FB1", "2"], ["D1", "1"]]}, - {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.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.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"]]}, + {name: "ramp.control", pads: [["Q2", "1"], ["U29", "4"], ["R72", "2"]]}, + {name: "ramp.drv.gate", pads: [["Q1", "4"], ["C2", "2"], ["C3", "2"], ["R2", "2"], ["R3", "1"]]}, + {name: "ramp.div.bottom", pads: [["R3", "2"], ["Q2", "3"]]}, + {name: "reg_v5.ic.sw", pads: [["U2", "2"], ["C6", "2"], ["L1", "1"]]}, + {name: "reg_v5.ic.fb", pads: [["U2", "4"], ["R4", "2"], ["R5", "1"]]}, + {name: "reg_v5.ic.boot", pads: [["U2", "6"], ["C6", "1"]]}, + {name: "reg_v5.ic.en", pads: [["U2", "5"], ["R6", "2"]]}, + {name: "reg_3v3.ic.sw", pads: [["U3", "2"], ["C10", "2"], ["L2", "1"]]}, + {name: "reg_3v3.ic.fb", pads: [["U3", "4"], ["R7", "2"], ["R8", "1"]]}, + {name: "reg_3v3.ic.boot", pads: [["U3", "6"], ["C10", "1"]]}, + {name: "reg_3v3.ic.en", pads: [["U3", "5"], ["R9", "2"]]}, + {name: "reg_v12.ic.sw", pads: [["U4", "1"], ["L3", "2"], ["D3", "2"]]}, + {name: "reg_v12.ic.fb", pads: [["U4", "3"], ["R10", "2"], ["R11", "1"], ["C16", "2"]]}, + {name: "conv.reset", pads: [["U6", "3"], ["U7", "3"], ["U29", "7"], ["U31", "6"], ["U31", "7"]]}, + {name: "conv.buck_pwm", pads: [["U6", "2"], ["R73", "2"], ["C79", "1"]]}, + {name: "conv.boost_pwm", pads: [["U7", "2"], ["R74", "2"], ["C80", "1"]]}, {name: "conv.l1", pads: [["L4", "1"], ["U6", "7"], ["C34", "2"], ["Q3", "5"], ["Q4", "1"], ["Q4", "2"], ["Q4", "3"]]}, {name: "conv.l2", pads: [["L4", "2"], ["U7", "7"], ["C36", "2"], ["Q5", "5"], ["Q6", "1"], ["Q6", "2"], ["Q6", "3"]]}, + {name: "conv.buck_sw.driver.low_out", pads: [["U6", "5"], ["R13", "1"]]}, + {name: "conv.buck_sw.driver.high_out", pads: [["U6", "8"], ["R14", "1"]]}, {name: "conv.buck_sw.driver.ic.bst", pads: [["U6", "1"], ["C34", "1"], ["D4", "1"]]}, - {name: "conv.buck_sw.low_gate_res.a", pads: [["U6", "5"], ["R13", "1"]]}, - {name: "conv.buck_sw.low_gate_res.b", pads: [["Q3", "4"], ["R13", "2"]]}, - {name: "conv.buck_sw.high_gate_res.a", pads: [["U6", "8"], ["R14", "1"]]}, - {name: "conv.buck_sw.high_gate_res.b", pads: [["Q4", "4"], ["R14", "2"]]}, + {name: "conv.buck_sw.low_fet.gate", pads: [["Q3", "4"], ["R13", "2"]]}, + {name: "conv.buck_sw.high_fet.gate", pads: [["Q4", "4"], ["R14", "2"]]}, + {name: "conv.boost_sw.driver.low_out", pads: [["U7", "5"], ["R15", "1"]]}, + {name: "conv.boost_sw.driver.high_out", pads: [["U7", "8"], ["R16", "1"]]}, {name: "conv.boost_sw.driver.ic.bst", pads: [["U7", "1"], ["C36", "1"], ["D5", "1"]]}, - {name: "conv.boost_sw.low_gate_res.a", pads: [["U7", "5"], ["R15", "1"]]}, - {name: "conv.boost_sw.low_gate_res.b", pads: [["Q5", "4"], ["R15", "2"]]}, - {name: "conv.boost_sw.high_gate_res.a", pads: [["U7", "8"], ["R16", "1"]]}, - {name: "conv.boost_sw.high_gate_res.b", pads: [["Q6", "4"], ["R16", "2"]]}, + {name: "conv.boost_sw.low_fet.gate", pads: [["Q5", "4"], ["R15", "2"]]}, + {name: "conv.boost_sw.high_fet.gate", pads: [["Q6", "4"], ["R16", "2"]]}, {name: "ref_div.output", pads: [["R17", "2"], ["R18", "1"], ["U40", "3"]]}, {name: "ref_buf.output", pads: [["R19", "1"], ["U40", "1"], ["U40", "2"]]}, - {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: "reg_vcontrol.ic.sw", pads: [["U10", "1"], ["L5", "2"], ["D7", "2"]]}, + {name: "reg_vcontrol.ic.fb", pads: [["U10", "3"], ["R20", "2"], ["R21", "1"], ["C43", "2"]]}, {name: "filt_vcontroln.pwr_out", pads: [["FB2", "2"], ["U11", "4"], ["U11", "5"]]}, - {name: "reg_vcontroln.cf.pos", pads: [["U11", "6"], ["C44", "1"]]}, - {name: "reg_vcontroln.cf.neg", pads: [["U11", "3"], ["C44", "2"]]}, + {name: "reg_vcontroln.ic.capn", pads: [["U11", "3"], ["C44", "2"]]}, + {name: "reg_vcontroln.ic.capp", pads: [["U11", "6"], ["C44", "1"]]}, + {name: "control.control_voltage", pads: [["R26", "1"], ["U37", "6"], ["C97", "1"]]}, + {name: "control.control_voltage_fine", pads: [["R29", "1"], ["U37", "8"], ["C99", "1"]]}, + {name: "control.control_current_source", pads: [["R30", "1"], ["U37", "9"], ["C100", "1"]]}, + {name: "control.control_current_sink", pads: [["R32", "1"], ["U37", "7"], ["C98", "1"]]}, {name: "control.high_gate_ctl", pads: [["U15", "3"], ["U29", "11"]]}, {name: "control.low_gate_ctl", pads: [["U16", "3"], ["U29", "12"]]}, + {name: "control.out", pads: [["R36", "1"], ["U18", "6"], ["U20", "4"], ["U22", "4"], ["R64", "1"], ["D12", "1"], ["J14", "1"], ["J15", "2"]]}, {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"]]}, @@ -1663,12 +1674,12 @@ board.setNetlist([ {name: "control.meas_v", pads: [["R27", "1"], ["Q10", "2"], ["J11", "1"], ["R91", "1"]]}, {name: "control.meas_i", pads: [["R31", "1"], ["R33", "1"], ["Q12", "2"], ["J12", "1"], ["R92", "1"]]}, {name: "control.int_link", pads: [["U14", "4"], ["R34", "1"], ["J2", "1"]]}, - {name: "control.int.r2.b", pads: [["C53", "2"], ["R35", "2"]]}, + {name: "control.int.c1.neg", pads: [["C53", "2"], ["R35", "2"]]}, {name: "control.driver.out", pads: [["D11", "2"], ["Q7", "3"], ["Q8", "3"], ["R49", "2"], ["R50", "2"], ["R53", "1"], ["R55", "1"], ["R57", "1"], ["R59", "1"]]}, + {name: "control.driver.clamp1.anode", pads: [["D10", "2"], ["R48", "2"], ["U15", "1"], ["U16", "1"]]}, {name: "control.driver.clamp1.cathode", pads: [["D10", "1"], ["D11", "1"]]}, {name: "control.driver.high_fet.gate", pads: [["Q7", "1"], ["U15", "6"], ["R49", "1"]]}, {name: "control.driver.low_fet.gate", pads: [["Q8", "1"], ["U16", "6"], ["R50", "1"]]}, - {name: "control.driver.res.b", pads: [["D10", "2"], ["R48", "2"], ["U15", "1"], ["U16", "1"]]}, {name: "control.driver.res.res[0].b", pads: [["R39", "2"], ["R40", "1"]]}, {name: "control.driver.res.res[1].b", pads: [["R40", "2"], ["R41", "1"]]}, {name: "control.driver.res.res[2].b", pads: [["R41", "2"], ["R42", "1"]]}, @@ -1681,19 +1692,19 @@ board.setNetlist([ {name: "control.vdiv.output", pads: [["R51", "2"], ["R52", "1"], ["C59", "1"], ["U23", "4"]]}, {name: "control.isense.sense_out", pads: [["U17", "6"], ["U19", "6"], ["U21", "6"], ["R60", "1"]]}, {name: "control.isense.ranges[0].isense.pwr_out", pads: [["R53", "2"], ["U17", "1"], ["U18", "4"]]}, - {name: "control.isense.ranges[0].pwr_sw.res.a", pads: [["U18", "2"], ["R54", "1"]]}, + {name: "control.isense.ranges[0].pwr_sw.ic.ledk", pads: [["U18", "2"], ["R54", "1"]]}, {name: "control.isense.ranges[1].isense.pwr_out", pads: [["R55", "2"], ["U19", "1"], ["U20", "3"]]}, - {name: "control.isense.ranges[1].pwr_sw.res.a", pads: [["U20", "2"], ["R56", "1"]]}, + {name: "control.isense.ranges[1].pwr_sw.ic.ledk", 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.isense.ranges[2].pwr_sw.ic.ledk", pads: [["U22", "2"], ["R58", "1"]]}, {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"]]}, + {name: "control.vmeas.ic.rg2", pads: [["U23", "2"], ["R61", "1"]]}, + {name: "control.vmeas.ic.rg3", pads: [["U23", "3"], ["R61", "2"]]}, {name: "control.imeas.output", pads: [["U24", "7"], ["Q11", "2"]]}, - {name: "control.imeas.rg.a", pads: [["U24", "2"], ["R62", "1"]]}, - {name: "control.imeas.rg.b", pads: [["U24", "3"], ["R62", "2"]]}, + {name: "control.imeas.ic.rg2", pads: [["U24", "2"], ["R62", "1"]]}, + {name: "control.imeas.ic.rg3", pads: [["U24", "3"], ["R62", "2"]]}, {name: "control.vclamp.r.a", pads: [["Q9", "1"], ["R63", "1"], ["Q10", "3"]]}, {name: "control.vclamp.r.b", pads: [["Q9", "3"], ["R63", "2"], ["Q10", "1"]]}, {name: "control.snub_r.pwr_out", pads: [["R64", "2"], ["C66", "1"]]}, @@ -1706,24 +1717,18 @@ board.setNetlist([ {name: "mcu.program_uart_node.b_tx", pads: [["U26", "36"], ["J4", "4"]]}, {name: "mcu.program_en_node", pads: [["U26", "3"], ["J4", "6"], ["R66", "2"], ["C71", "1"]]}, {name: "mcu.program_boot_node", pads: [["U26", "27"], ["J4", "2"], ["R67", "2"]]}, - {name: "led.res.a", pads: [["D14", "1"], ["R67", "1"]]}, - {name: "i2c_pull.i2c.scl", pads: [["U1", "5"], ["U5", "5"], ["U25", "6"], ["U26", "8"], ["TP10", "1"], ["R68", "2"], ["J5", "12"], ["U29", "14"], ["U32", "1"], ["U33", "1"], ["U34", "14"], ["U37", "2"]]}, - {name: "i2c_pull.i2c.sda", pads: [["U1", "6"], ["U5", "6"], ["U25", "7"], ["U26", "7"], ["TP11", "1"], ["R69", "2"], ["J5", "10"], ["J5", "11"], ["U29", "15"], ["U32", "6"], ["U33", "6"], ["U34", "15"], ["U37", "3"]]}, + {name: "led.package.k", pads: [["D14", "1"], ["R67", "1"]]}, {name: "oled.reset", pads: [["J5", "16"], ["R71", "2"], ["C77", "1"]]}, + {name: "oled.device.iref", pads: [["J5", "4"], ["R70", "1"]]}, {name: "oled.device.vcomh", pads: [["J5", "3"], ["C72", "1"]]}, - {name: "oled.iref_res.a", pads: [["J5", "4"], ["R70", "1"]]}, {name: "ioe_ctl.io.off_0", pads: [["U14", "6"], ["U29", "9"]]}, - {name: "ramp_pull.io", pads: [["Q2", "1"], ["U29", "4"], ["R72", "2"]]}, {name: "buck_rc.input", pads: [["U26", "10"], ["R73", "1"]]}, - {name: "buck_rc.output", pads: [["U6", "2"], ["R73", "2"], ["C79", "1"]]}, {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.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"]]}, + {name: "conv_latch.rst", pads: [["U29", "6"], ["U31", "5"], ["R79", "2"]]}, + {name: "conv_latch.ic.in1b", pads: [["U31", "2"], ["U31", "3"]]}, {name: "pass_temp.alert", pads: [["U32", "3"]]}, {name: "conv_temp.alert", pads: [["U33", "3"]]}, {name: "conv_sense.output", pads: [["U26", "12"], ["R81", "2"], ["R82", "1"]]}, @@ -1753,19 +1758,15 @@ board.setNetlist([ {name: "rgbs.led[3].dout", pads: [["D18", "1"], ["D19", "3"]]}, {name: "rgbs.led[4].dout", pads: [["D19", "1"], ["D20", "3"]]}, {name: "fan_drv.control", pads: [["U26", "32"], ["Q13", "1"]]}, + {name: "fan_drv.output", pads: [["Q14", "3"], ["J8", "2"]]}, {name: "fan_drv.pre.drain", pads: [["Q13", "3"], ["R87", "2"], ["Q14", "1"]]}, - {name: "fan.pwr", pads: [["Q14", "3"], ["J8", "2"]]}, {name: "spk_drv.i2s.sck", pads: [["U26", "5"], ["U36", "16"]]}, {name: "spk_drv.i2s.ws", pads: [["U26", "6"], ["U36", "14"]]}, {name: "spk_drv.i2s.sd", pads: [["U26", "4"], ["U36", "1"]]}, {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.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.pwr", pads: [["U37", "1"], ["U37", "4"], ["C95", "1"], ["C96", "1"], ["FB3", "2"]]}, {name: "dac.rdy", pads: [["U37", "5"]]}, - {name: "dac_ferrite.pwr_out", pads: [["U37", "1"], ["U37", "4"], ["C95", "1"], ["C96", "1"], ["FB3", "2"]]}, {name: "adc.mclkin", pads: [["U26", "20"], ["U38", "18"]]}, {name: "adc.vins.3", pads: [["U38", "8"]]}, {name: "adc.vins.4", pads: [["U38", "9"]]}, @@ -1781,7 +1782,6 @@ board.setNetlist([ {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.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"]]}, diff --git a/examples/UsbUart/UsbUart.net b/examples/UsbUart/UsbUart.net index e7a892778..1bf47e8e2 100644 --- a/examples/UsbUart/UsbUart.net +++ b/examples/UsbUart/UsbUart.net @@ -297,7 +297,7 @@ (node (ref UU1) (pin 6)) (node (ref UU1) (pin 9)) (node (ref UC3) (pin 1))) -(net (code 19) (name "Uled.res.a") +(net (code 19) (name "Uled.package.k") (node (ref UD2) (pin 1)) (node (ref UR3) (pin 1)))) ) \ No newline at end of file diff --git a/examples/UsbUart/UsbUart.svgpcb.js b/examples/UsbUart/UsbUart.svgpcb.js index 7d8373b24..dc0cd8a6d 100644 --- a/examples/UsbUart/UsbUart.svgpcb.js +++ b/examples/UsbUart/UsbUart.svgpcb.js @@ -110,7 +110,7 @@ board.setNetlist([ {name: "Uusbconv.rts", pads: [["UU1", "24"]]}, {name: "Uusbconv.cts", pads: [["UU1", "23"]]}, {name: "Uusbconv.ic.vdd", pads: [["UU1", "6"], ["UU1", "9"], ["UC3", "1"]]}, - {name: "Uled.res.a", pads: [["UD2", "1"], ["UR3", "1"]]} + {name: "Uled.package.k", pads: [["UD2", "1"], ["UR3", "1"]]} ]) const limit0 = pt(-0.07874015748031496, -0.07874015748031496);