diff --git a/.gitignore b/.gitignore index 2deaa06..fcdcbb9 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ fp-info-cache # Exported BOM files *.xml -*.csv hardware/Template-KiCAD-Project-CI-backups/ diff --git a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.csv b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.csv new file mode 100644 index 0000000..ad95d09 --- /dev/null +++ b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.csv @@ -0,0 +1,2 @@ +"Reference","Value","Datasheet","Footprint","Qty","DNP","#LCSC" +"J2","Conn_02x03_Odd_Even","~","Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical","1","","C124390" diff --git a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pcb b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pcb index e11ea1e..90c89a5 100644 --- a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pcb +++ b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pcb @@ -80,6 +80,12 @@ ) ) (net 0 "") + (net 1 "unconnected-(J2-Pin_2-Pad2)") + (net 2 "unconnected-(J2-Pin_4-Pad4)") + (net 3 "unconnected-(J2-Pin_5-Pad5)") + (net 4 "unconnected-(J2-Pin_3-Pad3)") + (net 5 "unconnected-(J2-Pin_1-Pad1)") + (net 6 "unconnected-(J2-Pin_6-Pad6)") (footprint "Eko2024:llama-2-flaca" (layer "F.Cu") (uuid "aee39182-3bd1-4755-a9d1-9a89ca8feb14") @@ -543,14 +549,14 @@ ) (footprint "Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical" (layer "B.Cu") - (uuid "1295124f-0845-444d-89d9-2cf3a78b4d19") + (uuid "5526a360-9709-4302-bffd-7b5b970363d3") (at 116.63 64.69 90) (descr "Through hole straight pin header, 2x03, 2.54mm pitch, double rows") (tags "Through hole pin header THT 2x03 2.54mm double row") - (property "Reference" "REF**" + (property "Reference" "J2" (at 1.27 2.33 90) (layer "B.SilkS") - (uuid "1de16e2f-d6a3-497e-b509-17b40d2ea743") + (uuid "2608997a-16e3-49b7-b4ef-4182c80eb90b") (effects (font (size 1 1) @@ -559,10 +565,10 @@ (justify mirror) ) ) - (property "Value" "PinHeader_2x03_P2.54mm_Vertical" + (property "Value" "Conn_02x03_Odd_Even" (at 1.27 -7.41 90) (layer "B.Fab") - (uuid "274265e7-6355-484a-b682-69a88fabd039") + (uuid "59c452ab-f8c0-4801-9a36-2b7fb45620af") (effects (font (size 1 1) @@ -576,7 +582,7 @@ (unlocked yes) (layer "B.Fab") (hide yes) - (uuid "5abdd9f9-953e-412b-8c1c-1a29db6f2da1") + (uuid "2e37488c-9158-4ae4-9a66-bad568391e8e") (effects (font (size 1.27 1.27) @@ -590,7 +596,7 @@ (unlocked yes) (layer "B.Fab") (hide yes) - (uuid "c7fda66d-5e60-430e-a3e1-314477004394") + (uuid "feeba62b-08df-4396-b782-1df427515bee") (effects (font (size 1.27 1.27) @@ -599,12 +605,12 @@ (justify mirror) ) ) - (property "Description" "" + (property "Description" "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" (at 0 0 -90) (unlocked yes) (layer "B.Fab") (hide yes) - (uuid "63d1b623-c14b-4ab3-a52f-584244272bdf") + (uuid "32daa133-b02b-4401-8c6f-6e5bd3d08b44") (effects (font (size 1.27 1.27) @@ -613,6 +619,10 @@ (justify mirror) ) ) + (property ki_fp_filters "Connector*:*_2x??_*") + (path "/2c379731-1493-4b79-994d-ee25ac462df9") + (sheetname "Raíz") + (sheetfile "Lentes EKOparty-2024.kicad_sch") (attr through_hole) (fp_line (start 3.87 -6.41) @@ -622,7 +632,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "a08b61d2-9a39-434b-8908-640459e8784c") + (uuid "5cd07cf4-e5ab-4d3b-8a91-03835467192b") ) (fp_line (start 3.87 -6.41) @@ -632,7 +642,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "708378cd-7bae-48e2-aa4e-4d3e2ed4256f") + (uuid "55a0543b-64d7-460e-b212-f4ea305d4ddc") ) (fp_line (start -1.33 -6.41) @@ -642,7 +652,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "f27f7a38-379d-4a03-b20c-b425cf855c5b") + (uuid "443ff411-cb01-45d0-9e4d-a3d6427a7c93") ) (fp_line (start 1.27 -1.27) @@ -652,7 +662,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "c894c84c-cf11-4920-8652-aedaf9db207f") + (uuid "c2d1bb04-e083-4fa0-ae6f-fb7c8ba404a4") ) (fp_line (start 3.87 1.33) @@ -662,7 +672,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "57042532-b002-4d36-876c-70eddfe8ed41") + (uuid "14ed8d59-ed4e-4d59-a8a0-b417080c7cf5") ) (fp_line (start 1.27 1.33) @@ -672,7 +682,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "f1fdccdb-9a3a-4f65-908c-f5b6a63b68b0") + (uuid "c00b1f02-54ac-40aa-a30a-6a6087e0faa3") ) (fp_line (start 0 1.33) @@ -682,7 +692,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "745125ce-fa5d-4388-8a54-59c0ad62f469") + (uuid "80e5e2d5-68e5-4fa7-b6f2-72cd83a750ee") ) (fp_line (start -1.33 1.33) @@ -692,7 +702,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "c358216f-b588-48ea-aa48-68b80fa4d7c3") + (uuid "2b82230c-3090-42a3-acd7-b35cf6578cb0") ) (fp_line (start 4.35 -6.85) @@ -702,7 +712,7 @@ (type solid) ) (layer "B.CrtYd") - (uuid "d17264db-4a82-4684-a7b8-5f0abdc1cb36") + (uuid "a6211359-b365-4d05-9c39-b7d2eb89028a") ) (fp_line (start -1.8 -6.85) @@ -712,7 +722,7 @@ (type solid) ) (layer "B.CrtYd") - (uuid "957f3e86-2d07-4d2e-8a67-5571721fd7e7") + (uuid "5ab6f04d-e57b-458c-aca8-067cf299c315") ) (fp_line (start 4.35 1.8) @@ -722,7 +732,7 @@ (type solid) ) (layer "B.CrtYd") - (uuid "bb591036-0d44-4905-b3cc-80432c5bd3f0") + (uuid "09c684a2-f52f-4ec3-b34e-5f6ead790af9") ) (fp_line (start -1.8 1.8) @@ -732,7 +742,7 @@ (type solid) ) (layer "B.CrtYd") - (uuid "9d22e11a-1d9f-4786-9380-5fbd8bfed79f") + (uuid "00b40ba6-fb41-4ca5-9f9d-0bf14f79e27b") ) (fp_line (start 3.81 -6.35) @@ -742,7 +752,7 @@ (type solid) ) (layer "B.Fab") - (uuid "48b1569e-f6e3-48af-b30b-b453a08e7c89") + (uuid "40d0c544-88f6-4e59-b1c4-76f92e2efb13") ) (fp_line (start -1.27 -6.35) @@ -752,7 +762,7 @@ (type solid) ) (layer "B.Fab") - (uuid "751fbb6a-98a5-45f3-8f2e-8ea5af4aa6ab") + (uuid "713b96f6-3270-4fb0-880e-a24218eb5166") ) (fp_line (start -1.27 0) @@ -762,7 +772,7 @@ (type solid) ) (layer "B.Fab") - (uuid "41961cb1-3368-4e43-bf10-9a7f15039730") + (uuid "d5f4bc39-acea-4b8d-bd9f-674f92d468ed") ) (fp_line (start 3.81 1.27) @@ -772,7 +782,7 @@ (type solid) ) (layer "B.Fab") - (uuid "05697898-eb35-4afc-b52d-a5368cfb2eb5") + (uuid "f005609f-fae2-4439-8928-dcacf0530f19") ) (fp_line (start 0 1.27) @@ -782,12 +792,12 @@ (type solid) ) (layer "B.Fab") - (uuid "307c7712-3a88-497a-8bd3-a9c565141c20") + (uuid "492c13c3-d25b-4d16-87ae-a0c286ba0330") ) (fp_text user "${REFERENCE}" - (at 1.27 -2.54 0) + (at 1.27 -2.54 360) (layer "B.Fab") - (uuid "f441b479-7cad-417e-8dae-69ae2004ab72") + (uuid "e530274c-145a-4507-84dd-abc0d480e5dd") (effects (font (size 1 1) @@ -802,7 +812,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "68505dbc-d813-4c0f-a13c-15089de5c570") + (net 5 "unconnected-(J2-Pin_1-Pad1)") + (pinfunction "Pin_1") + (pintype "passive+no_connect") + (uuid "c44e3fa2-8c8f-4fb3-966f-18599661eed3") ) (pad "2" thru_hole oval (at 2.54 0 90) @@ -810,7 +823,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "a412f142-fb42-4a72-8fcd-da4bc11cb080") + (net 1 "unconnected-(J2-Pin_2-Pad2)") + (pinfunction "Pin_2") + (pintype "passive+no_connect") + (uuid "09d9fc22-6402-4c34-a928-acc4d88ccae2") ) (pad "3" thru_hole oval (at 0 -2.54 90) @@ -818,7 +834,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "908ba2ec-c9b0-4a6a-bc14-8867e5317a7b") + (net 4 "unconnected-(J2-Pin_3-Pad3)") + (pinfunction "Pin_3") + (pintype "passive+no_connect") + (uuid "a5253edb-970e-4c8c-a19e-39798b68c22e") ) (pad "4" thru_hole oval (at 2.54 -2.54 90) @@ -826,7 +845,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "bcec8d2b-b679-4708-a271-18a69aa2054e") + (net 2 "unconnected-(J2-Pin_4-Pad4)") + (pinfunction "Pin_4") + (pintype "passive+no_connect") + (uuid "40368f39-d273-436d-a0a4-94bd825c18cb") ) (pad "5" thru_hole oval (at 0 -5.08 90) @@ -834,7 +856,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "3e87dc20-4d3c-4c4a-a337-a47ba3a87b10") + (net 3 "unconnected-(J2-Pin_5-Pad5)") + (pinfunction "Pin_5") + (pintype "passive+no_connect") + (uuid "8fda1469-6bf2-4db4-baf8-dc2a96b79307") ) (pad "6" thru_hole oval (at 2.54 -5.08 90) @@ -842,7 +867,10 @@ (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) - (uuid "8dbba080-d9ee-43fc-a42b-912f51f292d3") + (net 6 "unconnected-(J2-Pin_6-Pad6)") + (pinfunction "Pin_6") + (pintype "passive+no_connect") + (uuid "f33d0555-67f9-4c99-8641-1730bac0d7f7") ) (model "${KICAD8_3DMODEL_DIR}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x03_P2.54mm_Vertical.wrl" (offset diff --git a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_prl b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_prl index 6dba508..28ce650 100644 --- a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_prl +++ b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 42, + "active_layer": 0, "active_layer_preset": "All Layers", "auto_track_width": true, "hidden_netclasses": [], diff --git a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pro b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pro index c772332..718ec4a 100644 --- a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pro +++ b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_pro @@ -215,6 +215,217 @@ "cvpcb": { "equivalence_files": [] }, + "erc": { + "erc_exclusions": [], + "meta": { + "version": 0 + }, + "pin_map": [ + [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 0, + 2, + 0, + 1, + 0, + 0, + 1, + 0, + 2, + 2, + 2, + 2 + ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 1, + 0, + 1, + 2 + ], + [ + 0, + 1, + 0, + 0, + 0, + 0, + 1, + 1, + 2, + 1, + 1, + 2 + ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2 + ], + [ + 1, + 1, + 1, + 1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 2 + ], + [ + 0, + 0, + 0, + 1, + 0, + 0, + 1, + 0, + 0, + 0, + 0, + 2 + ], + [ + 0, + 2, + 1, + 2, + 0, + 0, + 1, + 0, + 2, + 2, + 2, + 2 + ], + [ + 0, + 2, + 0, + 1, + 0, + 0, + 1, + 0, + 2, + 0, + 0, + 2 + ], + [ + 0, + 2, + 1, + 1, + 0, + 0, + 1, + 0, + 2, + 0, + 0, + 2 + ], + [ + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2, + 2 + ] + ], + "rule_severities": { + "bus_definition_conflict": "error", + "bus_entry_needed": "error", + "bus_to_bus_conflict": "error", + "bus_to_net_conflict": "error", + "conflicting_netclasses": "error", + "different_unit_footprint": "error", + "different_unit_net": "error", + "duplicate_reference": "error", + "duplicate_sheet_names": "error", + "endpoint_off_grid": "warning", + "extra_units": "error", + "global_label_dangling": "warning", + "hier_label_mismatch": "error", + "label_dangling": "error", + "lib_symbol_issues": "warning", + "missing_bidi_pin": "warning", + "missing_input_pin": "warning", + "missing_power_pin": "error", + "missing_unit": "warning", + "multiple_net_names": "warning", + "net_not_bus_member": "warning", + "no_connect_connected": "warning", + "no_connect_dangling": "warning", + "pin_not_connected": "error", + "pin_not_driven": "error", + "pin_to_pin": "warning", + "power_pin_not_driven": "error", + "similar_labels": "warning", + "simulation_model_issue": "ignore", + "unannotated": "error", + "unit_value_mismatch": "error", + "unresolved_variable": "error", + "wire_dangling": "error" + } + }, "libraries": { "pinned_footprint_libs": [], "pinned_symbol_libs": [] @@ -265,9 +476,127 @@ "page_layout_descr_file": "" }, "schematic": { + "annotate_start_num": 0, + "bom_export_filename": "Lentes EKOparty-2024.csv", + "bom_fmt_presets": [], + "bom_fmt_settings": { + "field_delimiter": ",", + "keep_line_breaks": false, + "keep_tabs": false, + "name": "CSV", + "ref_delimiter": ",", + "ref_range_delimiter": "", + "string_delimiter": "\"" + }, + "bom_presets": [], + "bom_settings": { + "exclude_dnp": false, + "fields_ordered": [ + { + "group_by": false, + "label": "Reference", + "name": "Reference", + "show": true + }, + { + "group_by": true, + "label": "Value", + "name": "Value", + "show": true + }, + { + "group_by": false, + "label": "Datasheet", + "name": "Datasheet", + "show": true + }, + { + "group_by": false, + "label": "Footprint", + "name": "Footprint", + "show": true + }, + { + "group_by": false, + "label": "Qty", + "name": "${QUANTITY}", + "show": true + }, + { + "group_by": true, + "label": "DNP", + "name": "${DNP}", + "show": true + }, + { + "group_by": false, + "label": "#", + "name": "${ITEM_NUMBER}", + "show": false + }, + { + "group_by": false, + "label": "Descripción", + "name": "Description", + "show": false + }, + { + "group_by": false, + "label": "#LCSC", + "name": "#LCSC", + "show": true + } + ], + "filter_string": "", + "group_symbols": true, + "name": "", + "sort_asc": true, + "sort_field": "Reference" + }, + "connection_grid_size": 50.0, + "drawing": { + "dashed_lines_dash_length_ratio": 12.0, + "dashed_lines_gap_length_ratio": 3.0, + "default_line_thickness": 6.0, + "default_text_size": 50.0, + "field_names": [], + "intersheets_ref_own_page": false, + "intersheets_ref_prefix": "", + "intersheets_ref_short": false, + "intersheets_ref_show": false, + "intersheets_ref_suffix": "", + "junction_size_choice": 3, + "label_size_ratio": 0.375, + "operating_point_overlay_i_precision": 3, + "operating_point_overlay_i_range": "~A", + "operating_point_overlay_v_precision": 3, + "operating_point_overlay_v_range": "~V", + "overbar_offset_ratio": 1.23, + "pin_symbol_size": 25.0, + "text_offset_ratio": 0.15 + }, "legacy_lib_dir": "", - "legacy_lib_list": [] + "legacy_lib_list": [], + "meta": { + "version": 1 + }, + "net_format_name": "", + "page_layout_descr_file": "", + "plot_directory": "", + "spice_current_sheet_as_root": false, + "spice_external_command": "spice \"%I\"", + "spice_model_current_sheet_as_root": true, + "spice_save_all_currents": false, + "spice_save_all_dissipations": false, + "spice_save_all_voltages": false, + "subpart_first_id": 65, + "subpart_id_separator": 0 }, - "sheets": [], + "sheets": [ + [ + "a4ac261b-355e-401d-9ffc-5343ab67db08", + "Raíz" + ] + ], "text_variables": {} } diff --git a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_sch b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_sch index 6f60745..1589649 100644 --- a/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_sch +++ b/hardware/Lentes EKOparty-2024/Lentes EKOparty-2024.kicad_sch @@ -1,5 +1,382 @@ -(kicad_sch (version 20231120) (generator "eeschema") (generator_version "8.0") - (paper "A4") - (lib_symbols) - (symbol_instances) +(kicad_sch + (version 20231120) + (generator "eeschema") + (generator_version "8.0") + (uuid "a4ac261b-355e-401d-9ffc-5343ab67db08") + (paper "A4") + (lib_symbols + (symbol "Connector_Generic:Conn_02x03_Odd_Even" + (pin_names + (offset 1.016) hide) + (exclude_from_sim no) + (in_bom yes) + (on_board yes) + (property "Reference" "J" + (at 1.27 5.08 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Value" "Conn_02x03_Odd_Even" + (at 1.27 -5.08 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Footprint" "" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Datasheet" "~" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Description" "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "ki_keywords" "connector" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "ki_fp_filters" "Connector*:*_2x??_*" + (at 0 0 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (symbol "Conn_02x03_Odd_Even_1_1" + (rectangle + (start -1.27 -2.413) + (end 0 -2.667) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (rectangle + (start -1.27 0.127) + (end 0 -0.127) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (rectangle + (start -1.27 2.667) + (end 0 2.413) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (rectangle + (start -1.27 3.81) + (end 3.81 -3.81) + (stroke + (width 0.254) + (type default) + ) + (fill + (type background) + ) + ) + (rectangle + (start 3.81 -2.413) + (end 2.54 -2.667) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (rectangle + (start 3.81 0.127) + (end 2.54 -0.127) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (rectangle + (start 3.81 2.667) + (end 2.54 2.413) + (stroke + (width 0.1524) + (type default) + ) + (fill + (type none) + ) + ) + (pin passive line + (at -5.08 2.54 0) + (length 3.81) + (name "Pin_1" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "1" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 2.54 180) + (length 3.81) + (name "Pin_2" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "2" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at -5.08 0 0) + (length 3.81) + (name "Pin_3" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "3" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 0 180) + (length 3.81) + (name "Pin_4" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "4" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at -5.08 -2.54 0) + (length 3.81) + (name "Pin_5" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "5" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + (pin passive line + (at 7.62 -2.54 180) + (length 3.81) + (name "Pin_6" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (number "6" + (effects + (font + (size 1.27 1.27) + ) + ) + ) + ) + ) + ) + ) + (no_connect + (at 46.736 35.052) + (uuid "1880bcfe-ce21-4c15-b439-03494a25e8e2") + ) + (no_connect + (at 46.736 40.132) + (uuid "3ec949a9-315c-4fef-a2a5-71e491861a71") + ) + (no_connect + (at 34.036 40.132) + (uuid "54f9d91f-e96c-4b02-a3a6-49e5769ef749") + ) + (no_connect + (at 46.736 37.592) + (uuid "879217c2-e775-4ee2-87f5-5ad10d46f953") + ) + (no_connect + (at 34.036 35.052) + (uuid "bdcad1b0-2dd1-46eb-9b74-87c6442f1fee") + ) + (no_connect + (at 34.036 37.592) + (uuid "d5cf6bf5-341b-4caf-99d5-aa39a769c40a") + ) + (symbol + (lib_id "Connector_Generic:Conn_02x03_Odd_Even") + (at 39.116 37.592 0) + (unit 1) + (exclude_from_sim no) + (in_bom yes) + (on_board yes) + (dnp no) + (fields_autoplaced yes) + (uuid "2c379731-1493-4b79-994d-ee25ac462df9") + (property "Reference" "J2" + (at 40.386 29.21 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Value" "Conn_02x03_Odd_Even" + (at 40.386 31.75 0) + (effects + (font + (size 1.27 1.27) + ) + ) + ) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_2x03_P2.54mm_Vertical" + (at 39.116 37.592 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Datasheet" "~" + (at 39.116 37.592 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "Description" "Generic connector, double row, 02x03, odd/even pin numbering scheme (row 1 odd numbers, row 2 even numbers), script generated (kicad-library-utils/schlib/autogen/connector/)" + (at 39.116 37.592 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (property "#LCSC" "C124390" + (at 39.116 37.592 0) + (effects + (font + (size 1.27 1.27) + ) + (hide yes) + ) + ) + (pin "1" + (uuid "d4e43b6e-a8c4-4019-a880-23ea1c08055d") + ) + (pin "6" + (uuid "d8e421d1-cd48-46b0-b866-3ebeb3004cca") + ) + (pin "2" + (uuid "c73fac63-7633-4c88-9288-58a990db2bc0") + ) + (pin "3" + (uuid "5d547f77-b17d-4fca-b1aa-11dded35e6bb") + ) + (pin "5" + (uuid "57544d8f-3acc-4037-a9e5-614aebd78cb0") + ) + (pin "4" + (uuid "ffaf73e5-88a4-4645-93aa-7090aa24eb07") + ) + (instances + (project "" + (path "/a4ac261b-355e-401d-9ffc-5343ab67db08" + (reference "J2") + (unit 1) + ) + ) + ) + ) + (sheet_instances + (path "/" + (page "1") + ) + ) ) diff --git a/hardware/eko-badge-2024/eko-badge-2024.csv b/hardware/eko-badge-2024/eko-badge-2024.csv new file mode 100644 index 0000000..b6d1e67 --- /dev/null +++ b/hardware/eko-badge-2024/eko-badge-2024.csv @@ -0,0 +1,35 @@ +"Reference","Value","Datasheet","Footprint","Qty","DNP","LCSC#","Proveedor","manf#" +"AE1","Antenna_Shield","","Connector_PinHeader_2.54mm:PinHeader_1x01_P2.54mm_Vertical","1","DNP","C2913580","","" +"C1,C3,C4,C5","10uF","","Capacitor_SMD:C_0603_1608Metric","4","","C85713","JLCPCB","GRM188R61E106KA73J" +"C2,C15","1uF","","Capacitor_SMD:C_0603_1608Metric","2","","C15849","JLCPCB","TMK107BJ105KA8T" +"C6,C7,C8,C9,C10,C11,C12,C14,C16,C17,C18",".1uF","","Capacitor_SMD:C_0603_1608Metric","11","","C478888","LCSC","0603F104M500NT" +"C13",".22uF","","Capacitor_SMD:C_0603_1608Metric","1","","C161213","LCSC","" +"D1","MBR120","","Diode_SMD:D_SOD-123F","1","","C130880","JLCPCB","MBR120LSFT1G" +"D2,D3,D4","WS2812B","","LED_SMD:LED_WS2812B-Mini_PLCC4_3.5x3.5mm","3","","C527089","LCSC","WS2812B-Mini" +"F1","1A","","Fuse:Fuse_0805_2012Metric","1","","C2649564","JLCPCB","MFU0805FF01000P100" +"J1","UART","","Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical","1","DNP","","","" +"J2,J7","Battery","","Eko2024:BH-AA-A1AJ020","2","","C5290181","JLCPCB y LCSC","" +"J3","Lentes","","Eko2024:HARWIN_M20-7810345","1","","","DIGIKEY","M20-7810345 " +"J4","OLED","","Eko2024:Display OLED 128 x32","1","","","UNIT","Display OLED 128×32 0.91 I2C SSD1306 Blanco / Azul" +"J5,J6","Add-On","","Connector_PinSocket_2.54mm:PinSocket_2x03_P2.54mm_Vertical_SMD","2","","C3975148","","" +"LS1","931-SPKM.20.8.A-ND","","Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical","1","","","","931-SPKM.20.8.A-ND" +"P1","USB_C_Plug_USB2.0","","Eko2024:C393939","1","","C393939","LCSC","TYPE-C-31-M-31" +"Q1","DMG3415U-7","","Package_TO_SOT_SMD:SOT-23","1","","C96616","JLCPCB","DMG3415UQ-7 " +"R1","100K","","Resistor_SMD:R_0603_1608Metric","1","","C25803","JLCPCB","RC0603DR-07100KL" +"R2","10K","","Resistor_SMD:R_0603_1608Metric","1","","C217281","","" +"R3,R4","5k1","","Resistor_SMD:R_0603_1608Metric","2","","C191782","","ERJ3RBD5101V" +"R5","47K","","Resistor_SMD:R_0603_1608Metric","1","","C25819","","" +"R6","22K","","Resistor_SMD:R_0603_1608Metric","1","","C912502","","" +"R7","470","","Resistor_SMD:R_0603_1608Metric","1","","C103661","","RTT03471JTP" +"R8","3.3K","","Resistor_SMD:R_0603_1608Metric","1","","C403480","JLCPCB","ERJ-3GEYJ332V " +"SW1","ON","","Eko2024:MSK12C02","1","","C431540","JLCPCB","" +"SW2","LEFT","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"SW3","UP","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"SW4","DOWN","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"SW5","RESET","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"SW6","BOOT","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"SW7","RIGTH","","Button_Switch_SMD:SW_SPST_TL3342","1","","C318889","LCSC","" +"U1","ESP32-C6-WROOM-1-N4","","bsides:XCVR_ESP32-C6-WROOM-1-N8","1","","","Mouser","ESP32-C6-WROOM-1-N4" +"U2","XC6220B331MR-G","","Package_TO_SOT_SMD:SOT-23-5","1","","C86534","JLCPCB","XC6220B331MR-G " +"U3","RFM95W-915S2","","RF_Module:HOPERF_RFM9XW_SMD","1","","","Mouser","109990166" +"U4","TPA321","","Package_SO:SOP-8_3.9x4.9mm_P1.27mm","1","","C2873032","Mouser","TPA321D" diff --git a/hardware/eko-badge-2024/eko-badge-2024.kicad_pcb b/hardware/eko-badge-2024/eko-badge-2024.kicad_pcb index 24a25ce..e4bf3e8 100644 --- a/hardware/eko-badge-2024/eko-badge-2024.kicad_pcb +++ b/hardware/eko-badge-2024/eko-badge-2024.kicad_pcb @@ -772,7 +772,7 @@ (uuid "1b3ccd65-e7b4-4590-8023-4427bb8d6536") (at 187.145 70.695 180) (property "Reference" "J3" - (at -0.485 -4.885 360) + (at -0.485 -4.885 0) (layer "F.SilkS") (uuid "18eae4bd-33e8-485a-bc7e-630b6c1e210e") (effects @@ -783,7 +783,7 @@ ) ) (property "Value" "Lentes" - (at 7.77 4.865 360) + (at 7.77 4.865 0) (layer "F.Fab") (uuid "8e316856-518e-491b-bc84-8bf3d738e7b9") (effects @@ -794,7 +794,7 @@ ) ) (property "Footprint" "Eko2024:HARWIN_M20-7810345" - (at 0 0 360) + (at 0 0 0) (layer "F.Fab") (hide yes) (uuid "e47deb71-7b60-4bd7-94e1-4a24f73912aa") @@ -806,7 +806,7 @@ ) ) (property "Datasheet" "" - (at 0 0 360) + (at 0 0 0) (layer "F.Fab") (hide yes) (uuid "28982905-c050-484f-be5d-04d893858ee8") @@ -818,7 +818,7 @@ ) ) (property "Description" "" - (at 0 0 360) + (at 0 0 0) (layer "F.Fab") (hide yes) (uuid "60f73565-c043-4b0c-9ee8-f83fb2a46fe3") @@ -12943,6 +12943,122 @@ ) ) ) + (footprint "kibuzzard-66E4B147" + (layer "B.Cu") + (uuid "4aa7c650-d993-4f8b-8af4-8a98f9e63330") + (at 222.31 85.95 -90) + (descr "Generated with KiBuzzard") + (tags "kb_params=eyJBbGlnbm1lbnRDaG9pY2UiOiAiQ2VudGVyIiwgIkNhcExlZnRDaG9pY2UiOiAiWyIsICJDYXBSaWdodENob2ljZSI6ICJdIiwgIkZvbnRDb21ib0JveCI6ICJGcmVkZHlTcGFyay1SZWd1bGFyIiwgIkhlaWdodEN0cmwiOiAxLjUsICJMYXllckNvbWJvQm94IjogIkYuU2lsa1MiLCAiTGluZVNwYWNpbmdDdHJsIjogMS4wLCAiTXVsdGlMaW5lVGV4dCI6ICJPTiIsICJQYWRkaW5nQm90dG9tQ3RybCI6IDEuMCwgIlBhZGRpbmdMZWZ0Q3RybCI6IDEuMCwgIlBhZGRpbmdSaWdodEN0cmwiOiAxLjAsICJQYWRkaW5nVG9wQ3RybCI6IDEuMCwgIldpZHRoQ3RybCI6IDEuNSwgImFkdmFuY2VkQ2hlY2tib3giOiBmYWxzZSwgImlubGluZUZvcm1hdFRleHRib3giOiBmYWxzZSwgImxpbmVvdmVyU3R5bGVDaG9pY2UiOiAiU3F1YXJlIiwgImxpbmVvdmVyVGhpY2tuZXNzQ3RybCI6IDF9") + (property "Reference" "kibuzzard-66E4B147" + (at 0 3.998286 90) + (layer "B.SilkS") + (hide yes) + (uuid "4ca1a9fa-a1e5-4097-958a-d6e8d4380021") + (effects + (font + (size 0.001 0.001) + ) + (justify mirror) + ) + ) + (property "Value" "G***" + (at 0 -3.998286 90) + (layer "B.SilkS") + (hide yes) + (uuid "767cb598-4a5d-48d9-8ba0-e91cf4a76f33") + (effects + (font + (size 0.001 0.001) + ) + (justify mirror) + ) + ) + (property "Footprint" "" + (at 0 0 90) + (layer "B.Fab") + (hide yes) + (uuid "98c8cbd4-b091-427a-880f-610a3a1a2a23") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + (justify mirror) + ) + ) + (property "Datasheet" "" + (at 0 0 90) + (layer "B.Fab") + (hide yes) + (uuid "4ce0d2fd-6bfb-42dc-9a32-adec98705b7c") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + (justify mirror) + ) + ) + (property "Description" "" + (at 0 0 90) + (layer "B.Fab") + (hide yes) + (uuid "7656c0e9-499d-49bd-84af-a8d88662e376") + (effects + (font + (size 1.27 1.27) + (thickness 0.15) + ) + (justify mirror) + ) + ) + (attr board_only exclude_from_pos_files exclude_from_bom) + (fp_poly + (pts + (xy -0.704936 -0.378755) (xy -0.568401 -0.351663) (xy -0.454936 -0.270386) (xy -0.378487 -0.148873) + (xy -0.353004 -0.001073) (xy -0.378755 0.145655) (xy -0.456009 0.26824) (xy -0.569206 0.351127) + (xy -0.70279 0.378755) (xy -0.837983 0.351127) (xy -0.951717 0.26824) (xy -1.02897 0.145655) (xy -1.054721 -0.001073) + (xy -1.028702 -0.14485) (xy -0.950644 -0.267167) (xy -0.837178 -0.350858) (xy -0.704936 -0.378755) + ) + (stroke + (width 0) + (type solid) + ) + (fill solid) + (layer "B.SilkS") + (uuid "5eae9366-860c-4c68-81d6-686f6dbaf97e") + ) + (fp_poly + (pts + (xy -1.447425 0.950286) (xy -1.626252 0.950286) (xy -1.626252 -0.950286) (xy -1.447425 -0.950286) + (xy -0.694206 -0.950286) (xy -0.694206 -0.771459) (xy -0.844152 -0.757511) (xy -0.982833 -0.715665) + (xy -1.110247 -0.645923) (xy -1.226395 -0.548283) (xy -1.323095 -0.430928) (xy -1.392167 -0.302039) + (xy -1.433611 -0.161615) (xy -1.447425 -0.009657) (xy -1.434013 0.147264) (xy -1.393777 0.291845) + (xy -1.326717 0.424088) (xy -1.232833 0.543991) (xy -1.119769 0.643509) (xy -0.995172 0.714592) + (xy -0.85904 0.757242) (xy -0.711373 0.771459) (xy -0.560622 0.757444) (xy -0.421674 0.715397) (xy -0.294528 0.645319) + (xy -0.179185 0.54721) (xy -0.083423 0.428849) (xy -0.015021 0.298015) (xy 0.026019 0.154708) (xy 0.0397 -0.001073) + (xy 0.02622 -0.154171) (xy -0.014217 -0.295869) (xy -0.081612 -0.426167) (xy -0.175966 -0.545064) + (xy -0.28923 -0.644112) (xy -0.413358 -0.714861) (xy -0.54835 -0.75731) (xy -0.694206 -0.771459) + (xy -0.694206 -0.950286) (xy 0.322961 -0.950286) (xy 0.322961 -0.747854) (xy 0.212446 -0.732833) + (xy 0.154506 -0.684549) (xy 0.13412 -0.625536) (xy 0.129828 -0.550429) (xy 0.129828 0.563305) (xy 0.13412 0.635193) + (xy 0.155579 0.69206) (xy 0.214592 0.738197) (xy 0.327253 0.752146) (xy 0.424893 0.73927) (xy 0.479614 0.712446) + (xy 0.51824 0.668455) (xy 1.054721 -0.052575) (xy 1.054721 0.563305) (xy 1.059013 0.63412) (xy 1.080472 0.690987) + (xy 1.140558 0.737124) (xy 1.252146 0.752146) (xy 1.363734 0.737124) (xy 1.42382 0.687768) (xy 1.444206 0.628755) + (xy 1.447425 0.554721) (xy 1.447425 -0.552575) (xy 1.444206 -0.626609) (xy 1.42382 -0.684549) (xy 1.363734 -0.732833) + (xy 1.25 -0.747854) (xy 1.139485 -0.736052) (xy 1.07618 -0.689914) (xy 0.520386 0.043991) (xy 0.520386 -0.552575) + (xy 0.517167 -0.626609) (xy 0.496781 -0.684549) (xy 0.436695 -0.732833) (xy 0.322961 -0.747854) + (xy 0.322961 -0.950286) (xy 1.447425 -0.950286) (xy 1.626252 -0.950286) (xy 1.626252 0.950286) (xy 1.447425 0.950286) + (xy -1.447425 0.950286) + ) + (stroke + (width 0) + (type solid) + ) + (fill solid) + (layer "B.SilkS") + (uuid "d72f8393-4199-43e9-a112-bf018cb68e87") + ) + ) (footprint "Resistor_SMD:R_0603_1608Metric" (layer "B.Cu") (uuid "4d76b8bf-32eb-442a-8efd-b65e098694bd") @@ -12950,7 +13066,7 @@ (descr "Resistor SMD 0603 (1608 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") (tags "resistor") (property "Reference" "R3" - (at -1.43 -1.33 0) + (at -1.96 -0.85 0) (layer "B.SilkS") (uuid "9b80210d-add1-4288-bc51-5cccf628d5f4") (effects @@ -15810,7 +15926,7 @@ (footprint "Fuse:Fuse_0805_2012Metric" (layer "B.Cu") (uuid "88319a64-1d67-4ea3-ae40-9f94a9090760") - (at 191.4 47.9) + (at 191.41 47.44) (descr "Fuse SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator") (tags "fuse") (property "Reference" "F1" @@ -25615,6 +25731,18 @@ (justify left bottom mirror) ) ) + (gr_text "v1.1" + (at 209.65 51.05 0) + (layer "B.SilkS") + (uuid "64314baf-46e6-460c-99d7-1580c0160db2") + (effects + (font + (size 1 1) + (thickness 0.1) + ) + (justify left bottom mirror) + ) + ) (gr_text "Sponsored by" (at 228.53 132.22 0) (layer "B.SilkS") @@ -27311,36 +27439,44 @@ (uuid "0a9d8ba0-6161-4a2a-b6d4-f692f63098b7") ) (segment - (start 192.3375 53.2075) - (end 193.63 54.5) + (start 220.8 45.76) + (end 220.8 44.92) (width 0.3) (layer "B.Cu") (net 3) - (uuid "1041133e-02c2-42bb-b7c6-5cbfe4c5efc2") + (uuid "2386d234-f2ad-4eed-8d74-004ebb7bae4b") ) (segment - (start 220.8 45.76) - (end 220.8 44.92) + (start 218.41 54.5) + (end 220.21 52.7) (width 0.3) (layer "B.Cu") (net 3) - (uuid "2386d234-f2ad-4eed-8d74-004ebb7bae4b") + (uuid "3036f048-2685-40a2-ba33-9437ceca2fc5") ) (segment - (start 222.7 44.89) - (end 222.7 45.76) + (start 193.63 54.5) + (end 218.41 54.5) (width 0.3) (layer "B.Cu") (net 3) - (uuid "5b39a4eb-3fd5-4545-80c9-c7e251084fbc") + (uuid "51666813-2c2f-48e7-a2fb-bf53c31d150d") ) (segment - (start 220.21 48.27) - (end 220.745 47.735) + (start 192.3475 47.44) + (end 192.3375 47.45) (width 0.3) (layer "B.Cu") (net 3) - (uuid "67683475-7e7a-45e2-a39d-f0a6c69b4351") + (uuid "5aec6583-436b-4f2b-a89a-e3be007aa347") + ) + (segment + (start 222.7 44.89) + (end 222.7 45.76) + (width 0.3) + (layer "B.Cu") + (net 3) + (uuid "5b39a4eb-3fd5-4545-80c9-c7e251084fbc") ) (segment (start 220.745 45.815) @@ -27359,12 +27495,12 @@ (uuid "96456aa2-069a-4883-87b6-4c71f533c293") ) (segment - (start 218.41 54.5) - (end 220.21 52.7) + (start 192.3375 47.45) + (end 192.3375 53.2075) (width 0.3) (layer "B.Cu") (net 3) - (uuid "a453e359-4dc9-4d9e-8c07-0a0582b9340b") + (uuid "a4f1efc4-cb08-4fde-b7f5-639f6a46a69a") ) (segment (start 220.21 52.7) @@ -27372,7 +27508,7 @@ (width 0.3) (layer "B.Cu") (net 3) - (uuid "a5495974-969f-40db-9b57-40b62e2dbab3") + (uuid "ae9ef46b-9ca9-4ce2-9c85-3d412253bde8") ) (segment (start 220.8 44.92) @@ -27383,28 +27519,28 @@ (uuid "afd43206-3396-4144-b68c-44fa0fff9ac2") ) (segment - (start 222.28 44.47) - (end 222.7 44.89) + (start 192.3375 53.2075) + (end 193.63 54.5) (width 0.3) (layer "B.Cu") (net 3) - (uuid "dce0d271-729e-4e24-bcdd-f66356486d71") + (uuid "b8c8029a-3821-4f75-92a4-1a358721bc1d") ) (segment - (start 192.3375 47.9) - (end 192.3375 53.2075) + (start 220.21 48.27) + (end 220.745 47.735) (width 0.3) (layer "B.Cu") (net 3) - (uuid "f206ba4c-cf27-4370-b5c4-23957e6ba489") + (uuid "d98dc68d-aec1-49d0-be48-06ade9326f96") ) (segment - (start 193.63 54.5) - (end 218.41 54.5) + (start 222.28 44.47) + (end 222.7 44.89) (width 0.3) (layer "B.Cu") (net 3) - (uuid "fe694b73-9f13-443f-9e0a-38841f402436") + (uuid "dce0d271-729e-4e24-bcdd-f66356486d71") ) (segment (start 222.7 42.57) @@ -28998,14 +29134,6 @@ (net 17) (uuid "01b42465-6af4-448b-8b27-b05fe3f79f42") ) - (segment - (start 188.2825 45.66) - (end 189.57 45.66) - (width 0.3) - (layer "B.Cu") - (net 17) - (uuid "01c6a6f9-1eca-4a2c-bd29-fdcaed366980") - ) (segment (start 186.07 41.29) (end 187.027449 41.29) @@ -29031,12 +29159,12 @@ (uuid "2311fbf8-1e96-4efb-a5d5-cef24d2352c1") ) (segment - (start 189.57 45.66) - (end 190.4625 46.5525) + (start 188.2825 45.66) + (end 189.57 45.66) (width 0.3) (layer "B.Cu") (net 17) - (uuid "4793e1db-8cb2-45bb-ae8f-db3716c4833a") + (uuid "3d8e9033-f4d5-4a47-aaec-48580964e6ce") ) (segment (start 188.2825 40.8975) @@ -29071,12 +29199,20 @@ (uuid "cc928fa1-0876-47ce-86bc-4cad29615618") ) (segment - (start 190.4625 46.5525) - (end 190.4625 47.9) + (start 189.57 45.66) + (end 190.4725 46.5625) (width 0.3) (layer "B.Cu") (net 17) - (uuid "cedfe05d-da35-4d5c-813d-65bfd01d7cf4") + (uuid "db9ff434-5c90-4aea-829d-55376c4e140d") + ) + (segment + (start 190.4725 46.5625) + (end 190.4725 47.44) + (width 0.3) + (layer "B.Cu") + (net 17) + (uuid "e8f6c5e1-7975-481a-87f3-fd2daf9d49e1") ) (segment (start 186.31 123.9) @@ -34721,19 +34857,19 @@ (xy 193.080755 50.253442) (xy 193.080754 50.253443) (xy 192.989886 50.43593) (xy 192.989883 50.435936) (xy 192.934097 50.632006) (xy 192.933888 50.633129) (xy 192.933639 50.633617) (xy 192.932528 50.637524) (xy 192.931763 50.637306) (xy 192.902218 50.695409) (xy 192.841905 50.73068) (xy 192.772097 50.727744) - (xy 192.714958 50.687533) (xy 192.688629 50.622814) (xy 192.688 50.61034) (xy 192.688 48.877541) - (xy 192.707685 48.810502) (xy 192.760489 48.764747) (xy 192.771037 48.760502) (xy 192.791179 48.753455) - (xy 192.89893 48.67393) (xy 192.978455 48.566179) (xy 193.009848 48.476464) (xy 193.022684 48.439781) - (xy 193.022684 48.439778) (xy 193.022686 48.439774) (xy 193.0255 48.409764) (xy 193.0255 47.390236) - (xy 193.022686 47.360226) (xy 193.022684 47.360222) (xy 193.022684 47.360218) (xy 192.978455 47.233821) - (xy 192.978454 47.233819) (xy 192.89893 47.126069) (xy 192.79118 47.046545) (xy 192.791178 47.046544) - (xy 192.664781 47.002315) (xy 192.664769 47.002313) (xy 192.634768 46.9995) (xy 192.634764 46.9995) - (xy 192.040236 46.9995) (xy 192.040232 46.9995) (xy 192.01023 47.002313) (xy 192.010218 47.002315) - (xy 191.883821 47.046544) (xy 191.883819 47.046545) (xy 191.776069 47.126069) (xy 191.696545 47.233819) - (xy 191.696544 47.233821) (xy 191.652315 47.360218) (xy 191.652313 47.36023) (xy 191.6495 47.390231) - (xy 191.6495 48.409768) (xy 191.652313 48.439769) (xy 191.652315 48.439781) (xy 191.696544 48.566178) - (xy 191.696545 48.56618) (xy 191.776069 48.67393) (xy 191.869712 48.743042) (xy 191.883821 48.753455) - (xy 191.903952 48.760499) (xy 191.960728 48.801218) (xy 191.986478 48.86617) (xy 191.987 48.877541) + (xy 192.714958 50.687533) (xy 192.688629 50.622814) (xy 192.688 50.61034) (xy 192.688 48.42104) + (xy 192.707685 48.354001) (xy 192.760489 48.308246) (xy 192.771034 48.304002) (xy 192.801179 48.293455) + (xy 192.90893 48.21393) (xy 192.988455 48.106179) (xy 193.015095 48.030047) (xy 193.032684 47.979781) + (xy 193.032684 47.979778) (xy 193.032686 47.979774) (xy 193.0355 47.949764) (xy 193.0355 46.930236) + (xy 193.032686 46.900226) (xy 193.032684 46.900222) (xy 193.032684 46.900218) (xy 192.988455 46.773821) + (xy 192.988454 46.773819) (xy 192.90893 46.666069) (xy 192.80118 46.586545) (xy 192.801178 46.586544) + (xy 192.674781 46.542315) (xy 192.674769 46.542313) (xy 192.644768 46.5395) (xy 192.644764 46.5395) + (xy 192.050236 46.5395) (xy 192.050232 46.5395) (xy 192.02023 46.542313) (xy 192.020218 46.542315) + (xy 191.893821 46.586544) (xy 191.893819 46.586545) (xy 191.786069 46.666069) (xy 191.706545 46.773819) + (xy 191.706544 46.773821) (xy 191.662315 46.900218) (xy 191.662313 46.90023) (xy 191.6595 46.930231) + (xy 191.6595 47.949768) (xy 191.662313 47.979769) (xy 191.662315 47.979781) (xy 191.706544 48.106178) + (xy 191.706545 48.10618) (xy 191.786069 48.21393) (xy 191.832031 48.247851) (xy 191.893821 48.293455) + (xy 191.90395 48.296999) (xy 191.960728 48.337718) (xy 191.986477 48.40267) (xy 191.987 48.414042) (xy 191.987 53.253644) (xy 191.988837 53.260499) (xy 192.002862 53.312843) (xy 192.010886 53.342787) (xy 192.010887 53.34279) (xy 192.057027 53.422708) (xy 192.057029 53.422711) (xy 192.05703 53.422712) (xy 193.414788 54.78047) (xy 193.414789 54.780471) (xy 193.414791 54.780472) (xy 193.487374 54.822378) @@ -34834,39 +34970,33 @@ (xy 188.287056 47.464204) (xy 188.24756 47.395795) (xy 188.191705 47.33994) (xy 188.174488 47.33) (xy 188.977364 47.33) (xy 188.997607 47.305334) (xy 189.055353 47.266) (xy 189.093459 47.26) (xy 189.155328 47.26) (xy 189.155344 47.259999) (xy 189.214872 47.253598) (xy 189.214879 47.253596) (xy 189.349586 47.203354) - (xy 189.349593 47.20335) (xy 189.464687 47.11719) (xy 189.46469 47.117187) (xy 189.55085 47.002093) - (xy 189.550854 47.002086) (xy 189.601096 46.867379) (xy 189.601098 46.867372) (xy 189.607499 46.807844) - (xy 189.6075 46.807827) (xy 189.6075 46.71) (xy 188.1565 46.71) (xy 188.089461 46.690315) (xy 188.043706 46.637511) - (xy 188.0325 46.586) (xy 188.0325 46.334) (xy 188.052185 46.266961) (xy 188.104989 46.221206) (xy 188.1565 46.21) - (xy 189.572956 46.21) (xy 189.639995 46.229685) (xy 189.660637 46.246319) (xy 190.075681 46.661363) - (xy 190.109166 46.722686) (xy 190.112 46.749044) (xy 190.112 46.922458) (xy 190.092315 46.989497) - (xy 190.039511 47.035252) (xy 190.028955 47.039499) (xy 190.008821 47.046545) (xy 190.00882 47.046545) - (xy 190.008819 47.046546) (xy 189.901069 47.126069) (xy 189.821545 47.233819) (xy 189.821544 47.233821) - (xy 189.777315 47.360218) (xy 189.777313 47.36023) (xy 189.7745 47.390231) (xy 189.7745 48.409768) - (xy 189.777313 48.439769) (xy 189.777315 48.439781) (xy 189.821544 48.566178) (xy 189.821545 48.56618) - (xy 189.901069 48.67393) (xy 190.008819 48.753454) (xy 190.008821 48.753455) (xy 190.135218 48.797684) - (xy 190.135222 48.797684) (xy 190.135226 48.797686) (xy 190.150231 48.799093) (xy 190.165232 48.8005) - (xy 190.165236 48.8005) (xy 190.759768 48.8005) (xy 190.773101 48.799249) (xy 190.789774 48.797686) - (xy 190.789778 48.797684) (xy 190.789781 48.797684) (xy 190.901052 48.758748) (xy 190.916179 48.753455) - (xy 191.02393 48.67393) (xy 191.103455 48.566179) (xy 191.134848 48.476464) (xy 191.147684 48.439781) - (xy 191.147684 48.439778) (xy 191.147686 48.439774) (xy 191.1505 48.409764) (xy 191.1505 47.390236) - (xy 191.147686 47.360226) (xy 191.147684 47.360222) (xy 191.147684 47.360218) (xy 191.103455 47.233821) - (xy 191.103454 47.233819) (xy 191.02393 47.126069) (xy 190.930808 47.057342) (xy 190.916179 47.046545) - (xy 190.896043 47.039499) (xy 190.839268 46.998776) (xy 190.813522 46.933823) (xy 190.813 46.922458) - (xy 190.813 46.506358) (xy 190.813 46.506356) (xy 190.789114 46.417212) (xy 190.786084 46.411964) - (xy 190.74297 46.337288) (xy 190.302862 45.89718) (xy 190.269377 45.835857) (xy 190.274361 45.766165) - (xy 190.316233 45.710232) (xy 190.381697 45.685815) (xy 190.390531 45.685499) (xy 190.576518 45.685499) - (xy 190.670304 45.670646) (xy 190.783342 45.61305) (xy 190.87305 45.523342) (xy 190.897995 45.474384) - (xy 190.945967 45.423591) (xy 191.013788 45.406796) (xy 191.079923 45.429333) (xy 191.123375 45.484048) - (xy 191.126863 45.493791) (xy 191.151981 45.574396) (xy 191.239927 45.719877) (xy 191.360122 45.840072) - (xy 191.505604 45.928019) (xy 191.505603 45.928019) (xy 191.667894 45.97859) (xy 191.667893 45.97859) - (xy 191.738408 45.984998) (xy 191.738426 45.984999) (xy 192.245 45.984999) (xy 192.251581 45.984999) - (xy 192.322102 45.978591) (xy 192.322107 45.97859) (xy 192.484396 45.928018) (xy 192.629877 45.840072) - (xy 192.750072 45.719877) (xy 192.838019 45.574395) (xy 192.88859 45.412106) (xy 192.895 45.341572) - (xy 192.895 45.26) (xy 192.245 45.26) (xy 192.245 45.984999) (xy 191.738426 45.984999) (xy 191.744999 45.984998) - (xy 191.745 45.984998) (xy 191.745 44.083362) (xy 191.764685 44.016323) (xy 191.781319 43.995681) - (xy 191.785 43.992) (xy 191.785 43.339) (xy 191.804685 43.271961) (xy 191.857489 43.226206) (xy 191.909 43.215) - (xy 192.161 43.215) + (xy 189.349593 47.20335) (xy 189.464687 47.11719) (xy 189.46469 47.117187) (xy 189.55085 47.002094) + (xy 189.551667 47.000598) (xy 189.552872 46.999392) (xy 189.556169 46.994989) (xy 189.556802 46.995462) + (xy 189.601072 46.951192) (xy 189.669345 46.93634) (xy 189.73481 46.960756) (xy 189.776681 47.01669) + (xy 189.7845 47.060024) (xy 189.7845 47.949768) (xy 189.787313 47.979769) (xy 189.787315 47.979781) + (xy 189.831544 48.106178) (xy 189.831545 48.10618) (xy 189.911069 48.21393) (xy 190.018819 48.293454) + (xy 190.018821 48.293455) (xy 190.145218 48.337684) (xy 190.145222 48.337684) (xy 190.145226 48.337686) + (xy 190.160231 48.339093) (xy 190.175232 48.3405) (xy 190.175236 48.3405) (xy 190.769768 48.3405) + (xy 190.783101 48.339249) (xy 190.799774 48.337686) (xy 190.799778 48.337684) (xy 190.799781 48.337684) + (xy 190.874689 48.311472) (xy 190.926179 48.293455) (xy 191.03393 48.21393) (xy 191.113455 48.106179) + (xy 191.140095 48.030047) (xy 191.157684 47.979781) (xy 191.157684 47.979778) (xy 191.157686 47.979774) + (xy 191.1605 47.949764) (xy 191.1605 46.930236) (xy 191.157686 46.900226) (xy 191.157684 46.900222) + (xy 191.157684 46.900218) (xy 191.113455 46.773821) (xy 191.113454 46.773819) (xy 191.03393 46.666069) + (xy 190.92618 46.586545) (xy 190.926178 46.586544) (xy 190.894935 46.575612) (xy 190.838159 46.534891) + (xy 190.816116 46.490667) (xy 190.799114 46.427212) (xy 190.796503 46.422691) (xy 190.790883 46.412955) + (xy 190.790881 46.412953) (xy 190.75297 46.347288) (xy 190.302862 45.89718) (xy 190.269377 45.835857) + (xy 190.274361 45.766165) (xy 190.316233 45.710232) (xy 190.381697 45.685815) (xy 190.390531 45.685499) + (xy 190.576518 45.685499) (xy 190.670304 45.670646) (xy 190.783342 45.61305) (xy 190.87305 45.523342) + (xy 190.897995 45.474384) (xy 190.945967 45.423591) (xy 191.013788 45.406796) (xy 191.079923 45.429333) + (xy 191.123375 45.484048) (xy 191.126863 45.493791) (xy 191.151981 45.574396) (xy 191.239927 45.719877) + (xy 191.360122 45.840072) (xy 191.505604 45.928019) (xy 191.505603 45.928019) (xy 191.667894 45.97859) + (xy 191.667893 45.97859) (xy 191.738408 45.984998) (xy 191.738426 45.984999) (xy 192.245 45.984999) + (xy 192.251581 45.984999) (xy 192.322102 45.978591) (xy 192.322107 45.97859) (xy 192.484396 45.928018) + (xy 192.629877 45.840072) (xy 192.750072 45.719877) (xy 192.838019 45.574395) (xy 192.88859 45.412106) + (xy 192.895 45.341572) (xy 192.895 45.26) (xy 192.245 45.26) (xy 192.245 45.984999) (xy 191.738426 45.984999) + (xy 191.744999 45.984998) (xy 191.745 45.984998) (xy 191.745 44.083362) (xy 191.764685 44.016323) + (xy 191.781319 43.995681) (xy 191.785 43.992) (xy 191.785 43.339) (xy 191.804685 43.271961) (xy 191.857489 43.226206) + (xy 191.909 43.215) (xy 192.161 43.215) ) ) (filled_polygon @@ -35367,14 +35497,14 @@ (xy 181.790669 49.907268) (xy 181.754338 49.782119) (xy 181.729186 49.695478) (xy 181.72849 49.692982) (xy 181.727807 49.690429) (xy 181.67097 49.47794) (xy 181.670277 49.475222) (xy 181.617186 49.256137) (xy 181.616498 49.253129) (xy 181.568361 49.02941) (xy 181.567702 49.026122) (xy 181.52434 48.79339) - (xy 181.523967 48.791288) (xy 181.523675 48.789558) (xy 181.507017 48.690732) (xy 181.506893 48.689981) + (xy 181.523967 48.791288) (xy 181.523479 48.788395) (xy 181.507017 48.690732) (xy 181.506893 48.689981) (xy 181.502888 48.665265) (xy 181.472342 48.476745) (xy 181.472237 48.476075) (xy 181.439293 48.261537) (xy 181.439196 48.260888) (xy 181.407819 48.044972) (xy 181.407682 48.044002) (xy 181.405766 48.030045) (xy 181.377896 47.826989) (xy 181.37782 47.826418) (xy 181.349708 47.609) (xy 181.349602 47.608157) (xy 181.348879 47.602205) (xy 181.323228 47.390949) (xy 181.323118 47.390009) (xy 181.320456 47.366564) (xy 181.298503 47.173255) (xy 181.298404 47.172349) (xy 181.295828 47.147967) (xy 181.275588 46.95639) (xy 181.275533 46.955851) (xy 181.254591 46.741419) (xy 181.254498 46.740425) (xy 181.235503 46.52829) - (xy 181.235416 46.527268) (xy 181.233718 46.506356) (xy 181.218382 46.317522) (xy 181.218307 46.316543) + (xy 181.235416 46.527268) (xy 181.234046 46.510403) (xy 181.218382 46.317522) (xy 181.218307 46.316543) (xy 181.217524 46.30576) (xy 181.203301 46.109931) (xy 181.203243 46.109079) (xy 181.190294 45.905859) (xy 181.190228 45.904743) (xy 181.189817 45.89718) (xy 181.179448 45.706573) (xy 181.179377 45.705106) (xy 181.17924 45.701837) (xy 181.167145 45.414184) (xy 181.167085 45.412444) (xy 181.167026 45.410304) @@ -35646,83 +35776,83 @@ (xy 220.391663 46.537672) (xy 220.3945 46.564043) (xy 220.3945 46.995408) (xy 220.374815 47.062447) (xy 220.326795 47.105892) (xy 220.266783 47.136469) (xy 220.266774 47.136476) (xy 220.171476 47.231774) (xy 220.171473 47.231778) (xy 220.110279 47.351878) (xy 220.0945 47.451506) (xy 220.0945 47.838456) - (xy 220.074815 47.905495) (xy 220.058181 47.926137) (xy 219.929531 48.054786) (xy 219.929529 48.054788) - (xy 219.910457 48.087823) (xy 219.894334 48.11575) (xy 219.887266 48.127992) (xy 219.883385 48.134714) - (xy 219.8595 48.223856) (xy 219.8595 52.503456) (xy 219.839815 52.570495) (xy 219.823181 52.591137) - (xy 218.301137 54.113181) (xy 218.239814 54.146666) (xy 218.213456 54.1495) (xy 193.826544 54.1495) - (xy 193.759505 54.129815) (xy 193.738863 54.113181) (xy 192.724319 53.098637) (xy 192.690834 53.037314) - (xy 192.688 53.010956) (xy 192.688 51.059659) (xy 192.707685 50.99262) (xy 192.760489 50.946865) - (xy 192.829647 50.936921) (xy 192.893203 50.965946) (xy 192.930977 51.024724) (xy 192.933889 51.036874) - (xy 192.934099 51.037997) (xy 192.989883 51.234063) (xy 192.989886 51.234069) (xy 193.080751 51.416551) - (xy 193.082533 51.418911) (xy 193.537037 50.964408) (xy 193.554075 51.027993) (xy 193.619901 51.142007) - (xy 193.712993 51.235099) (xy 193.827007 51.300925) (xy 193.89059 51.317962) (xy 193.439311 51.76924) - (xy 193.527585 51.823897) (xy 193.717678 51.897539) (xy 193.918072 51.935) (xy 194.121928 51.935) - (xy 194.322322 51.897539) (xy 194.512412 51.823899) (xy 194.512416 51.823897) (xy 194.600686 51.769241) - (xy 194.600686 51.76924) (xy 194.149409 51.317962) (xy 194.212993 51.300925) (xy 194.327007 51.235099) - (xy 194.420099 51.142007) (xy 194.485925 51.027993) (xy 194.502962 50.964409) (xy 194.957465 51.418912) - (xy 194.959247 51.416553) (xy 194.959248 51.416551) (xy 194.980177 51.374519) (xy 201.068985 51.374519) - (xy 201.080474 51.549817) (xy 201.089098 51.681386) (xy 201.089099 51.681398) (xy 201.149091 51.982995) - (xy 201.149097 51.983017) (xy 201.247941 52.274205) (xy 201.247945 52.274215) (xy 201.383957 52.550019) - (xy 201.383964 52.550032) (xy 201.425418 52.612072) (xy 201.553196 52.803305) (xy 201.554815 52.805727) - (xy 201.75758 53.036938) (xy 201.904169 53.165492) (xy 201.988793 53.239705) (xy 202.244492 53.410558) - (xy 202.304629 53.440214) (xy 202.520303 53.546573) (xy 202.520313 53.546577) (xy 202.811501 53.645421) - (xy 202.811513 53.645425) (xy 202.811522 53.645426) (xy 202.811523 53.645427) (xy 203.11312 53.705419) - (xy 203.113121 53.705419) (xy 203.113131 53.705421) (xy 203.42 53.725534) (xy 203.726869 53.705421) - (xy 204.028487 53.645425) (xy 204.214363 53.582329) (xy 204.319686 53.546577) (xy 204.319696 53.546573) - (xy 204.413072 53.500525) (xy 204.595508 53.410558) (xy 204.851207 53.239705) (xy 205.082419 53.036938) - (xy 205.285186 52.805726) (xy 205.456039 52.550027) (xy 205.592055 52.274213) (xy 205.592185 52.273832) - (xy 205.663957 52.062395) (xy 205.690906 51.983006) (xy 205.750902 51.681388) (xy 205.771015 51.374519) - (xy 205.750902 51.06765) (xy 205.749312 51.059659) (xy 205.698656 50.804996) (xy 211.954435 50.804996) - (xy 211.954435 50.805003) (xy 211.97463 50.984249) (xy 211.974631 50.984254) (xy 212.034211 51.154523) - (xy 212.115675 51.284171) (xy 212.130184 51.307262) (xy 212.257738 51.434816) (xy 212.345268 51.489815) - (xy 212.372086 51.506666) (xy 212.410478 51.530789) (xy 212.48858 51.558118) (xy 212.580745 51.590368) - (xy 212.58075 51.590369) (xy 212.759996 51.610565) (xy 212.76 51.610565) (xy 212.760004 51.610565) - (xy 212.939248 51.590369) (xy 212.939248 51.590368) (xy 212.939255 51.590368) (xy 212.94752 51.587475) - (xy 213.017296 51.583913) (xy 213.076155 51.616836) (xy 213.534531 52.075212) (xy 213.599788 52.140469) - (xy 213.599791 52.14047) (xy 213.599794 52.140473) (xy 213.679706 52.186611) (xy 213.679707 52.186611) - (xy 213.679712 52.186614) (xy 213.768856 52.2105) (xy 213.768858 52.2105) (xy 215.272366 52.2105) - (xy 215.339405 52.230185) (xy 215.38516 52.282989) (xy 215.395104 52.352147) (xy 215.366079 52.415701) - (xy 215.344762 52.440304) (xy 215.304623 52.486626) (xy 215.304622 52.486628) (xy 215.244834 52.617543) - (xy 215.224353 52.76) (xy 215.244834 52.902456) (xy 215.296288 53.015122) (xy 215.304623 53.033373) - (xy 215.398872 53.142143) (xy 215.519947 53.219953) (xy 215.51995 53.219954) (xy 215.519949 53.219954) - (xy 215.658036 53.260499) (xy 215.658038 53.2605) (xy 215.658039 53.2605) (xy 215.801962 53.2605) - (xy 215.801962 53.260499) (xy 215.930132 53.222866) (xy 215.94005 53.219954) (xy 215.94005 53.219953) - (xy 215.940053 53.219953) (xy 216.061128 53.142143) (xy 216.061136 53.142133) (xy 216.062688 53.14079) - (xy 216.064572 53.139929) (xy 216.068589 53.137348) (xy 216.06896 53.137925) (xy 216.126243 53.111763) - (xy 216.143895 53.1105) (xy 216.853249 53.1105) (xy 216.853251 53.1105) (xy 216.942395 53.086614) - (xy 216.943208 53.086145) (xy 216.970549 53.070359) (xy 216.970551 53.070358) (xy 217.022319 53.04047) - (xy 217.92047 52.142319) (xy 217.966614 52.062395) (xy 217.978535 52.017904) (xy 217.9905 51.973251) - (xy 217.9905 45.033322) (xy 218.295001 45.033322) (xy 218.305144 45.132607) (xy 218.358452 45.293481) - (xy 218.358457 45.293492) (xy 218.447424 45.437728) (xy 218.447427 45.437732) (xy 218.567267 45.557572) - (xy 218.567271 45.557575) (xy 218.711507 45.646542) (xy 218.711518 45.646547) (xy 218.872393 45.699855) - (xy 218.971683 45.709999) (xy 219.019999 45.709998) (xy 219.02 45.709998) (xy 219.02 45.01) (xy 218.295001 45.01) - (xy 218.295001 45.033322) (xy 217.9905 45.033322) (xy 217.9905 42.906543) (xy 218.010185 42.839504) - (xy 218.026814 42.818867) (xy 219.762768 41.082912) (xy 219.824089 41.049429) (xy 219.893781 41.054413) - (xy 219.949714 41.096285) (xy 219.950217 41.096961) (xy 219.968658 41.121947) (xy 220.02785 41.20215) - (xy 220.137118 41.282793) (xy 220.160124 41.290843) (xy 220.265299 41.327646) (xy 220.29573 41.3305) - (xy 220.295734 41.3305) (xy 221.00427 41.3305) (xy 221.034699 41.327646) (xy 221.034701 41.327646) - (xy 221.09879 41.305219) (xy 221.162882 41.282793) (xy 221.27215 41.20215) (xy 221.352793 41.092882) - (xy 221.383258 41.005819) (xy 221.397646 40.964701) (xy 221.397646 40.964699) (xy 221.4005 40.934269) - (xy 221.4005 40.22573) (xy 221.397646 40.1953) (xy 221.397646 40.195298) (xy 221.354251 40.071286) - (xy 221.352793 40.067118) (xy 221.27215 39.95785) (xy 221.162882 39.877207) (xy 221.133601 39.866961) - (xy 221.083544 39.849445) (xy 221.026769 39.808723) (xy 221.001022 39.74377) (xy 221.0005 39.732404) - (xy 221.0005 39.457714) (xy 221.020185 39.390675) (xy 221.072989 39.34492) (xy 221.106616 39.33501) - (xy 221.171393 39.325573) (xy 221.276483 39.274198) (xy 221.359198 39.191483) (xy 221.410573 39.086393) - (xy 221.4205 39.01826) (xy 221.4205 37.77674) (xy 221.410573 37.708607) (xy 221.359198 37.603517) - (xy 221.359196 37.603515) (xy 221.359196 37.603514) (xy 221.276485 37.520803) (xy 221.171391 37.469426) - (xy 221.103261 37.4595) (xy 221.10326 37.4595) (xy 220.755544 37.4595) (xy 220.688505 37.439815) - (xy 220.64275 37.387011) (xy 220.632806 37.317853) (xy 220.661831 37.254297) (xy 220.667863 37.247819) - (xy 221.006363 36.909319) (xy 221.067686 36.875834) (xy 221.094044 36.873) (xy 221.2455 36.873) - (xy 221.312539 36.892685) (xy 221.358294 36.945489) (xy 221.3695 36.997) (xy 221.3695 37.14326) - (xy 221.379426 37.211391) (xy 221.430803 37.316485) (xy 221.513514 37.399196) (xy 221.513515 37.399196) - (xy 221.513517 37.399198) (xy 221.618607 37.450573) (xy 221.65022 37.455179) (xy 221.686739 37.4605) - (xy 221.68674 37.4605) (xy 222.053261 37.4605) (xy 222.08978 37.455179) (xy 222.121393 37.450573) - (xy 222.226483 37.399198) (xy 222.309198 37.316483) (xy 222.360573 37.211393) (xy 222.3705 37.14326) - (xy 222.3705 35.90174) (xy 222.360573 35.833607) (xy 222.309198 35.728517) (xy 222.309196 35.728515) - (xy 222.309196 35.728514) (xy 222.226485 35.645803) (xy 222.121391 35.594426) (xy 222.053261 35.5845) - (xy 222.05326 35.5845) (xy 221.68674 35.5845) (xy 221.686739 35.5845) (xy 221.618608 35.594426) - (xy 221.513514 35.645803) (xy 221.430803 35.728514) (xy 221.379426 35.833608) (xy 221.3695 35.901739) - (xy 221.3695 36.048) (xy 221.349815 36.115039) (xy 221.297011 36.160794) (xy 221.2455 36.172) (xy 220.851356 36.172) + (xy 220.074815 47.905495) (xy 220.058181 47.926137) (xy 219.929531 48.054786) (xy 219.929527 48.054791) + (xy 219.895756 48.113286) (xy 219.883387 48.13471) (xy 219.883386 48.134711) (xy 219.8595 48.223856) + (xy 219.8595 52.503456) (xy 219.839815 52.570495) (xy 219.823181 52.591137) (xy 218.301137 54.113181) + (xy 218.239814 54.146666) (xy 218.213456 54.1495) (xy 193.826544 54.1495) (xy 193.759505 54.129815) + (xy 193.738863 54.113181) (xy 192.724319 53.098637) (xy 192.690834 53.037314) (xy 192.688 53.010956) + (xy 192.688 51.059659) (xy 192.707685 50.99262) (xy 192.760489 50.946865) (xy 192.829647 50.936921) + (xy 192.893203 50.965946) (xy 192.930977 51.024724) (xy 192.933889 51.036874) (xy 192.934099 51.037997) + (xy 192.989883 51.234063) (xy 192.989886 51.234069) (xy 193.080751 51.416551) (xy 193.082533 51.418911) + (xy 193.537037 50.964408) (xy 193.554075 51.027993) (xy 193.619901 51.142007) (xy 193.712993 51.235099) + (xy 193.827007 51.300925) (xy 193.89059 51.317962) (xy 193.439311 51.76924) (xy 193.527585 51.823897) + (xy 193.717678 51.897539) (xy 193.918072 51.935) (xy 194.121928 51.935) (xy 194.322322 51.897539) + (xy 194.512412 51.823899) (xy 194.512416 51.823897) (xy 194.600686 51.769241) (xy 194.600686 51.76924) + (xy 194.149409 51.317962) (xy 194.212993 51.300925) (xy 194.327007 51.235099) (xy 194.420099 51.142007) + (xy 194.485925 51.027993) (xy 194.502962 50.964409) (xy 194.957465 51.418912) (xy 194.959247 51.416553) + (xy 194.959248 51.416551) (xy 194.980177 51.374519) (xy 201.068985 51.374519) (xy 201.080474 51.549817) + (xy 201.089098 51.681386) (xy 201.089099 51.681398) (xy 201.149091 51.982995) (xy 201.149097 51.983017) + (xy 201.247941 52.274205) (xy 201.247945 52.274215) (xy 201.383957 52.550019) (xy 201.383964 52.550032) + (xy 201.425418 52.612072) (xy 201.553196 52.803305) (xy 201.554815 52.805727) (xy 201.75758 53.036938) + (xy 201.904169 53.165492) (xy 201.988793 53.239705) (xy 202.244492 53.410558) (xy 202.304629 53.440214) + (xy 202.520303 53.546573) (xy 202.520313 53.546577) (xy 202.811501 53.645421) (xy 202.811513 53.645425) + (xy 202.811522 53.645426) (xy 202.811523 53.645427) (xy 203.11312 53.705419) (xy 203.113121 53.705419) + (xy 203.113131 53.705421) (xy 203.42 53.725534) (xy 203.726869 53.705421) (xy 204.028487 53.645425) + (xy 204.214363 53.582329) (xy 204.319686 53.546577) (xy 204.319696 53.546573) (xy 204.413072 53.500525) + (xy 204.595508 53.410558) (xy 204.851207 53.239705) (xy 205.082419 53.036938) (xy 205.285186 52.805726) + (xy 205.456039 52.550027) (xy 205.592055 52.274213) (xy 205.592185 52.273832) (xy 205.663957 52.062395) + (xy 205.690906 51.983006) (xy 205.750902 51.681388) (xy 205.771015 51.374519) (xy 205.750902 51.06765) + (xy 205.749312 51.059659) (xy 205.698656 50.804996) (xy 211.954435 50.804996) (xy 211.954435 50.805003) + (xy 211.97463 50.984249) (xy 211.974631 50.984254) (xy 212.034211 51.154523) (xy 212.115675 51.284171) + (xy 212.130184 51.307262) (xy 212.257738 51.434816) (xy 212.345268 51.489815) (xy 212.372086 51.506666) + (xy 212.410478 51.530789) (xy 212.48858 51.558118) (xy 212.580745 51.590368) (xy 212.58075 51.590369) + (xy 212.759996 51.610565) (xy 212.76 51.610565) (xy 212.760004 51.610565) (xy 212.939248 51.590369) + (xy 212.939248 51.590368) (xy 212.939255 51.590368) (xy 212.94752 51.587475) (xy 213.017296 51.583913) + (xy 213.076155 51.616836) (xy 213.534531 52.075212) (xy 213.599788 52.140469) (xy 213.599791 52.14047) + (xy 213.599794 52.140473) (xy 213.679706 52.186611) (xy 213.679707 52.186611) (xy 213.679712 52.186614) + (xy 213.768856 52.2105) (xy 213.768858 52.2105) (xy 215.272366 52.2105) (xy 215.339405 52.230185) + (xy 215.38516 52.282989) (xy 215.395104 52.352147) (xy 215.366079 52.415701) (xy 215.344762 52.440304) + (xy 215.304623 52.486626) (xy 215.304622 52.486628) (xy 215.244834 52.617543) (xy 215.224353 52.76) + (xy 215.244834 52.902456) (xy 215.296288 53.015122) (xy 215.304623 53.033373) (xy 215.398872 53.142143) + (xy 215.519947 53.219953) (xy 215.51995 53.219954) (xy 215.519949 53.219954) (xy 215.658036 53.260499) + (xy 215.658038 53.2605) (xy 215.658039 53.2605) (xy 215.801962 53.2605) (xy 215.801962 53.260499) + (xy 215.930132 53.222866) (xy 215.94005 53.219954) (xy 215.94005 53.219953) (xy 215.940053 53.219953) + (xy 216.061128 53.142143) (xy 216.061136 53.142133) (xy 216.062688 53.14079) (xy 216.064572 53.139929) + (xy 216.068589 53.137348) (xy 216.06896 53.137925) (xy 216.126243 53.111763) (xy 216.143895 53.1105) + (xy 216.853249 53.1105) (xy 216.853251 53.1105) (xy 216.942395 53.086614) (xy 216.943208 53.086145) + (xy 216.970549 53.070359) (xy 216.970551 53.070358) (xy 217.022319 53.04047) (xy 217.92047 52.142319) + (xy 217.966614 52.062395) (xy 217.978535 52.017904) (xy 217.9905 51.973251) (xy 217.9905 45.033322) + (xy 218.295001 45.033322) (xy 218.305144 45.132607) (xy 218.358452 45.293481) (xy 218.358457 45.293492) + (xy 218.447424 45.437728) (xy 218.447427 45.437732) (xy 218.567267 45.557572) (xy 218.567271 45.557575) + (xy 218.711507 45.646542) (xy 218.711518 45.646547) (xy 218.872393 45.699855) (xy 218.971683 45.709999) + (xy 219.019999 45.709998) (xy 219.02 45.709998) (xy 219.02 45.01) (xy 218.295001 45.01) (xy 218.295001 45.033322) + (xy 217.9905 45.033322) (xy 217.9905 42.906543) (xy 218.010185 42.839504) (xy 218.026814 42.818867) + (xy 219.762768 41.082912) (xy 219.824089 41.049429) (xy 219.893781 41.054413) (xy 219.949714 41.096285) + (xy 219.950217 41.096961) (xy 219.968658 41.121947) (xy 220.02785 41.20215) (xy 220.137118 41.282793) + (xy 220.160124 41.290843) (xy 220.265299 41.327646) (xy 220.29573 41.3305) (xy 220.295734 41.3305) + (xy 221.00427 41.3305) (xy 221.034699 41.327646) (xy 221.034701 41.327646) (xy 221.09879 41.305219) + (xy 221.162882 41.282793) (xy 221.27215 41.20215) (xy 221.352793 41.092882) (xy 221.383258 41.005819) + (xy 221.397646 40.964701) (xy 221.397646 40.964699) (xy 221.4005 40.934269) (xy 221.4005 40.22573) + (xy 221.397646 40.1953) (xy 221.397646 40.195298) (xy 221.354251 40.071286) (xy 221.352793 40.067118) + (xy 221.27215 39.95785) (xy 221.162882 39.877207) (xy 221.133601 39.866961) (xy 221.083544 39.849445) + (xy 221.026769 39.808723) (xy 221.001022 39.74377) (xy 221.0005 39.732404) (xy 221.0005 39.457714) + (xy 221.020185 39.390675) (xy 221.072989 39.34492) (xy 221.106616 39.33501) (xy 221.171393 39.325573) + (xy 221.276483 39.274198) (xy 221.359198 39.191483) (xy 221.410573 39.086393) (xy 221.4205 39.01826) + (xy 221.4205 37.77674) (xy 221.410573 37.708607) (xy 221.359198 37.603517) (xy 221.359196 37.603515) + (xy 221.359196 37.603514) (xy 221.276485 37.520803) (xy 221.171391 37.469426) (xy 221.103261 37.4595) + (xy 221.10326 37.4595) (xy 220.755544 37.4595) (xy 220.688505 37.439815) (xy 220.64275 37.387011) + (xy 220.632806 37.317853) (xy 220.661831 37.254297) (xy 220.667863 37.247819) (xy 221.006363 36.909319) + (xy 221.067686 36.875834) (xy 221.094044 36.873) (xy 221.2455 36.873) (xy 221.312539 36.892685) + (xy 221.358294 36.945489) (xy 221.3695 36.997) (xy 221.3695 37.14326) (xy 221.379426 37.211391) + (xy 221.430803 37.316485) (xy 221.513514 37.399196) (xy 221.513515 37.399196) (xy 221.513517 37.399198) + (xy 221.618607 37.450573) (xy 221.65022 37.455179) (xy 221.686739 37.4605) (xy 221.68674 37.4605) + (xy 222.053261 37.4605) (xy 222.08978 37.455179) (xy 222.121393 37.450573) (xy 222.226483 37.399198) + (xy 222.309198 37.316483) (xy 222.360573 37.211393) (xy 222.3705 37.14326) (xy 222.3705 35.90174) + (xy 222.360573 35.833607) (xy 222.309198 35.728517) (xy 222.309196 35.728515) (xy 222.309196 35.728514) + (xy 222.226485 35.645803) (xy 222.121391 35.594426) (xy 222.053261 35.5845) (xy 222.05326 35.5845) + (xy 221.68674 35.5845) (xy 221.686739 35.5845) (xy 221.618608 35.594426) (xy 221.513514 35.645803) + (xy 221.430803 35.728514) (xy 221.379426 35.833608) (xy 221.3695 35.901739) (xy 221.3695 36.048) + (xy 221.349815 36.115039) (xy 221.297011 36.160794) (xy 221.2455 36.172) (xy 220.851356 36.172) (xy 220.772119 36.19323) (xy 220.77212 36.193231) (xy 220.762213 36.195885) (xy 220.762209 36.195887) (xy 220.682291 36.242027) (xy 220.682286 36.242031) (xy 219.619531 37.304786) (xy 219.619529 37.304789) (xy 219.581672 37.370361) (xy 219.58167 37.370364) (xy 219.573386 37.38471) (xy 219.5495 37.473856) @@ -35789,7 +35919,7 @@ (xy 200.747267 48.708062) (xy 200.750674 48.690758) (xy 200.75177 48.685194) (xy 200.749978 48.658644) (xy 200.749907 48.643083) (xy 200.756433 48.531214) (xy 200.758082 48.517055) (xy 200.779163 48.396815) (xy 200.783474 48.379594) (xy 200.823859 48.256522) (xy 200.831398 48.238492) (xy 200.883569 48.137024) - (xy 200.894266 48.119833) (xy 200.899326 48.113014) (xy 200.956454 48.036025) (xy 200.970196 48.020431) + (xy 200.894266 48.119833) (xy 200.897964 48.114849) (xy 200.956454 48.036025) (xy 200.970196 48.020431) (xy 201.040965 47.952564) (xy 201.057422 47.939283) (xy 201.136511 47.885925) (xy 201.155143 47.875567) (xy 201.217852 47.847464) (xy 201.243418 47.836006) (xy 201.263443 47.82902) (xy 201.362654 47.803691) (xy 201.383183 47.800254) (xy 201.511552 47.789732) (xy 201.525281 47.789372) (xy 201.538089 47.789747) @@ -36031,6 +36161,17 @@ (xy 223.050613 30.630293) (xy 223.066176 30.629859) ) ) + (filled_polygon + (layer "B.Cu") + (pts + (xy 189.639995 46.229685) (xy 189.660637 46.246319) (xy 189.908047 46.493729) (xy 189.941532 46.555052) + (xy 189.936548 46.624744) (xy 189.915373 46.657696) (xy 189.916588 46.658593) (xy 189.83127 46.774193) + (xy 189.775622 46.816444) (xy 189.705966 46.821901) (xy 189.644416 46.788834) (xy 189.610516 46.72774) + (xy 189.608678 46.711178) (xy 189.6075 46.71) (xy 188.1565 46.71) (xy 188.089461 46.690315) (xy 188.043706 46.637511) + (xy 188.0325 46.586) (xy 188.0325 46.334) (xy 188.052185 46.266961) (xy 188.104989 46.221206) (xy 188.1565 46.21) + (xy 189.572956 46.21) + ) + ) (filled_polygon (layer "B.Cu") (pts diff --git a/hardware/eko-badge-2024/eko-badge-2024.kicad_prl b/hardware/eko-badge-2024/eko-badge-2024.kicad_prl index ab6b23a..5d9e185 100644 --- a/hardware/eko-badge-2024/eko-badge-2024.kicad_prl +++ b/hardware/eko-badge-2024/eko-badge-2024.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 36, + "active_layer": 0, "active_layer_preset": "", "auto_track_width": true, "hidden_netclasses": [], diff --git a/hardware/eko-badge-2024/eko-badge-2024.kicad_pro b/hardware/eko-badge-2024/eko-badge-2024.kicad_pro index 046d754..c45c7de 100644 --- a/hardware/eko-badge-2024/eko-badge-2024.kicad_pro +++ b/hardware/eko-badge-2024/eko-badge-2024.kicad_pro @@ -491,7 +491,7 @@ }, "schematic": { "annotate_start_num": 0, - "bom_export_filename": "", + "bom_export_filename": "eko-badge-2024.csv", "bom_fmt_presets": [], "bom_fmt_settings": { "field_delimiter": ",", diff --git a/hardware/eko-badge-2024/eko-badge-2024.kicad_sch b/hardware/eko-badge-2024/eko-badge-2024.kicad_sch index 9146785..fa8959f 100644 --- a/hardware/eko-badge-2024/eko-badge-2024.kicad_sch +++ b/hardware/eko-badge-2024/eko-badge-2024.kicad_sch @@ -10965,7 +10965,7 @@ (exclude_from_sim no) (in_bom yes) (on_board yes) - (dnp yes) + (dnp no) (fields_autoplaced yes) (uuid "2ab0e6a9-f9db-4e85-889e-4fa1ea47094e") (property "Reference" "LS1"