diff --git a/pcb/waveshare-panel/waveshare-panel.kicad_pcb b/pcb/waveshare-panel/waveshare-panel.kicad_pcb index 823c27b..21ec513 100644 --- a/pcb/waveshare-panel/waveshare-panel.kicad_pcb +++ b/pcb/waveshare-panel/waveshare-panel.kicad_pcb @@ -93,7 +93,7 @@ (at 156.262 70.394) (descr "Generic 6mm SW tactile push button") (tags "tact sw push 6mm") - (property "Reference" "SW1" + (property "Reference" "BOOT" (at 3.25 -2 0) (layer "F.SilkS") (uuid "0205ac53-58a0-4ce9-9fed-4cc64ccb4812") @@ -444,11 +444,11 @@ (footprint "LED_SMD:LED_0805_2012Metric_Pad1.15x1.40mm_HandSolder" (layer "F.Cu") (uuid "11cdad77-ad78-49b2-952e-6952efb071b1") - (at 167.64 76.708) + (at 167.64 74.676) (descr "LED SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal, (Body size source: https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing)") (tags "LED handsolder") (property "Reference" "D1" - (at 0 -1.65 0) + (at 3.048 0 0) (layer "F.SilkS") (uuid "656f8511-f6cc-4eb2-9c64-90b1f9ecb15b") (effects @@ -964,7 +964,7 @@ (property "Reference" "R2" (at 7.62 0 0) (layer "F.SilkS") - (uuid "1f8d253d-b794-4fa4-9ec2-c18edd3ddd70") + (uuid "46fa30e1-8d02-46f4-ade4-5dbe2bc93da0") (effects (font (size 1 1) @@ -974,8 +974,8 @@ ) (property "Value" "10k" (at 3.302 0 0) - (layer "F.Fab") - (uuid "77fa0e21-c9fd-4e37-8e84-314674cb8ee3") + (layer "F.SilkS") + (uuid "dce86cea-ee5a-4a05-b019-18717daf38ef") (effects (font (size 1 1) @@ -987,7 +987,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "7f3a84f2-43df-4d1f-bb5e-e617ae494fbf") + (uuid "d1d0d792-4728-4dcd-8d06-7495124a9bab") (effects (font (size 1.27 1.27) @@ -998,7 +998,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "0e638c7d-6771-4e28-a41c-9a907a119ecf") + (uuid "10a7aac9-7127-4e93-a85d-1e935093ab17") (effects (font (size 1.27 1.27) @@ -1122,7 +1122,7 @@ (property "Reference" "R3" (at -7.62 0 0) (layer "F.SilkS") - (uuid "20dd5e24-11f7-4e98-befc-d4fc906f9fc9") + (uuid "629cb261-4a41-4836-9561-e70910ae6e57") (effects (font (size 1 1) @@ -1132,8 +1132,8 @@ ) (property "Value" "10k" (at -3.302 0 0) - (layer "F.Fab") - (uuid "bf398391-4486-4e8c-a62b-e1d9a6d0b544") + (layer "F.SilkS") + (uuid "e329ec22-c13c-4488-955f-3e7b2eeeea17") (effects (font (size 1 1) @@ -1145,7 +1145,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "d8b75ecd-7335-4b79-9f1b-df28a9eb23b3") + (uuid "ea5a01e0-7617-47d4-a04e-8de8e4428b0c") (effects (font (size 1.27 1.27) @@ -1156,7 +1156,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "72e81fad-e36c-4a93-8cd5-ce2c7eccded5") + (uuid "d2ecdb19-ef31-4ee2-979a-44ccd372b351") (effects (font (size 1.27 1.27) @@ -1280,7 +1280,7 @@ (property "Reference" "C3" (at -7.62 0 0) (layer "F.SilkS") - (uuid "cf6f3ab3-138d-433a-acf6-9df21f692df4") + (uuid "36ce0bc3-2b64-4d70-ae74-9d979fc984f7") (effects (font (size 1 1) @@ -1290,8 +1290,8 @@ ) (property "Value" "0.1uF" (at -4.016286 0 0) - (layer "F.Fab") - (uuid "f7755993-953e-4238-b790-3714dbdcc32e") + (layer "F.SilkS") + (uuid "ffde1330-10fd-43c0-bd3a-734a7f2bd369") (effects (font (size 1 1) @@ -1303,7 +1303,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "6da50dff-d170-4a16-8b87-0283a1a933fd") + (uuid "440e034f-649e-4dbd-be81-61009a9d2ce7") (effects (font (size 1.27 1.27) @@ -1314,7 +1314,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "4548e91b-71ba-4a3d-8f39-4f2d7753abc9") + (uuid "89992f3b-df48-4f4a-84a4-462ac548ed48") (effects (font (size 1.27 1.27) @@ -1435,7 +1435,7 @@ (at 146.102 70.394) (descr "Generic 6mm SW tactile push button") (tags "tact sw push 6mm") - (property "Reference" "SW2" + (property "Reference" "RST" (at 3.25 -2 0) (layer "F.SilkS") (uuid "b0b06c82-9fbd-4195-b4be-4908ac968455") @@ -1786,11 +1786,11 @@ (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "F.Cu") (uuid "76a1cf37-0bb4-4c19-bbfa-c9fae8a0d60c") - (at 167.64 72.898) + (at 167.64 71.628) (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal with elongated pad for handsoldering. (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)") (tags "resistor handsolder") (property "Reference" "R1" - (at 0 -1.65 0) + (at 3.048 0 0) (layer "F.SilkS") (uuid "70fc5207-9254-4b64-800b-c43d28a7a614") (effects @@ -1801,8 +1801,8 @@ ) ) (property "Value" "10k" - (at 0 -3.048 0) - (layer "F.Fab") + (at 0.254 -1.778 0) + (layer "F.SilkS") (uuid "b58452df-bfce-46dc-9510-f90595faabca") (effects (font @@ -1950,7 +1950,7 @@ (property "Reference" "C6" (at -7.62 0 0) (layer "F.SilkS") - (uuid "08d33aa1-49c2-44b3-9302-9aae724e41d7") + (uuid "54d61453-4a39-45e8-be9f-2ed1503675c4") (effects (font (size 1 1) @@ -1960,8 +1960,8 @@ ) (property "Value" "1uF" (at -3.302 0 0) - (layer "F.Fab") - (uuid "218429e0-f9f1-4a6c-b35e-ed9721f5117c") + (layer "F.SilkS") + (uuid "6ed3e25a-1ad6-44df-a78a-ab61c732e78f") (effects (font (size 1 1) @@ -1973,7 +1973,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "49573a92-4d8f-4105-bced-3a7f99119dd3") + (uuid "63f8a51d-1959-4e6a-88c7-9e62a7bf5ec2") (effects (font (size 1.27 1.27) @@ -1984,7 +1984,7 @@ (at 0 0 0) (layer "F.Fab") (hide yes) - (uuid "85b0d588-af65-47a1-9c24-5026d58537fa") + (uuid "2323e779-d7f9-40d7-865b-fd1d9a327961") (effects (font (size 1.27 1.27) @@ -2102,7 +2102,7 @@ (footprint "PCM_Espressif:ESP32-WROOM-32E" (layer "F.Cu") (uuid "b0c84177-cf05-4e53-b49e-ba93701e7e01") - (at 183.92 70.612 -90) + (at 184.428 70.612 -90) (descr "ESP32-WROOM-32E and ESP32-WROOM-32UE: https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32e_esp32-wroom-32ue_datasheet_en.pdf") (tags "ESP32") (property "Reference" "U1" @@ -2117,7 +2117,7 @@ ) ) (property "Value" "ESP32-WROOM-E" - (at 11.176 0.532 180) + (at 6.858 1.04 180) (layer "F.Fab") (uuid "e1b6fef7-94e2-453f-9cae-e5f72387c515") (effects @@ -2842,7 +2842,7 @@ ) (polygon (pts - (xy 192.47 79.612) (xy 192.47 61.612) (xy 198.42 61.612) (xy 198.42 79.612) + (xy 192.978 79.612) (xy 192.978 61.612) (xy 198.928 61.612) (xy 198.928 79.612) ) ) ) @@ -2860,14 +2860,14 @@ ) ) ) - (footprint "Connector_PinSocket_2.54mm:PinSocket_1x02_P2.54mm_Vertical" + (footprint "Connector_JST:JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical" (layer "F.Cu") (uuid "eb56a15a-636a-489e-bcf9-90c6926f952a") - (at 167.894 62.738) - (descr "Through hole straight socket strip, 1x02, 2.54mm pitch, single row (from Kicad 4.0.7), script generated") - (tags "Through hole socket strip THT 1x02 2.54mm single row") - (property "Reference" "J3" - (at 0 -2.77 0) + (at 167.64 65.532 90) + (descr "JST EH series connector, B2B-EH-A (http://www.jst-mfg.com/product/pdf/eng/eEH.pdf)") + (tags "connector JST EH vertical") + (property "Reference" "PWR" + (at 1.25 -2.8 90) (layer "F.SilkS") (uuid "494f7de5-d102-4fa7-83e1-0309546f9da4") (effects @@ -2878,19 +2878,18 @@ ) ) (property "Value" "Power_In" - (at 14.986 8.406 180) - (layer "B.Fab") + (at 1.25 3.4 90) + (layer "F.Fab") (uuid "02681a69-4c62-4f4a-b315-9feb5d56b860") (effects (font (size 1 1) (thickness 0.15) ) - (justify mirror) ) ) (property "Datasheet" "" - (at 0 0 0) + (at 0 0 90) (layer "F.Fab") (hide yes) (uuid "7bd0e456-f414-4daa-95d4-f914ca5ce4bf") @@ -2900,8 +2899,8 @@ ) ) ) - (property "Description" "Generic connector, single row, 01x02, script generated" - (at 0 0 0) + (property "Description" "" + (at 0 0 90) (layer "F.Fab") (hide yes) (uuid "ac45d3c8-b491-419b-998e-3d7d7f06daa8") @@ -2911,8 +2910,8 @@ ) ) ) - (property "KiLib_Generator" "connector/pin_header_socket" - (at 0 0 0) + (property "KiLib_Generator" "connector/JST" + (at 0 0 90) (layer "F.SilkS") (hide yes) (uuid "4e5caec6-915f-4430-9c9b-3a236077133c") @@ -2927,47 +2926,31 @@ (path "/4a5a57ec-a0cb-4ffd-8450-23096f39ced2") (sheetname "/") (sheetfile "waveshare-panel.kicad_sch") - (units - (unit - (name "A") - (pins "1" "2") - ) - ) (attr through_hole) (duplicate_pad_numbers_are_jumpers no) (fp_line - (start -1.33 1.27) - (end -1.33 3.87) + (start 4.61 -1.21) + (end 4.61 0) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "d664753c-112c-4034-854e-18463838ac5f") + (uuid "ad46aab3-13cd-4a92-988b-77c4da981663") ) (fp_line - (start -1.33 1.27) - (end 1.33 1.27) + (start -2.11 -1.21) + (end 4.61 -1.21) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "b8b54c5a-03a9-4df2-b822-bc65bd7a4949") + (uuid "f078aeb7-cefe-4434-b0df-e57243e01a91") ) (fp_line - (start -1.33 3.87) - (end 1.33 3.87) - (stroke - (width 0.12) - (type solid) - ) - (layer "F.SilkS") - (uuid "ef434f0d-0391-4bc1-8aaf-26693e73a6ba") - ) - (fp_line - (start 0 -1.33) - (end 1.33 -1.33) + (start 4.61 0) + (end 5.11 0) (stroke (width 0.12) (type solid) @@ -2976,18 +2959,28 @@ (uuid "f453c1a9-3518-4395-8cf2-bd27723deada") ) (fp_line - (start 1.33 -1.33) - (end 1.33 0) + (start -2.11 0) + (end -2.11 -1.21) (stroke (width 0.12) (type solid) ) (layer "F.SilkS") - (uuid "8a3eb15c-656d-48ed-9f62-c3826e807350") + (uuid "1f34c903-472c-4a4f-a66b-07c54d52ec40") ) (fp_line - (start 1.33 1.27) - (end 1.33 3.87) + (start -2.61 0) + (end -2.11 0) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "ef434f0d-0391-4bc1-8aaf-26693e73a6ba") + ) + (fp_line + (start -2.91 0.11) + (end -2.91 2.61) (stroke (width 0.12) (type solid) @@ -2996,58 +2989,80 @@ (uuid "f859ca36-8f77-4754-8e84-1530451b133f") ) (fp_line - (start -1.77 -1.77) - (end 1.77 -1.77) + (start 5.11 0.81) + (end 4.11 0.81) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "ad46aab3-13cd-4a92-988b-77c4da981663") + (layer "F.SilkS") + (uuid "b8b54c5a-03a9-4df2-b822-bc65bd7a4949") ) (fp_line - (start -1.77 4.31) - (end -1.77 -1.77) + (start 4.11 0.81) + (end 4.11 2.31) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "c3e49e4c-3b66-4d59-8850-6f8d2389de58") + (layer "F.SilkS") + (uuid "8a3eb15c-656d-48ed-9f62-c3826e807350") ) (fp_line - (start 1.77 -1.77) - (end 1.77 4.31) + (start -1.61 0.81) + (end -1.61 2.31) (stroke - (width 0.05) + (width 0.12) (type solid) ) - (layer "F.CrtYd") - (uuid "f078aeb7-cefe-4434-b0df-e57243e01a91") - ) - (fp_line - (start 1.77 4.31) - (end -1.77 4.31) - (stroke - (width 0.05) - (type solid) - ) - (layer "F.CrtYd") + (layer "F.SilkS") (uuid "54a6f3af-f872-428d-98f5-764d2d732309") ) (fp_line - (start -1.27 -1.27) - (end 0.635 -1.27) + (start -2.61 0.81) + (end -1.61 0.81) (stroke - (width 0.1) + (width 0.12) (type solid) ) - (layer "F.Fab") - (uuid "1f34c903-472c-4a4f-a66b-07c54d52ec40") + (layer "F.SilkS") + (uuid "c3e49e4c-3b66-4d59-8850-6f8d2389de58") ) (fp_line - (start -1.27 3.81) - (end -1.27 -1.27) + (start -2.91 2.61) + (end -0.41 2.61) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "d664753c-112c-4034-854e-18463838ac5f") + ) + (fp_rect + (start -2.61 -1.71) + (end 5.11 2.31) + (stroke + (width 0.12) + (type solid) + ) + (fill no) + (layer "F.SilkS") + (uuid "2af2591f-4fcc-47b0-b5c1-3d370ee95bf2") + ) + (fp_rect + (start -3 -2.1) + (end 5.5 2.7) + (stroke + (width 0.05) + (type solid) + ) + (fill no) + (layer "F.CrtYd") + (uuid "8b8d9cc0-16a7-42d8-b09e-b697fe9e137f") + ) + (fp_line + (start -2.91 0.11) + (end -2.91 2.61) (stroke (width 0.1) (type solid) @@ -3056,28 +3071,8 @@ (uuid "47d9c2ef-91cd-4dd9-9900-76e48f5c7361") ) (fp_line - (start 0.635 -1.27) - (end 1.27 -0.635) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "01e5e300-5d1d-4193-b920-598fbd66e1bd") - ) - (fp_line - (start 1.27 -0.635) - (end 1.27 3.81) - (stroke - (width 0.1) - (type solid) - ) - (layer "F.Fab") - (uuid "27fc8c4d-cc64-450c-917e-3c55b0b5c3ff") - ) - (fp_line - (start 1.27 3.81) - (end -1.27 3.81) + (start -2.91 2.61) + (end -0.41 2.61) (stroke (width 0.1) (type solid) @@ -3085,8 +3080,19 @@ (layer "F.Fab") (uuid "cf218439-8435-4f4b-a2c7-305ff13a043b") ) + (fp_rect + (start -2.5 -1.6) + (end 5 2.2) + (stroke + (width 0.1) + (type solid) + ) + (fill no) + (layer "F.Fab") + (uuid "ac41acf9-7d5a-458d-9da3-00c2784af05f") + ) (fp_text user "${REFERENCE}" - (at 0 1.27 90) + (at 1.25 1.5 90) (layer "F.Fab") (uuid "28739f82-d63f-4798-a853-d4a1f9e860b6") (effects @@ -3096,20 +3102,21 @@ ) ) ) - (pad "1" thru_hole rect - (at 0 0) - (size 1.7 1.7) + (pad "1" thru_hole roundrect + (at 0 0 90) + (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) + (roundrect_rratio 0.147059) (net "+5V") (pinfunction "Pin_1_1") (pintype "passive") (uuid "fe3ab726-d5e5-4441-9156-e45e11eefa25") ) - (pad "2" thru_hole circle - (at 0 2.54) - (size 1.7 1.7) + (pad "2" thru_hole oval + (at 2.5 0 90) + (size 1.7 2) (drill 1) (layers "*.Cu" "*.Mask") (remove_unused_layers no) @@ -3119,7 +3126,7 @@ (uuid "e8308388-4d3f-44e7-8b62-3546f105fb79") ) (embedded_fonts no) - (model "${KICAD10_3DMODEL_DIR}/Connector_PinSocket_2.54mm.3dshapes/PinSocket_1x02_P2.54mm_Vertical.step" + (model "${KICAD10_3DMODEL_DIR}/Connector_JST.3dshapes/JST_EH_B2B-EH-A_1x02_P2.50mm_Vertical.step" (offset (xyz 0 0 0) ) @@ -3134,7 +3141,7 @@ (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu") (uuid "1175674f-3a0c-4252-9413-4327afaec84e") - (at 186.436 65.024 -90) + (at 186.944 65.024 -90) (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing)") (tags "capacitor handsolder") (property "Reference" "C5" @@ -3298,7 +3305,7 @@ (footprint "Capacitor_SMD:C_0805_2012Metric_Pad1.18x1.45mm_HandSolder" (layer "B.Cu") (uuid "64706d27-f362-4353-9717-7b80b235f898") - (at 188.468 65.024 -90) + (at 188.976 65.024 -90) (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal with elongated pad for handsoldering. (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing)") (tags "capacitor handsolder") (property "Reference" "C4" @@ -3626,7 +3633,7 @@ (footprint "Package_TO_SOT_SMD:SOT-223-3_TabPin2" (layer "B.Cu") (uuid "89f7023d-accd-49cd-a65a-94e21af3ba2c") - (at 175.006 66.04) + (at 175.514 66.04) (descr "module CMS SOT223 4 pins") (tags "CMS SOT") (property "Reference" "U2" @@ -3904,7 +3911,7 @@ (footprint "Resistor_SMD:R_0805_2012Metric_Pad1.20x1.40mm_HandSolder" (layer "B.Cu") (uuid "8e34b107-4d5b-4479-870c-f64fc6b11136") - (at 177.8 73.66) + (at 178.308 73.66) (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC-7351 nominal with elongated pad for handsoldering. (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)") (tags "resistor handsolder") (property "Reference" "R4" diff --git a/pcb/waveshare-panel/waveshare-panel.kicad_prl b/pcb/waveshare-panel/waveshare-panel.kicad_prl index 2184f2f..9e8b084 100644 --- a/pcb/waveshare-panel/waveshare-panel.kicad_prl +++ b/pcb/waveshare-panel/waveshare-panel.kicad_prl @@ -1,6 +1,6 @@ { "board": { - "active_layer": 0, + "active_layer": 39, "active_layer_preset": "", "auto_track_width": true, "hidden_netclasses": [], @@ -17,17 +17,17 @@ }, "prototype_zone_fills": false, "selection_filter": { - "dimensions": true, + "dimensions": false, "footprints": true, - "graphics": true, - "keepouts": true, + "graphics": false, + "keepouts": false, "lockedItems": false, - "otherItems": true, - "pads": true, + "otherItems": false, + "pads": false, "text": true, - "tracks": true, - "vias": true, - "zones": true + "tracks": false, + "vias": false, + "zones": false }, "visible_items": [ "vias", @@ -51,7 +51,7 @@ "conflict_shadows", "shapes" ], - "visible_layers": "ffffffff_ffffffff_ffffffff_ffffffff", + "visible_layers": "00000000_00000000_00000008_82002223", "zone_display_mode": 0 }, "git": {