From d6c86b73ab8c1f9f0ceffa5f94d33320f28517c2 Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Mon, 20 Jan 2025 19:28:56 -0800 Subject: [PATCH 1/8] Simplify and flatten project template --- elec/src/__name__.ato.j2 => __name__.ato.j2 | 0 ato.yaml.j2 | 6 +- elec/footprints/footprints.kicad_sym | 2 - elec/layout/default/__name__.kicad_pcb.j2 | 272 --- elec/layout/default/__name__.kicad_pro.j2 | 231 -- elec/layout/default/__name__.kicad_sch.j2 | 5 - elec/layout/default/fp-lib-table | 4 - firmware/.gitkeep | 0 mech/bitmap.svg | 30 - mech/template_40x40.dxf | 452 ---- mech/template_outline.dxf | 2394 ------------------- mech/tree.svg | 45 - metadata/pos-header | 1 - 13 files changed, 5 insertions(+), 3437 deletions(-) rename elec/src/__name__.ato.j2 => __name__.ato.j2 (100%) delete mode 100644 elec/footprints/footprints.kicad_sym delete mode 100644 elec/layout/default/__name__.kicad_pcb.j2 delete mode 100644 elec/layout/default/__name__.kicad_pro.j2 delete mode 100644 elec/layout/default/__name__.kicad_sch.j2 delete mode 100644 elec/layout/default/fp-lib-table delete mode 100644 firmware/.gitkeep delete mode 100644 mech/bitmap.svg delete mode 100644 mech/template_40x40.dxf delete mode 100644 mech/template_outline.dxf delete mode 100644 mech/tree.svg delete mode 100644 metadata/pos-header diff --git a/elec/src/__name__.ato.j2 b/__name__.ato.j2 similarity index 100% rename from elec/src/__name__.ato.j2 rename to __name__.ato.j2 diff --git a/ato.yaml.j2 b/ato.yaml.j2 index a9ea82b..da4be31 100644 --- a/ato.yaml.j2 +++ b/ato.yaml.j2 @@ -1,6 +1,10 @@ ato-version: ^0.2.0 +paths: + src: ./ + layout: ./layouts + footprints: ./footprints builds: default: - entry: elec/src/{{caseconverter.kebabcase(name)}}.ato:{{caseconverter.pascalcase(name)}} + entry: {{caseconverter.kebabcase(name)}}.ato:{{caseconverter.pascalcase(name)}} dependencies: - generics diff --git a/elec/footprints/footprints.kicad_sym b/elec/footprints/footprints.kicad_sym deleted file mode 100644 index bbfd695..0000000 --- a/elec/footprints/footprints.kicad_sym +++ /dev/null @@ -1,2 +0,0 @@ -(kicad_symbol_lib -) \ No newline at end of file diff --git a/elec/layout/default/__name__.kicad_pcb.j2 b/elec/layout/default/__name__.kicad_pcb.j2 deleted file mode 100644 index 5f21575..0000000 --- a/elec/layout/default/__name__.kicad_pcb.j2 +++ /dev/null @@ -1,272 +0,0 @@ -(kicad_pcb - (version 20240108) - (generator "pcbnew") - (generator_version "8.0") - (general - (thickness 1.6) - (legacy_teardrops no) - ) - (paper "A4") - (layers - (0 "F.Cu" signal) - (31 "B.Cu" signal) - (32 "B.Adhes" user "B.Adhesive") - (33 "F.Adhes" user "F.Adhesive") - (34 "B.Paste" user) - (35 "F.Paste" user) - (36 "B.SilkS" user "B.Silkscreen") - (37 "F.SilkS" user "F.Silkscreen") - (38 "B.Mask" user) - (39 "F.Mask" user) - (40 "Dwgs.User" user "User.Drawings") - (41 "Cmts.User" user "User.Comments") - (42 "Eco1.User" user "User.Eco1") - (43 "Eco2.User" user "User.Eco2") - (44 "Edge.Cuts" user) - (45 "Margin" user) - (46 "B.CrtYd" user "B.Courtyard") - (47 "F.CrtYd" user "F.Courtyard") - (48 "B.Fab" user) - (49 "F.Fab" user) - (50 "User.1" user) - (51 "User.2" user) - (52 "User.3" user) - (53 "User.4" user) - (54 "User.5" user) - (55 "User.6" user) - (56 "User.7" user) - (57 "User.8" user) - (58 "User.9" user) - ) - (setup - (stackup - (layer "F.SilkS" - (type "Top Silk Screen") - ) - (layer "F.Paste" - (type "Top Solder Paste") - ) - (layer "F.Mask" - (type "Top Solder Mask") - (thickness 0.01) - ) - (layer "F.Cu" - (type "copper") - (thickness 0.035) - ) - (layer "dielectric 1" - (type "core") - (thickness 1.51) - (material "FR4") - (epsilon_r 4.5) - (loss_tangent 0.02) - ) - (layer "B.Cu" - (type "copper") - (thickness 0.035) - ) - (layer "B.Mask" - (type "Bottom Solder Mask") - (thickness 0.01) - ) - (layer "B.Paste" - (type "Bottom Solder Paste") - ) - (layer "B.SilkS" - (type "Bottom Silk Screen") - ) - (copper_finish "None") - (dielectric_constraints no) - ) - (pad_to_mask_clearance 0) - (allow_soldermask_bridges_in_footprints no) - (pcbplotparams - (layerselection 0x00010fc_ffffffff) - (plot_on_all_layers_selection 0x0000000_00000000) - (disableapertmacros no) - (usegerberextensions no) - (usegerberattributes yes) - (usegerberadvancedattributes yes) - (creategerberjobfile yes) - (dashed_line_dash_ratio 12.000000) - (dashed_line_gap_ratio 3.000000) - (svgprecision 4) - (plotframeref no) - (viasonmask no) - (mode 1) - (useauxorigin no) - (hpglpennumber 1) - (hpglpenspeed 20) - (hpglpendiameter 15.000000) - (pdf_front_fp_property_popups yes) - (pdf_back_fp_property_popups yes) - (dxfpolygonmode yes) - (dxfimperialunits yes) - (dxfusepcbnewfont yes) - (psnegative no) - (psa4output no) - (plotreference yes) - (plotvalue yes) - (plotfptext yes) - (plotinvisibletext no) - (sketchpadsonfab no) - (subtractmaskfromsilk no) - (outputformat 1) - (mirror no) - (drillshape 1) - (scaleselection 1) - (outputdirectory "") - ) - ) - (net 0 "") - (gr_circle - (center 133.352 82.11) - (end 135.052 82.11) - (stroke - (width 0.1) - (type solid) - ) - (fill none) - (layer "Edge.Cuts") - (uuid "019c0a6d-9bb8-42f8-8584-8f200b71a27b") - ) - (gr_circle - (center 165.352 114.11) - (end 167.052 114.11) - (stroke - (width 0.1) - (type solid) - ) - (fill none) - (layer "Edge.Cuts") - (uuid "097c55d3-ce7a-4886-a7db-9a4e9fcd0127") - ) - (gr_circle - (center 165.352 82.11) - (end 167.052 82.11) - (stroke - (width 0.1) - (type solid) - ) - (fill none) - (layer "Edge.Cuts") - (uuid "0e8e5788-23b0-4e0e-993f-a94957498ae3") - ) - (gr_arc - (start 169.352 114.11) - (mid 168.180427 116.938427) - (end 165.352 118.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "178364bc-250e-4a39-b0ba-4262bbac4b46") - ) - (gr_arc - (start 133.352 118.11) - (mid 130.523573 116.938427) - (end 129.352 114.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "3d8baf97-c836-4397-867c-23e52ff05ce1") - ) - (gr_line - (start 169.352 114.11) - (end 169.352 82.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "871dfad9-a85d-42ce-9d2d-6520fae7f4c4") - ) - (gr_line - (start 129.352 82.11) - (end 129.352 114.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "8baef1cd-8e58-474a-b843-199aa0080763") - ) - (gr_arc - (start 165.352 78.11) - (mid 168.180427 79.281573) - (end 169.352 82.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "a7e36be5-cc10-4aad-836f-bde309666136") - ) - (gr_line - (start 165.352 78.11) - (end 133.352 78.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "b80e33ff-046b-4986-bc0d-6bc4865afc31") - ) - (gr_arc - (start 129.352 82.11) - (mid 130.523573 79.281573) - (end 133.352 78.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "cf226ff4-3173-434d-8c9b-3129470c1ce4") - ) - (gr_circle - (center 133.352 114.11) - (end 135.052 114.11) - (stroke - (width 0.1) - (type solid) - ) - (fill none) - (layer "Edge.Cuts") - (uuid "d6648504-8f45-4127-8704-34acfec9c9a4") - ) - (gr_line - (start 133.352 118.11) - (end 165.352 118.11) - (stroke - (width 0.1) - (type solid) - ) - (layer "Edge.Cuts") - (uuid "e1f36007-0f9d-4dc5-ae43-6b056652526f") - ) - (gr_text "{{"{{GITHASH}}"}}" - (at 140.240427 116.111573 0) - (layer "F.SilkS") - (uuid "d894e23f-c5ed-4336-947e-ac38e533f04c") - (effects - (font - (size 2 2) - (thickness 0.1) - ) - (justify left bottom) - ) - ) - (group "" - (uuid "deecda4f-8c94-4c72-8782-3da851560eb8") - (members "019c0a6d-9bb8-42f8-8584-8f200b71a27b" "097c55d3-ce7a-4886-a7db-9a4e9fcd0127" - "0e8e5788-23b0-4e0e-993f-a94957498ae3" "178364bc-250e-4a39-b0ba-4262bbac4b46" - "3d8baf97-c836-4397-867c-23e52ff05ce1" "871dfad9-a85d-42ce-9d2d-6520fae7f4c4" - "8baef1cd-8e58-474a-b843-199aa0080763" "a7e36be5-cc10-4aad-836f-bde309666136" - "b80e33ff-046b-4986-bc0d-6bc4865afc31" "cf226ff4-3173-434d-8c9b-3129470c1ce4" - "d6648504-8f45-4127-8704-34acfec9c9a4" "e1f36007-0f9d-4dc5-ae43-6b056652526f" - ) - ) -) diff --git a/elec/layout/default/__name__.kicad_pro.j2 b/elec/layout/default/__name__.kicad_pro.j2 deleted file mode 100644 index d0a2e67..0000000 --- a/elec/layout/default/__name__.kicad_pro.j2 +++ /dev/null @@ -1,231 +0,0 @@ -{ - "board": { - "3dviewports": [], - "design_settings": { - "defaults": { - "board_outline_line_width": 0.09999999999999999, - "copper_line_width": 0.19999999999999998, - "copper_text_italic": false, - "copper_text_size_h": 1.5, - "copper_text_size_v": 1.5, - "copper_text_thickness": 0.3, - "copper_text_upright": false, - "courtyard_line_width": 0.049999999999999996, - "dimension_precision": 4, - "dimension_units": 3, - "dimensions": { - "arrow_length": 1270000, - "extension_offset": 500000, - "keep_text_aligned": true, - "suppress_zeroes": false, - "text_position": 0, - "units_format": 1 - }, - "fab_line_width": 0.09999999999999999, - "fab_text_italic": false, - "fab_text_size_h": 1.0, - "fab_text_size_v": 1.0, - "fab_text_thickness": 0.15, - "fab_text_upright": false, - "other_line_width": 0.15, - "other_text_italic": false, - "other_text_size_h": 1.0, - "other_text_size_v": 1.0, - "other_text_thickness": 0.15, - "other_text_upright": false, - "pads": { - "drill": 0.762, - "height": 1.524, - "width": 1.524 - }, - "silk_line_width": 0.15, - "silk_text_italic": false, - "silk_text_size_h": 1.0, - "silk_text_size_v": 1.0, - "silk_text_thickness": 0.15, - "silk_text_upright": false, - "zones": { - "min_clearance": 0.5 - } - }, - "diff_pair_dimensions": [], - "drc_exclusions": [], - "meta": { - "version": 2 - }, - "rule_severities": { - "annular_width": "error", - "clearance": "error", - "connection_width": "warning", - "copper_edge_clearance": "error", - "copper_sliver": "warning", - "courtyards_overlap": "error", - "diff_pair_gap_out_of_range": "error", - "diff_pair_uncoupled_length_too_long": "error", - "drill_out_of_range": "error", - "duplicate_footprints": "warning", - "extra_footprint": "warning", - "footprint": "error", - "footprint_type_mismatch": "ignore", - "hole_clearance": "error", - "hole_near_hole": "error", - "invalid_outline": "error", - "isolated_copper": "warning", - "item_on_disabled_layer": "error", - "items_not_allowed": "error", - "length_out_of_range": "error", - "lib_footprint_issues": "warning", - "lib_footprint_mismatch": "warning", - "malformed_courtyard": "error", - "microvia_drill_out_of_range": "error", - "missing_courtyard": "ignore", - "missing_footprint": "warning", - "net_conflict": "warning", - "npth_inside_courtyard": "ignore", - "padstack": "warning", - "pth_inside_courtyard": "ignore", - "shorting_items": "error", - "silk_edge_clearance": "warning", - "silk_over_copper": "warning", - "silk_overlap": "warning", - "skew_out_of_range": "error", - "solder_mask_bridge": "error", - "starved_thermal": "error", - "text_height": "warning", - "text_thickness": "warning", - "through_hole_pad_without_hole": "error", - "too_many_vias": "error", - "track_dangling": "warning", - "track_width": "error", - "tracks_crossing": "error", - "unconnected_items": "error", - "unresolved_variable": "error", - "via_dangling": "warning", - "zones_intersect": "error" - }, - "rules": { - "max_error": 0.005, - "min_clearance": 0.0, - "min_connection": 0.0, - "min_copper_edge_clearance": 0.0, - "min_hole_clearance": 0.25, - "min_hole_to_hole": 0.25, - "min_microvia_diameter": 0.19999999999999998, - "min_microvia_drill": 0.09999999999999999, - "min_resolved_spokes": 2, - "min_silk_clearance": 0.0, - "min_text_height": 0.7999999999999999, - "min_text_thickness": 0.08, - "min_through_hole_diameter": 0.3, - "min_track_width": 0.0, - "min_via_annular_width": 0.09999999999999999, - "min_via_diameter": 0.5, - "solder_mask_clearance": 0.0, - "solder_mask_min_width": 0.0, - "solder_mask_to_copper_clearance": 0.0, - "use_height_for_length_calcs": true - }, - "teardrop_options": [ - { - "td_allow_use_two_tracks": true, - "td_curve_segcount": 5, - "td_on_pad_in_zone": false, - "td_onpadsmd": true, - "td_onroundshapesonly": false, - "td_ontrackend": false, - "td_onviapad": true - } - ], - "teardrop_parameters": [ - { - "td_curve_segcount": 0, - "td_height_ratio": 1.0, - "td_length_ratio": 0.5, - "td_maxheight": 2.0, - "td_maxlen": 1.0, - "td_target_name": "td_round_shape", - "td_width_to_size_filter_ratio": 0.9 - }, - { - "td_curve_segcount": 0, - "td_height_ratio": 1.0, - "td_length_ratio": 0.5, - "td_maxheight": 2.0, - "td_maxlen": 1.0, - "td_target_name": "td_rect_shape", - "td_width_to_size_filter_ratio": 0.9 - }, - { - "td_curve_segcount": 0, - "td_height_ratio": 1.0, - "td_length_ratio": 0.5, - "td_maxheight": 2.0, - "td_maxlen": 1.0, - "td_target_name": "td_track_end", - "td_width_to_size_filter_ratio": 0.9 - } - ], - "track_widths": [], - "via_dimensions": [], - "zones_allow_external_fillets": false - }, - "layer_presets": [], - "viewports": [] - }, - "boards": [], - "cvpcb": { - "equivalence_files": [] - }, - "libraries": { - "pinned_footprint_libs": [], - "pinned_symbol_libs": [] - }, - "meta": { - "filename": "template123.kicad_pro", - "version": 1 - }, - "net_settings": { - "classes": [ - { - "bus_width": 12, - "clearance": 0.2, - "diff_pair_gap": 0.25, - "diff_pair_via_gap": 0.25, - "diff_pair_width": 0.2, - "line_style": 0, - "microvia_diameter": 0.3, - "microvia_drill": 0.1, - "name": "Default", - "pcb_color": "rgba(0, 0, 0, 0.000)", - "schematic_color": "rgba(0, 0, 0, 0.000)", - "track_width": 0.25, - "via_diameter": 0.8, - "via_drill": 0.4, - "wire_width": 6 - } - ], - "meta": { - "version": 3 - }, - "net_colors": null, - "netclass_assignments": null, - "netclass_patterns": [] - }, - "pcbnew": { - "last_paths": { - "gencad": "", - "idf": "", - "netlist": "../../../build/default.net", - "specctra_dsn": "", - "step": "", - "vrml": "" - }, - "page_layout_descr_file": "" - }, - "schematic": { - "legacy_lib_dir": "", - "legacy_lib_list": [] - }, - "sheets": [], - "text_variables": {} -} diff --git a/elec/layout/default/__name__.kicad_sch.j2 b/elec/layout/default/__name__.kicad_sch.j2 deleted file mode 100644 index 2e2aa2f..0000000 --- a/elec/layout/default/__name__.kicad_sch.j2 +++ /dev/null @@ -1,5 +0,0 @@ -(kicad_sch (version 20230121) (generator eeschema) - (paper "A4") - (lib_symbols) - (symbol_instances) -) diff --git a/elec/layout/default/fp-lib-table b/elec/layout/default/fp-lib-table deleted file mode 100644 index 2c80223..0000000 --- a/elec/layout/default/fp-lib-table +++ /dev/null @@ -1,4 +0,0 @@ -(fp_lib_table - (version 7) - (lib (name "lib")(type "KiCad")(uri "${KIPRJMOD}/../../../build/footprints/footprints.pretty")(options "")(descr "")) -) diff --git a/firmware/.gitkeep b/firmware/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/mech/bitmap.svg b/mech/bitmap.svg deleted file mode 100644 index 103c89e..0000000 --- a/mech/bitmap.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - diff --git a/mech/template_40x40.dxf b/mech/template_40x40.dxf deleted file mode 100644 index 8ed6e47..0000000 --- a/mech/template_40x40.dxf +++ /dev/null @@ -1,452 +0,0 @@ -0 -SECTION -2 -HEADER -9 -$INSUNITS -70 -4 -9 -$ACADVER -1 -AC1014 -9 -$HANDSEED -5 -FFFF -0 -ENDSEC -0 -SECTION -2 -TABLES -0 -TABLE -2 -VPORT -5 -8 -100 -AcDbSymbolTable -0 -ENDTAB -0 -TABLE -2 -LTYPE -5 -5 -100 -AcDbSymbolTable -0 -LTYPE -5 -14 -100 -AcDbSymbolTableRecord -100 -AcDbLinetypeTableRecord -2 -BYBLOCK -70 -0 -0 -LTYPE -5 -15 -100 -AcDbSymbolTableRecord -100 -AcDbLinetypeTableRecord -2 -BYLAYER -70 -0 -0 -ENDTAB -0 -TABLE -2 -LAYER -5 -2 -100 -AcDbSymbolTable -70 -2 -0 -LAYER -5 -50 -100 -AcDbSymbolTableRecord -100 -AcDbLayerTableRecord -2 -0 -70 -0 -6 -CONTINUOUS -0 -ENDTAB -0 -TABLE -2 -STYLE -5 -3 -100 -AcDbSymbolTable -70 -1 -0 -STYLE -5 -11 -100 -AcDbSymbolTableRecord -100 -AcDbTextStyleTableRecord -2 -STANDARD -70 -0 -0 -ENDTAB -0 -TABLE -2 -VIEW -5 -6 -100 -AcDbSymbolTable -70 -0 -0 -ENDTAB -0 -TABLE -2 -UCS -5 -7 -100 -AcDbSymbolTable -70 -0 -0 -ENDTAB -0 -TABLE -2 -APPID -5 -9 -100 -AcDbSymbolTable -70 -2 -0 -APPID -5 -12 -100 -AcDbSymbolTableRecord -100 -AcDbRegAppTableRecord -2 -ACAD -70 -0 -0 -ENDTAB -0 -TABLE -2 -DIMSTYLE -5 -A -100 -AcDbSymbolTable -70 -1 -0 -ENDTAB -0 -TABLE -2 -BLOCK_RECORD -5 -1 -100 -AcDbSymbolTable -70 -1 -0 -BLOCK_RECORD -5 -1F -100 -AcDbSymbolTableRecord -100 -AcDbBlockTableRecord -2 -*MODEL_SPACE -0 -BLOCK_RECORD -5 -1B -100 -AcDbSymbolTableRecord -100 -AcDbBlockTableRecord -2 -*PAPER_SPACE -0 -ENDTAB -0 -ENDSEC -0 -SECTION -2 -BLOCKS -0 -BLOCK -5 -20 -100 -AcDbEntity -100 -AcDbBlockBegin -2 -*MODEL_SPACE -0 -ENDBLK -5 -21 -100 -AcDbEntity -100 -AcDbBlockEnd -0 -BLOCK -5 -1C -100 -AcDbEntity -100 -AcDbBlockBegin -2 -*PAPER_SPACE -0 -ENDBLK -5 -1D -100 -AcDbEntity -100 -AcDbBlockEnd -0 -ENDSEC -0 -SECTION -2 -ENTITIES -0 -CIRCLE -5 -100 -100 -AcDbEntity -8 -0 -100 -AcDbCircle -10 --3.9999999999999991 -20 -36 -30 -0 -40 -1.7000000000000002 -210 -0 -220 --0 -230 -1 -0 -CIRCLE -5 -101 -100 -AcDbEntity -8 -0 -100 -AcDbCircle -10 --36 -20 -3.9999999999999902 -30 -0 -40 -1.7000000000000002 -210 -0 -220 --0 -230 -1 -0 -CIRCLE -5 -102 -100 -AcDbEntity -8 -0 -100 -AcDbCircle -10 --3.9999999999999991 -20 -4 -30 -0 -40 -1.7000000000000002 -210 -0 -220 --0 -230 -1 -0 -CIRCLE -5 -103 -100 -AcDbEntity -8 -0 -100 -AcDbCircle -10 --36 -20 -35.999999999999993 -30 -0 -40 -1.7000000000000002 -210 -0 -220 --0 -230 -1 -0 -LWPOLYLINE -5 -104 -100 -AcDbEntity -8 -0 -100 -AcDbPolyline -90 -8 -70 -1 -43 -0.0 -10 --4 -20 -0 -42 -0.41421356237309509 -10 -1.1102230246251565e-15 -20 -3.9999999999999991 -10 -0 -20 -36 -42 -0.41421356237309509 -10 --3.9999999999999991 -20 -40 -10 --36 -20 -40 -42 -0.4142135623730947 -10 --40 -20 -36 -10 --40 -20 -3.9999999999999991 -42 -0.41421356237309598 -10 --36 -20 --4.4408920985006262e-15 -0 -ENDSEC -0 -SECTION -2 -OBJECTS -0 -DICTIONARY -5 -C -100 -AcDbDictionary -3 -ACAD_GROUP -350 -D -3 -ACAD_MLINESTYLE -350 -17 -0 -DICTIONARY -5 -D -100 -AcDbDictionary -0 -DICTIONARY -5 -1A -330 -C -100 -AcDbDictionary -0 -DICTIONARY -5 -17 -100 -AcDbDictionary -0 -ENDSEC -0 -EOF diff --git a/mech/template_outline.dxf b/mech/template_outline.dxf deleted file mode 100644 index 821a2ad..0000000 --- a/mech/template_outline.dxf +++ /dev/null @@ -1,2394 +0,0 @@ -999 -FreeCAD v0.20 29410 (Git) - 0 -SECTION - 2 -HEADER - 9 -$ACADVER - 1 -AC1014 - 9 -$ACADMAINTVER - 70 - 9 - 9 -$DWGCODEPAGE - 3 -ANSI_1252 - 9 -$TEXTSTYLE - 7 -STANDARD - 9 -$DIMSTYLE - 2 -STANDARD - 9 -$DIMTXSTY - 7 -STANDARD - 9 -$CMLSTYLE - 2 -STANDARD - 9 -$LUNITS - 70 -2 - 9 -$INSUNITS - 70 -4 - 9 -$PEXTMAX - 10 -50 - 20 -50 - 30 -50 - 9 -$PEXTMIN - 10 -0 - 20 -0 - 30 -0 - 9 -$HANDSEED - 5 -FFFF - 0 -ENDSEC - 0 -SECTION - 2 -CLASSES - 0 -CLASS - 1 -ACDBDICTIONARYWDFLT - 2 -AcDbDictionaryWithDefault - 3 -ObjectDBX Classes - 90 - 0 -280 - 0 -281 - 0 - 0 -CLASS - 1 -XRECORD - 2 -AcDbXrecord - 3 -ObjectDBX Classes - 90 - 0 -280 - 0 -281 - 0 - 0 -CLASS - 1 -LWPOLYLINE - 2 -AcDbPolyline - 3 -ObjectDBX Classes - 90 - 0 -280 - 0 -281 - 1 - 0 -ENDSEC - 0 -SECTION - 2 -TABLES - 0 -TABLE - 2 -VPORT - 5 -20 -330 -0 -100 -AcDbSymbolTable - 70 - 1 - 0 -VPORT - 5 -21 -330 -20 -100 -AcDbSymbolTableRecord -100 -AcDbViewportTableRecord - 2 -*ACTIVE - 70 - 0 - 0 -ENDTAB - 0 -TABLE - 2 -LTYPE - 5 -22 -330 -0 -100 -AcDbSymbolTable - 70 - 1 - 0 -LTYPE - 5 -23 -330 -21 -100 -AcDbSymbolTableRecord -100 -AcDbLinetypeTableRecord - 2 -BYBLOCK - 70 - 0 - 3 - - 72 - 65 - 73 - 0 - 40 -0.0 - 0 -LTYPE - 5 -24 -330 -21 -100 -AcDbSymbolTableRecord -100 -AcDbLinetypeTableRecord - 2 -BYLAYER - 70 - 0 - 3 - - 72 - 65 - 73 - 0 - 40 -0.0 - 0 -LTYPE - 5 -25 -330 -21 -100 -AcDbSymbolTableRecord -100 -AcDbLinetypeTableRecord - 2 -CONTINUOUS - 70 - 0 - 3 -Solid line - 72 - 65 - 73 - 0 - 40 -0.0 - 0 -ENDTAB - 0 -TABLE - 2 -LAYER - 5 -A50 -330 -0 -100 -AcDbSymbolTable - 70 -3 - 0 -LAYER - 5 -A51 -330 -A50 -100 -AcDbSymbolTableRecord -100 -AcDbLayerTableRecord - 2 -0 - 70 - 0 - 62 - 7 - 6 -CONTINUOUS - 0 -LAYER - 5 -A52 -330 -A50 -100 -AcDbSymbolTableRecord -100 -AcDbLayerTableRecord - 2 -none - 70 - 0 - 62 - 7 - 6 -CONTINUOUS - 0 -LAYER - 5 -A53 -330 -A50 -100 -AcDbSymbolTableRecord -100 -AcDbLayerTableRecord - 2 -Boolean - 70 - 0 - 62 - 7 - 6 -CONTINUOUS - 0 -ENDTAB - 0 -TABLE - 2 -STYLE - 5 -70 -330 -0 -100 -AcDbSymbolTable - 70 - 2 - 0 -STYLE - 5 -71 -330 -70 -100 -AcDbSymbolTableRecord -100 -AcDbTextStyleTableRecord - 2 -STANDARD - 70 - 0 - 40 -0.0 - 41 -1.0 - 50 -0.0 - 71 - 0 - 42 -2.5 - 3 -arial.ttf - 4 - - 0 -STYLE - 5 -72 -330 -70 -100 -AcDbSymbolTableRecord -100 -AcDbTextStyleTableRecord - 2 -ANNOTATIVE - 70 - 0 - 40 -0.0 - 41 -1.0 - 50 -0.0 - 71 - 0 - 42 -2.5 - 3 -arial.ttf - 4 - - 0 -ENDTAB - 0 -TABLE - 2 -VIEW - 5 -73 -330 -0 -100 -AcDbSymbolTable - 70 - 0 - 0 -ENDTAB - 0 -TABLE - 2 -UCS - 5 -74 -330 -0 -100 -AcDbSymbolTable - 70 - 0 - 0 -ENDTAB - 0 -TABLE - 2 -APPID - 5 -75 -330 -0 -100 -AcDbSymbolTable - 70 - 2 - 0 -APPID - 5 -76 -330 -75 -100 -AcDbSymbolTableRecord -100 -AcDbRegAppTableRecord - 2 -ACAD - 70 - 0 - 0 -APPID - 5 -77 -330 -75 -100 -AcDbSymbolTableRecord -100 -AcDbRegAppTableRecord - 2 -ACADANNOTATIVE - 70 - 0 - 0 -ENDTAB - 0 -TABLE - 2 -DIMSTYLE - 5 -78 -330 -0 -100 -AcDbSymbolTable - 70 - 2 - 0 -DIMSTYLE -105 -79 -330 -78 -100 -AcDbSymbolTableRecord -100 -AcDbDimStyleTableRecord - 2 -STANDARD - 70 - 0 - 3 - - 4 - - 5 - - 6 - - 7 - - 40 -0.0 - 41 -2.5 - 42 -0.625 - 43 -3.75 - 44 -1.25 - 45 -0.0 - 46 -0.0 - 47 -0.0 - 48 -0.0 -140 -2.5 -141 -2.5 -142 -0.0 -143 -0.03937007874016 -144 -1.0 -145 -0.0 -146 -1.0 -147 -0.625 - 71 - 0 - 72 - 0 - 73 - 0 - 74 - 0 - 75 - 0 - 76 - 0 - 77 - 1 - 78 - 8 -170 - 0 -171 - 3 -172 - 1 -173 - 0 -174 - 0 -175 - 0 -176 - 0 -177 - 0 -178 - 0 -270 - 2 -271 - 2 -272 - 2 -273 - 2 -274 - 3 -340 -71 -275 - 0 -280 - 0 -281 - 0 -282 - 0 -283 - 0 -284 - 8 -285 - 0 -286 - 0 -287 - 3 -288 - 0 - 0 -ENDTAB - 0 -TABLE - 2 -BLOCK_RECORD - 5 -A01 -330 -0 -100 -AcDbSymbolTable - 70 -5 - 0 -BLOCK_RECORD - 5 -A02 -330 -A01 -100 -AcDbSymbolTableRecord -100 -AcDbBlockTableRecord - 2 -*MODEL_SPACE - 0 -BLOCK_RECORD - 5 -A03 -330 -A01 -100 -AcDbSymbolTableRecord -100 -AcDbBlockTableRecord - 2 -*PAPER_SPACE - 0 -ENDTAB - 0 -ENDSEC - 0 -SECTION - 2 -BLOCKS - 0 -BLOCK - 5 -A04 -330 -A02 -100 -AcDbEntity - 8 -0 -100 -AcDbBlockBegin - 2 -*MODEL_SPACE - 70 - 0 - 10 -0 - 20 -0 - 30 -0 - 3 -*MODEL_SPACE - 1 - - 0 -ENDBLK - 5 -A05 -330 -A02 -100 -AcDbEntity - 8 -0 -100 -AcDbBlockEnd - 0 -BLOCK - 5 -A06 -330 -A03 -100 -AcDbEntity - 67 -1 - 8 -0 -100 -AcDbBlockBegin - 2 -*PAPER_SPACE - 70 - 0 - 10 -0 - 20 -0 - 30 -0 - 3 -*PAPER_SPACE - 1 - - 0 -ENDBLK - 5 -A07 -330 -A03 -100 -AcDbEntity - 67 - 1 - 8 -0 -100 -AcDbBlockEnd - 0 -ENDSEC - 0 -SECTION - 2 -ENTITIES - 0 -ARC - 5 -A08 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 30 -0 - 40 -3.5 -100 -AcDbArc - 50 -90 - 51 -180 - 0 -LINE - 5 -A09 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 -16.5 - 30 -0 - 11 --20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A0A -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -0 - 11 --16.5 - 21 -20 - 31 -1.6 - 0 -ARC - 5 -A0B -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -90 - 51 -180 - 0 -LINE - 5 -A0C -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 -16.5 - 30 -0 - 11 --20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A0D -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 --16.5 - 30 -1.6 - 11 --20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A0E -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 --16.5 - 30 --7.33e-15 - 11 --20 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A0F -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 -16.5 - 30 -7.26e-15 - 11 --20 - 21 --16.5 - 31 --7.26e-15 - 0 -ARC - 5 -A10 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 30 --7.33e-15 - 40 -3.5 -100 -AcDbArc - 50 -180 - 51 --90 - 0 -LINE - 5 -A11 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 --16.5 - 30 --7.33e-15 - 11 --20 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A12 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 --20 - 30 --8.88e-15 - 11 --16.5 - 21 --20 - 31 -1.6 - 0 -ARC - 5 -A13 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -180 - 51 --90 - 0 -LINE - 5 -A14 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 -16.5 - 30 -7.26e-15 - 11 --20 - 21 --16.5 - 31 --7.26e-15 - 0 -ARC - 5 -A15 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 30 -0 - 40 -3.5 -100 -AcDbArc - 50 -90 - 51 -180 - 0 -LINE - 5 -A16 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -0 - 11 -16.5 - 21 -20 - 31 -0 - 0 -ARC - 5 -A17 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 30 -0 - 40 -3.5 -100 -AcDbArc - 50 -0 - 51 -90 - 0 -LINE - 5 -A18 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 -16.5 - 30 -7.26e-15 - 11 -20 - 21 --16.5 - 31 --7.26e-15 - 0 -ARC - 5 -A19 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 30 --7.33e-15 - 40 -3.5 -100 -AcDbArc - 50 --90 - 51 -0 - 0 -LINE - 5 -A1A -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 --20 - 30 --8.88e-15 - 11 --16.5 - 21 --20 - 31 --8.88e-15 - 0 -ARC - 5 -A1B -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 30 --7.33e-15 - 40 -3.5 -100 -AcDbArc - 50 -180 - 51 --90 - 0 -CIRCLE - 5 -A1C -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A1D -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A1E -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A1F -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 40 -1.75 - 0 -LINE - 5 -A20 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 -16.5 - 30 -0 - 11 -20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A21 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 --16.5 - 30 -1.6 - 11 -20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A22 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 --16.5 - 30 --7.33e-15 - 11 -20 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A23 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 -16.5 - 30 -7.26e-15 - 11 -20 - 21 --16.5 - 31 --7.26e-15 - 0 -ARC - 5 -A24 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 30 --7.33e-15 - 40 -3.5 -100 -AcDbArc - 50 --90 - 51 -0 - 0 -LINE - 5 -A25 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 --16.5 - 30 --7.33e-15 - 11 -20 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A26 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 --20 - 30 --8.88e-15 - 11 -16.5 - 21 --20 - 31 -1.6 - 0 -ARC - 5 -A27 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 --90 - 51 -0 - 0 -ARC - 5 -A28 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 30 -0 - 40 -3.5 -100 -AcDbArc - 50 -0 - 51 -90 - 0 -LINE - 5 -A29 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 -16.5 - 30 -0 - 11 -20 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A2A -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 -20 - 30 -0 - 11 -16.5 - 21 -20 - 31 -1.6 - 0 -ARC - 5 -A2B -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -0 - 51 -90 - 0 -LINE - 5 -A2C -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --18.25 - 20 -16.5 - 30 -0 - 11 --18.25 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A2D -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --18.25 - 20 -16.5 - 30 -0 - 11 --18.25 - 21 -16.5 - 31 -1.6 - 0 -CIRCLE - 5 -A2E -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A2F -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 40 -1.75 - 0 -LINE - 5 -A30 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --18.25 - 20 --16.5 - 30 --7.33e-15 - 11 --18.25 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A31 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --18.25 - 20 --16.5 - 30 --7.33e-15 - 11 --18.25 - 21 --16.5 - 31 -1.6 - 0 -CIRCLE - 5 -A32 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A33 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 40 -1.75 - 0 -LINE - 5 -A34 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -18.25 - 20 -16.5 - 30 -0 - 11 -18.25 - 21 -16.5 - 31 -1.6 - 0 -LINE - 5 -A35 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -18.25 - 20 -16.5 - 30 -0 - 11 -18.25 - 21 -16.5 - 31 -1.6 - 0 -CIRCLE - 5 -A36 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A37 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 40 -1.75 - 0 -LINE - 5 -A38 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -18.25 - 20 --16.5 - 30 --7.33e-15 - 11 -18.25 - 21 --16.5 - 31 -1.6 - 0 -LINE - 5 -A39 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -18.25 - 20 --16.5 - 30 --7.33e-15 - 11 -18.25 - 21 --16.5 - 31 -1.6 - 0 -CIRCLE - 5 -A3A -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A3B -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 40 -1.75 - 0 -LINE - 5 -A3C -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -0 - 11 -16.5 - 21 -20 - 31 -0 - 0 -LINE - 5 -A3D -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -0 - 11 --16.5 - 21 -20 - 31 -1.6 - 0 -LINE - 5 -A3E -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -1.6 - 11 -16.5 - 21 -20 - 31 -1.6 - 0 -LINE - 5 -A3F -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 -20 - 30 -0 - 11 -16.5 - 21 -20 - 31 -1.6 - 0 -LINE - 5 -A40 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --20 - 20 --16.5 - 30 -1.6 - 11 --20 - 21 -16.5 - 31 -1.6 - 0 -ARC - 5 -A41 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -180 - 51 --90 - 0 -LINE - 5 -A42 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 --20 - 30 -1.6 - 11 -16.5 - 21 --20 - 31 -1.6 - 0 -ARC - 5 -A43 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 --90 - 51 -0 - 0 -LINE - 5 -A44 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -20 - 20 --16.5 - 30 -1.6 - 11 -20 - 21 -16.5 - 31 -1.6 - 0 -ARC - 5 -A45 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -0 - 51 -90 - 0 -LINE - 5 -A46 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 -20 - 30 -1.6 - 11 -16.5 - 21 -20 - 31 -1.6 - 0 -ARC - 5 -A47 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 30 -1.6 - 40 -3.5 -100 -AcDbArc - 50 -90 - 51 -180 - 0 -CIRCLE - 5 -A48 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A49 -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 --16.5 - 20 --16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A4A -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 -16.5 - 40 -1.75 - 0 -CIRCLE - 5 -A4B -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbCircle - 10 -16.5 - 20 --16.5 - 40 -1.75 - 0 -LINE - 5 -A4C -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 --20 - 30 --8.88e-15 - 11 --16.5 - 21 --20 - 31 --8.88e-15 - 0 -LINE - 5 -A4D -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 -16.5 - 20 --20 - 30 --8.88e-15 - 11 -16.5 - 21 --20 - 31 -1.6 - 0 -LINE - 5 -A4E -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 --20 - 30 -1.6 - 11 -16.5 - 21 --20 - 31 -1.6 - 0 -LINE - 5 -A4F -330 -A02 -100 -AcDbEntity - 8 -Boolean -100 -AcDbLine - 10 --16.5 - 20 --20 - 30 --8.88e-15 - 11 --16.5 - 21 --20 - 31 -1.6 - 0 -ENDSEC - 0 -SECTION - 2 -OBJECTS - 0 -DICTIONARY - 5 -F000 -330 -0 -100 -AcDbDictionary - 3 -ACAD_GROUP -350 -F001 - 0 -DICTIONARY - 5 -F001 -330 -F000 -100 -AcDbDictionary - 0 -ENDSEC - 0 -EOF \ No newline at end of file diff --git a/mech/tree.svg b/mech/tree.svg deleted file mode 100644 index afc698b..0000000 --- a/mech/tree.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - diff --git a/metadata/pos-header b/metadata/pos-header deleted file mode 100644 index 2ef7f21..0000000 --- a/metadata/pos-header +++ /dev/null @@ -1 +0,0 @@ -Designator,Value,Package,Mid X,Mid Y,Rotation,Layer \ No newline at end of file From 1c9df6bf20a4c82f69f78ed00803d9f916f98567 Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Thu, 23 Jan 2025 13:29:42 -0800 Subject: [PATCH 2/8] Update ato-version --- ato.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ato.yaml.j2 b/ato.yaml.j2 index da4be31..e67849a 100644 --- a/ato.yaml.j2 +++ b/ato.yaml.j2 @@ -1,4 +1,4 @@ -ato-version: ^0.2.0 +ato-version: 0.3.0 paths: src: ./ layout: ./layouts From 77fbc11abd888811325ba1fc15a1337add52ea9e Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Thu, 23 Jan 2025 13:42:09 -0800 Subject: [PATCH 3/8] Rename entry-point to App --- __name__.ato.j2 | 4 ++-- ato.yaml.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/__name__.ato.j2 b/__name__.ato.j2 index bbf8031..fc9eec7 100644 --- a/__name__.ato.j2 +++ b/__name__.ato.j2 @@ -1,2 +1,2 @@ -module {{caseconverter.pascalcase(name)}}: - signal gnd +module App: + pass diff --git a/ato.yaml.j2 b/ato.yaml.j2 index e67849a..e3de939 100644 --- a/ato.yaml.j2 +++ b/ato.yaml.j2 @@ -5,6 +5,6 @@ paths: footprints: ./footprints builds: default: - entry: {{caseconverter.kebabcase(name)}}.ato:{{caseconverter.pascalcase(name)}} + entry: {{caseconverter.kebabcase(name)}}.ato:App dependencies: - generics From be71620d74e8292ea49c906a8b5085440a04dabc Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Fri, 24 Jan 2025 12:11:55 -0800 Subject: [PATCH 4/8] Remove blank generics dep --- ato.yaml.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/ato.yaml.j2 b/ato.yaml.j2 index e3de939..e61dae3 100644 --- a/ato.yaml.j2 +++ b/ato.yaml.j2 @@ -6,5 +6,3 @@ paths: builds: default: entry: {{caseconverter.kebabcase(name)}}.ato:App -dependencies: -- generics From 98a87e6ad9b7d88d661ba52d69180051c3c02fa1 Mon Sep 17 00:00:00 2001 From: Matt Wildoer Date: Fri, 7 Feb 2025 14:01:53 -0800 Subject: [PATCH 5/8] Make this a cookiecutter template --- .gitignore | 133 +++++++---- .vscode/settings.json.j2 | 3 - LICENSE.j2 => LICENSE.txt | 2 +- README.md | 2 +- README.md.j2 | 3 - __name__.ato.j2 | 2 - cookiecutter.json | 17 ++ hooks/post_gen_project.py | 8 + hooks/pre_gen_project.py | 13 ++ .../.github}/workflows/ci.yml | 0 {{cookiecutter.project_slug}}/.gitignore | 209 ++++++++++++++++++ {{cookiecutter.project_slug}}/LICENSE.txt | 111 ++++++++++ {{cookiecutter.project_slug}}/README.md | 5 + .../ato.yaml | 6 +- {{cookiecutter.project_slug}}/main.ato | 4 + 15 files changed, 469 insertions(+), 49 deletions(-) delete mode 100644 .vscode/settings.json.j2 rename LICENSE.j2 => LICENSE.txt (93%) delete mode 100644 README.md.j2 delete mode 100644 __name__.ato.j2 create mode 100644 cookiecutter.json create mode 100644 hooks/post_gen_project.py create mode 100644 hooks/pre_gen_project.py rename {.github => {{cookiecutter.project_slug}}/.github}/workflows/ci.yml (100%) create mode 100644 {{cookiecutter.project_slug}}/.gitignore create mode 100644 {{cookiecutter.project_slug}}/LICENSE.txt create mode 100644 {{cookiecutter.project_slug}}/README.md rename ato.yaml.j2 => {{cookiecutter.project_slug}}/ato.yaml (53%) create mode 100644 {{cookiecutter.project_slug}}/main.ato diff --git a/.gitignore b/.gitignore index 4ff02fb..93b6c23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,43 +1,102 @@ -# For PCBs designed using KiCad: https://www.kicad.org/ -# Format documentation: https://kicad.org/help/file-formats/ - -# Temporary files -*.000 -*.bak -*.bck -*.kicad_pcb-bak -*.kicad_sch-bak -*-backups -*.kicad_prl -*.sch-bak -*~ -_autosave-* -*.tmp -*-save.pro -*-save.kicad_pcb -*.kicad_pcb.lck -fp-info-cache - -# Netlist files (exported from Eeschema) -*.net - -# Autorouter files (exported from Pcbnew) -*.dsn -*.ses - -# Exported BOM files -*.xml -*.csv +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class -build/ -.DS_Store +# OSX useful to ignore +*.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk -# Virtual environment -.venv/ +# C extensions +*.so + +# Distribution / packaging +.Python +env/ venv/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# IntelliJ Idea family of suites +.idea +*.iml +## File-based project format: +*.ipr +*.iws +## mpeltonen/sbt-idea plugin +.idea_modules/ + +# PyBuilder +target/ -# .ato directory -.ato/ +# Cookiecutter +output/ +python_boilerplate/ +cookiecutter-pypackage-env/ -# IDEs +# IDE settings .vscode/ diff --git a/.vscode/settings.json.j2 b/.vscode/settings.json.j2 deleted file mode 100644 index 8e3d7f2..0000000 --- a/.vscode/settings.json.j2 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.defaultInterpreterPath": "{{python_path}}" -} diff --git a/LICENSE.j2 b/LICENSE.txt similarity index 93% rename from LICENSE.j2 rename to LICENSE.txt index 2af930c..33884d6 100644 --- a/LICENSE.j2 +++ b/LICENSE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 {{ author | default("ORIGINAL AUTHOR", true) }} +Copyright (c) 07-Feb-2025, atopile Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 88b4c72..cd49f98 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # atopile project template -Don't fork this repository to setup your atopile project - it contains jinja templates anyways. Instead, use `ato create`, which will setup the project for you. Project setup instructions are here: https://atopile.io/ +Don't fork this repository to setup your atopile project - it contains jinja templates anyways. Instead, use `ato create project`, which will setup the project for you. Project setup instructions are here: https://atopile.io/ diff --git a/README.md.j2 b/README.md.j2 deleted file mode 100644 index 85a8885..0000000 --- a/README.md.j2 +++ /dev/null @@ -1,3 +0,0 @@ -# {{caseconverter.kebabcase(name)}} - -Wooohooo a new package! diff --git a/__name__.ato.j2 b/__name__.ato.j2 deleted file mode 100644 index fc9eec7..0000000 --- a/__name__.ato.j2 +++ /dev/null @@ -1,2 +0,0 @@ -module App: - pass diff --git a/cookiecutter.json b/cookiecutter.json new file mode 100644 index 0000000..b468b68 --- /dev/null +++ b/cookiecutter.json @@ -0,0 +1,17 @@ +{ + "author_name": "Pepper Powderly", + "email": "pepper@atopile.io", + "project_name": "HiL Tester", + "license": [ + "MIT license", + "BSD license", + "ISC license", + "Apache Software License 2.0", + "GNU General Public License v3", + "Not open source" + ], + "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_').replace('-', '_') }}", + "description": "A brand new atopile project!", + "__ato_version": "0.3.0", + "__python_path": "python3" +} \ No newline at end of file diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py new file mode 100644 index 0000000..e04203a --- /dev/null +++ b/hooks/post_gen_project.py @@ -0,0 +1,8 @@ +#!/usr/bin/env python +import pathlib + + +if __name__ == '__main__': + + if 'Not open source' == '{{ cookiecutter.license }}': + pathlib.Path('LICENSE').unlink() diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py new file mode 100644 index 0000000..8427ee8 --- /dev/null +++ b/hooks/pre_gen_project.py @@ -0,0 +1,13 @@ +import re +import sys + + +MODULE_REGEX = r'^[_a-zA-Z][_a-zA-Z0-9]+$' + +module_name = '{{ cookiecutter.project_slug}}' + +if not re.match(MODULE_REGEX, module_name): + print('ERROR: The project slug (%s) is not a valid Python module name. ' + 'Please do not use a - and use _ instead' % module_name) + #Exit to cancel project + sys.exit(1) diff --git a/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml similarity index 100% rename from .github/workflows/ci.yml rename to {{cookiecutter.project_slug}}/.github/workflows/ci.yml diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore new file mode 100644 index 0000000..623a219 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -0,0 +1,209 @@ +# For PCBs designed using KiCad: https://www.kicad.org/ +# Format documentation: https://kicad.org/help/file-formats/ + +# KiCad files +# ----------- +# Temporary files +*.000 +*.bak +*.bck +*.kicad_pcb-bak +*.kicad_sch-bak +*-backups +*.kicad_prl +*.sch-bak +*~ +_autosave-* +*.tmp +*-save.pro +*-save.kicad_pcb +*.kicad_pcb.lck +fp-info-cache + +# Netlist files (exported from Eeschema) +*.net + +# Autorouter files (exported from Pcbnew) +*.dsn +*.ses + +# Exported BOM files +*.xml +*.csv + +# Python +# ------ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# Testing +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +*,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Environments +.env +.venv/ +venv/ +env/ +ENV/ +env.bak/ +venv.bak/ + +# IDE +.vscode/ +!.vscode/*.shared.json +!.vscode/extensions.json +.idea/ +.spyderproject +.spyproject +.ropeproject +.aider* + +# Misc +.DS_Store +.ato/ +.ruff_cache/ + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# little OSx things +.DS_Store + +# ruff linter +.ruff_cache + +# ide +.vscode/ +!.vscode/*.shared.json +!.vscode/extensions.json +.aider* diff --git a/{{cookiecutter.project_slug}}/LICENSE.txt b/{{cookiecutter.project_slug}}/LICENSE.txt new file mode 100644 index 0000000..1f39721 --- /dev/null +++ b/{{cookiecutter.project_slug}}/LICENSE.txt @@ -0,0 +1,111 @@ +{% if cookiecutter.license == 'MIT license' -%} +MIT License + +Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.author_name }} + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +{% elif cookiecutter.license == 'BSD license' %} + +BSD License + +Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.author_name }} +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. +{% elif cookiecutter.license == 'ISC license' -%} +ISC License + +Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.author_name }} + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +{% elif cookiecutter.license == 'Apache Software License 2.0' -%} +Apache Software License 2.0 + +Copyright (c) {% now 'local', '%Y' %}, {{ cookiecutter.author_name }} + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +{% elif cookiecutter.license == 'GNU General Public License v3' -%} +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + {{ cookiecutter.description }} + Copyright (C) {% now 'local', '%Y' %} {{ cookiecutter.author_name }} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. +{% endif %} diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md new file mode 100644 index 0000000..763a22b --- /dev/null +++ b/{{cookiecutter.project_slug}}/README.md @@ -0,0 +1,5 @@ +# {{cookiecutter.project_slug}} + +{{cookiecutter.description}} + +Created by {{cookiecutter.author_name}} <{{cookiecutter.email}}> diff --git a/ato.yaml.j2 b/{{cookiecutter.project_slug}}/ato.yaml similarity index 53% rename from ato.yaml.j2 rename to {{cookiecutter.project_slug}}/ato.yaml index e61dae3..7de2261 100644 --- a/ato.yaml.j2 +++ b/{{cookiecutter.project_slug}}/ato.yaml @@ -1,8 +1,10 @@ -ato-version: 0.3.0 +ato-version: {{cookiecutter.__ato_version}} + paths: src: ./ layout: ./layouts footprints: ./footprints + builds: default: - entry: {{caseconverter.kebabcase(name)}}.ato:App + entry: main.ato:App diff --git a/{{cookiecutter.project_slug}}/main.ato b/{{cookiecutter.project_slug}}/main.ato new file mode 100644 index 0000000..270c749 --- /dev/null +++ b/{{cookiecutter.project_slug}}/main.ato @@ -0,0 +1,4 @@ +"""Brand new atopile project!""" + +module App: + pass From 87684a4eb506cdc3c93af38412baa92e29769d74 Mon Sep 17 00:00:00 2001 From: Sam Mellor Date: Fri, 7 Mar 2025 19:05:07 +0100 Subject: [PATCH 6/8] Upload artifacts on build failure --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index fb81c25..f0aca9d 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -11,9 +11,15 @@ jobs: - name: Build uses: docker://ghcr.io/atopile/atopile-kicad + id: build + continue-on-error: true - name: Upload Combined Artifacts uses: actions/upload-artifact@v3 with: name: build path: build + + - name: Check build status + if: steps.build.outcome == 'failure' + run: exit 1 From 78a311c8b776b0e1f1e7ad0c8edab088a0b60523 Mon Sep 17 00:00:00 2001 From: Sam Mellor Date: Fri, 7 Mar 2025 19:05:27 +0100 Subject: [PATCH 7/8] Bump actions/upload-artifacts v3->v4 --- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index f0aca9d..5c2529b 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: continue-on-error: true - name: Upload Combined Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build path: build From 71799b0d46e88cb881d2541cd14286539229ff10 Mon Sep 17 00:00:00 2001 From: Sam Mellor Date: Tue, 11 Mar 2025 11:53:55 +0100 Subject: [PATCH 8/8] Fix LICENSE.txt filename in post-gen hook --- hooks/post_gen_project.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index e04203a..41cca87 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -2,7 +2,9 @@ import pathlib -if __name__ == '__main__': - - if 'Not open source' == '{{ cookiecutter.license }}': - pathlib.Path('LICENSE').unlink() +if __name__ == "__main__": + if "Not open source" == "{{ cookiecutter.license }}": + try: + pathlib.Path("LICENSE").unlink() + except FileNotFoundError: + pass