diff --git a/README.md b/README.md index f9fa6ec..13f0112 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,4 @@ Options atmega32u4_au_v1:
[todo] - - atmega32u4_au_v2:
[todo] - - diff --git a/kicad-templates/atmega32u4_au_v1.svg b/kicad-templates/atmega32u4_au_v1.svg index e1d74f3..5ea3e06 100644 --- a/kicad-templates/atmega32u4_au_v1.svg +++ b/kicad-templates/atmega32u4_au_v1.svg @@ -6,8 +6,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" - width="39.4716cm" height="44.1960cm" viewBox="0.0000 0.0000 39.4716 44.1960"> -SVG Image created as atmega32u4_au_v1.svg date 2024/07/23 17:48:55 + width="61.1632cm" height="19.7612cm" viewBox="0.0000 0.0000 61.1632 19.7612"> +SVG Image created as atmega32u4_au_v1.svg date 2024/07/25 19:53:24 Image generated by PCBNEW - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - + - + - - - - - - +U1 U1 - - - - - - - - - - - - - - - -R3 - -R3 - -C7 +C7 + - - - - - - - - - - - - - - - - -C2 +C2 + - - - - - -J1 -J1 - - - - - - - - - - - -R1 - -R1 - - - - - - - - - -R2 +R2 + - - - - - - - -R4 - -R4 - - - - - - - - - - - - - - - - +C1 +text-anchor="middle" opacity="0">C4 -C1 -C4 + - - - - - - - - - - - - - - - - - - +Y1 + +Y1 + - -C3 -C3 - - - - - - -U2 +U2 + - - - - - - - - - - - - - - - - - - - +C6 + +C6 + - - -C8 -C8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +R3 + +R3 + - - - - - - - - - - - - - -R2 - -R2 - - - - - - - - - - - -C1 +C1 + - - - - - - - - - - -C5 - -C5 - - - - - - - - - - -C8 +C8 + - - - - - - - - - - - - - - - - - - - -C4 -C4 - - - - - - - - - - - - - - - - - - -U2 -U2 - - - - - - - - -R4 +R4 + - - - - - - - - - - -C6 -C6 - - - -R1 +R1 + - - - - - - - - - - - - - - - -J1 +J1 + - - - - - - - - - -C3 +C3 + - - - - - - - -C2 - -C2 - - - - - - - - - - - - - - - - - - - - - -C5 +C5 + - - - -C7 -C7 - - - - - - - - - - - - - - - - - - -RST - -RST - - - - - - - - - -RST +RST + - - - - - - - - - - - - - - - - - - - - - - - -Y1 - -Y1 - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - diff --git a/kicad-templates/atmega32u4_au_v2.svg b/kicad-templates/atmega32u4_au_v2.svg deleted file mode 100644 index 86b0f29..0000000 --- a/kicad-templates/atmega32u4_au_v2.svg +++ /dev/null @@ -1,3573 +0,0 @@ - - - -SVG Image created as atmega32u4_au_v2.svg date 2024/07/25 19:45:54 - Image generated by PCBNEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R4 -R4 - - - - - - - - - - - - - - -C1 -C1 - - - - - - - - - - - - - - - - - - - - - -U1 - -U1 - - - - - - - - - - - - - - -C8 -C8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R2 -R2 - - - - - - - - - - - - - - - - - - - - - -C5 -C5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -C2 -C2 - - - - - - - - - - - - - - - - - - - - - - - - - -RST -RST - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R3 - -R3 - - - - - - - - - - - - - - - - - - - - - - - - -C3 -C3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -U2 -U2 - - - - - - - - - - - - - - - - - - - - -C6 - -C6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R1 -R1 - - - - - - - - - - - - - - - - -J1 -J1 - - - - - - - - - - - -C4 - -C4 - - - - - - - - - - - - - - - - - - -C7 -C7 - - - - - - - - - - - - - - - - - - -Y1 - -Y1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/kle2netlist/circuits/__init__.py b/src/kle2netlist/circuits/__init__.py index 0003b4d..64039d2 100644 --- a/src/kle2netlist/circuits/__init__.py +++ b/src/kle2netlist/circuits/__init__.py @@ -3,16 +3,13 @@ # SPDX-License-Identifier: MIT from enum import Enum -from .atmega32u4 import atmega32u4_au_v1, atmega32u4_au_v2 +from .atmega32u4 import atmega32u4_au_v1 class ControllerCircuit(str, Enum): NONE = "none" ATMEGA32U4_AU_V1 = "atmega32u4_au_v1" - ATMEGA32U4_AU_V2 = "atmega32u4_au_v2" def add(self, rows, columns) -> None: if self == ControllerCircuit.ATMEGA32U4_AU_V1: atmega32u4_au_v1(rows, columns) - elif self == ControllerCircuit.ATMEGA32U4_AU_V2: - atmega32u4_au_v2(rows, columns) diff --git a/src/kle2netlist/circuits/atmega32u4.py b/src/kle2netlist/circuits/atmega32u4.py index 48ee61c..c7f2ce3 100644 --- a/src/kle2netlist/circuits/atmega32u4.py +++ b/src/kle2netlist/circuits/atmega32u4.py @@ -1,8 +1,6 @@ # SPDX-FileCopyrightText: 2024-present adamws # # SPDX-License-Identifier: MIT -from copy import copy - import skidl ATMEGA32U4AU_PIN_ASSIGN_ORDER = [ @@ -35,38 +33,16 @@ V1_FOOTPRINTS = { "c_template": "Capacitor_SMD:C_0603_1608Metric", "r_template": "Resistor_SMD:R_0603_1608Metric", - "uc": "Package_QFP:TQFP-44_10x10mm_P0.8mm", + "uc": "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm", "crystal": "Crystal:Crystal_SMD_3225-4Pin_3.2x2.5mm", "usb": "Connector_USB:USB_C_Receptacle_XKB_U262-16XN-4BVC11", "esd_protection": "Package_TO_SOT_SMD:SOT-23-6", "button": "Button_Switch_SMD:SW_SPST_TL3342", } -V2_FOOTPRINTS = copy(V1_FOOTPRINTS) -V2_FOOTPRINTS["uc"] = "Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm" - -FOOTPRINTS = {"v1": V1_FOOTPRINTS, "v2": V2_FOOTPRINTS} +FOOTPRINTS = {"v1": V1_FOOTPRINTS} # fmt: off V1_POSITIONS = [ - { "ref": "C1", "x": 34.01, "y": 1.69, "rotation": 45.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "C2", "x": 33.65, "y": -2.78, "rotation": -45.0, "side": "Back", "ref_x": 0.0, "ref_y": -1.43 }, - { "ref": "C3", "x": 11.58, "y": 4.24, "rotation": 180.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "C4", "x": 21.29, "y": -8.15, "rotation": 180.0, "side": "Back", "ref_x": -2.5, "ref_y": 0.0 }, - { "ref": "C5", "x": 24.2, "y": 9.37, "rotation": -90.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "C6", "x": 11.58, "y": -3.7, "rotation": 180.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "C7", "x": 16.97, "y": -8.15, "rotation": 180.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "C8", "x": 21.29, "y": -9.74, "rotation": 180.0, "side": "Back", "ref_x": -2.5, "ref_y": 0.0 }, - { "ref": "J1", "x": 18.75, "y": -27.275, "rotation": 0.0, "side": "Back", "ref_x": 0.0, "ref_y": 5.715 }, - { "ref": "R1", "x": 17.85, "y": -12.28, "rotation": 90.0, "side": "Back", "ref_x": 0.0, "ref_y": -1.43 }, - { "ref": "R2", "x": 19.55, "y": -12.27, "rotation": 90.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "R3", "x": 16.96, "y": 9.37, "rotation": -90.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "R4", "x": 32.01, "y": -5.39, "rotation": -135.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.43 }, - { "ref": "RST", "x": 41.75, "y": -6.0, "rotation": 90.0, "side": "Back", "ref_x": 0.0, "ref_y": 3.75 }, - { "ref": "U1", "x": 20.98, "y": 0.25, "rotation": -90.0, "side": "Back", "ref_x": 0.0, "ref_y": 7.45 }, - { "ref": "U2", "x": 18.7, "y": -18.375, "rotation": 0.0, "side": "Back", "ref_x": 0.0, "ref_y": 2.9 }, - { "ref": "Y1", "x": 31.6, "y": -0.68, "rotation": 135.0, "side": "Back", "ref_x": -1.2, "ref_y": -2.5 }, -] -V2_POSITIONS = [ { "ref": "C1", "x": -11.6355, "y": -0.6, "rotation": 180.0, "side": "Back", "ref_x": 0.0, "ref_y": 1.5 }, { "ref": "C2", "x": -11.6355, "y": 1.6, "rotation": 180.0, "side": "Back", "ref_x": 0.0, "ref_y": -1.5 }, { "ref": "C3", "x": -5.9205, "y": 3.952, "rotation": 180.0, "side": "Back", "ref_x": 2.5, "ref_y": 0.0 }, @@ -85,7 +61,7 @@ { "ref": "U2", "x": 24.4865, "y": 1.285, "rotation": 0.0, "side": "Back", "ref_x": 0.0, "ref_y": 2.45 }, { "ref": "Y1", "x": -7.9525, "y": 0.5, "rotation": -90.0, "side": "Back", "ref_x": 0.0, "ref_y": -2.5 }, ] -V2_TRACKS = [ +V1_TRACKS = [ { "x1": -2.5, "y1": -3.3375, "x2": -2.5, "y2": -4.396, "width": 0.2, "layer": 31 }, { "x1": -23.67725, "y1": -1.9, "x2": -17.37725, "y2": -1.9, "width": 0.2, "layer": 31 }, { "x1": -11.3105, "y1": 0.5, "x2": -12.4105, "y2": -0.6, "width": 0.2, "layer": 31 }, @@ -170,8 +146,8 @@ ] # fmt: on -POSITIONS = {"v1": V1_POSITIONS, "v2": V2_POSITIONS} -TRACKS = {"v1": None, "v2": V2_TRACKS} +POSITIONS = {"v1": V1_POSITIONS} +TRACKS = {"v1": V1_TRACKS} @skidl.subcircuit @@ -306,10 +282,6 @@ def atmega32u4_au_v1(rows, columns): atmega32u4(rows, columns, FOOTPRINTS["v1"]) -def atmega32u4_au_v2(rows, columns): - atmega32u4(rows, columns, FOOTPRINTS["v2"]) - - if __name__ == "__main__": import argparse @@ -323,7 +295,7 @@ def atmega32u4_au_v2(rows, columns): "--variant", required=False, default="v1", - choices=["v1", "v2"], + choices=["v1"], help="Choose variant", ) diff --git a/tests/test_netlist_generation/2x2-with-uc.net b/tests/test_netlist_generation/2x2-with-uc.net index 3bea31e..be5e760 100644 --- a/tests/test_netlist_generation/2x2-with-uc.net +++ b/tests/test_netlist_generation/2x2-with-uc.net @@ -116,7 +116,7 @@ # (sheetpath (names /top/2152503131066222040) (tstamps /top/2152503131066222040))) (comp (ref U1) (value ATmega32U4-A) - (footprint Package_QFP:TQFP-44_10x10mm_P0.8mm) + (footprint Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm) (libsource (lib MCU_Microchip_ATmega) (part ATmega16U4-A)) # (sheetpath (names /top/14700442668264180207) (tstamps /top/14700442668264180207))) (comp (ref U2) diff --git a/tests/test_netlist_generation/empty-with-uc.net b/tests/test_netlist_generation/empty-with-uc.net index 392fea6..cc9eeae 100644 --- a/tests/test_netlist_generation/empty-with-uc.net +++ b/tests/test_netlist_generation/empty-with-uc.net @@ -76,7 +76,7 @@ # (sheetpath (names /top/7963859180225396453) (tstamps /top/7963859180225396453))) (comp (ref U1) (value ATmega32U4-A) - (footprint Package_QFP:TQFP-44_10x10mm_P0.8mm) + (footprint Package_DFN_QFN:QFN-44-1EP_7x7mm_P0.5mm_EP5.2x5.2mm) (libsource (lib MCU_Microchip_ATmega) (part ATmega16U4-A)) # (sheetpath (names /top/342931359707187234) (tstamps /top/342931359707187234))) (comp (ref U2)