diff --git a/IntelliChargingPile.kicad_pcb b/IntelliChargingPile.kicad_pcb index bc43e8c..98b9676 100644 --- a/IntelliChargingPile.kicad_pcb +++ b/IntelliChargingPile.kicad_pcb @@ -226,7 +226,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "e13dbf30-1c7e-4729-af9b-1ab9dffb0713") + (uuid "e54efb29-f48f-4c6a-882a-690258ebe9a9") ) (fp_line (start -20 -30) @@ -236,7 +236,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "9493659d-cdb0-49ec-be05-414f9ee7b3d0") + (uuid "59124992-f6fb-44be-9cce-86d41650b3e0") ) (fp_line (start -10.22 -29.778) @@ -246,7 +246,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "5444af23-2ccc-4878-84d8-05176a79b593") + (uuid "f8cf0c4c-7986-484a-9d0a-a1a940779b2f") ) (fp_line (start 7.62 -29.778) @@ -256,7 +256,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "aeeb914d-40de-4a7c-b169-d0c02b92f9f1") + (uuid "7e163d4a-82dd-423c-ace8-a4079730e713") ) (fp_line (start 7.62 -29.778) @@ -266,7 +266,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "ff463786-c0ac-4001-bb76-f5e246973e5d") + (uuid "3108eda8-0e90-4eb0-aa8d-2d85a2ab0664") ) (fp_line (start 7.62 -27.118) @@ -276,7 +276,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "edf8dbe4-98db-48ae-b53c-aa0c6c5aa5c8") + (uuid "c37995bb-5a2f-425d-994f-5a6d21740a06") ) (fp_line (start 10.22 -28.448) @@ -286,7 +286,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "ba61650e-19ff-4a7d-947d-4cc020776cff") + (uuid "74a9d96c-ee6e-4769-8b72-cc06d8950f54") ) (fp_line (start 10.22 -27.118) @@ -296,7 +296,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "d85dbfbd-da21-4c82-8a38-e3461462687b") + (uuid "499d5dff-102f-4be6-b7b0-7384e4829e1e") ) (fp_line (start 20 30) @@ -306,7 +306,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "1f823e84-3e95-47ee-b6a5-276644a6412a") + (uuid "9e7998c9-9848-46da-82e1-68901a990aeb") ) (fp_line (start 20 30) @@ -316,7 +316,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "6cc4eee9-79dc-4cce-b366-d91bef7b77bc") + (uuid "52679525-45a0-40e4-acff-204900b177f3") ) (fp_arc (start -7.071068 17.071068) @@ -327,7 +327,7 @@ (type default) ) (layer "F.SilkS") - (uuid "2c240e83-db4a-42f5-87cb-131cd7752eb5") + (uuid "7e2f6404-ece2-41bd-8d97-c8338e78856f") ) (fp_arc (start -5.656854 15.656854) @@ -338,7 +338,7 @@ (type default) ) (layer "F.SilkS") - (uuid "1e7e287a-272a-4d3b-9b7f-7d5177e9af95") + (uuid "9a8b3645-500c-4688-96a2-cc6e1bd0db3b") ) (fp_arc (start -4.242641 14.242641) @@ -349,7 +349,7 @@ (type default) ) (layer "F.SilkS") - (uuid "80e12aa3-a748-494c-a9e9-141823b337ef") + (uuid "4f6d7e0a-3e8d-4f9c-8ea1-e340043bb539") ) (fp_arc (start -2.828427 12.828427) @@ -360,7 +360,7 @@ (type default) ) (layer "F.SilkS") - (uuid "b6baf4f4-1e2a-41d0-9d21-9ca754686648") + (uuid "ed84a74a-1d2c-4675-865e-81b7d42ee676") ) (fp_arc (start -1.414214 11.414214) @@ -371,7 +371,7 @@ (type default) ) (layer "F.SilkS") - (uuid "867cd6ba-c23f-4ebf-b3d5-141c16feeb13") + (uuid "d40af540-9360-42c2-b1ea-b117a58befae") ) (fp_arc (start 1.414214 8.585786) @@ -382,7 +382,7 @@ (type default) ) (layer "F.SilkS") - (uuid "83a85587-1b26-4906-ae53-ade3542f4b8b") + (uuid "090eeeb9-5180-47ee-b9b6-11aec841fe63") ) (fp_arc (start 2.828427 7.171573) @@ -393,7 +393,7 @@ (type default) ) (layer "F.SilkS") - (uuid "28dfe8d1-48a0-4d25-8b0b-77ad93ded176") + (uuid "5aa19c51-8502-4526-b936-c09747f5b797") ) (fp_arc (start 4.242641 5.757359) @@ -404,7 +404,7 @@ (type default) ) (layer "F.SilkS") - (uuid "f366aff9-355c-42fa-8c7e-66cc930aea76") + (uuid "dc20d627-1c1b-4d96-866d-28f21621daf3") ) (fp_arc (start 5.656854 4.343146) @@ -415,7 +415,7 @@ (type default) ) (layer "F.SilkS") - (uuid "9c19c8b9-1901-4116-95eb-69d440eabb1c") + (uuid "69a721fa-ba83-46c1-be36-77fdf7166f2f") ) (fp_arc (start 7.071068 2.928932) @@ -426,7 +426,7 @@ (type default) ) (layer "F.SilkS") - (uuid "0e64fac3-dc12-4f93-88cd-2c098d5df2de") + (uuid "8862adaa-bead-4a06-b4cc-f64f8c6a54ae") ) (fp_circle (center 0 10) @@ -437,7 +437,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "b3dcfa1d-9bd4-4aa5-bc32-c3e62fb7fd06") + (uuid "5a89aac3-c89c-4a1d-8fd2-7ca99eac31d6") ) (fp_circle (center -17 -15) @@ -448,7 +448,7 @@ ) (fill no) (layer "Cmts.User") - (uuid "3842185a-b3a2-4503-940e-3b36598e1e2e") + (uuid "0a2a3ee3-ee0b-43be-9ede-acfbc1e8ec39") ) (fp_circle (center -12.5 22.5) @@ -459,7 +459,7 @@ ) (fill no) (layer "Cmts.User") - (uuid "4eb17ee3-b122-4c0a-af9a-d8ad84b4ab31") + (uuid "9809fe32-c5fe-4b4e-bd75-d7fa4d6220fd") ) (fp_circle (center 12.5 22.5) @@ -470,7 +470,7 @@ ) (fill no) (layer "Cmts.User") - (uuid "34abd561-bdc9-4742-a2cc-85b3b95014d5") + (uuid "bc3635ca-16da-4bc8-998c-0f6796d83cb4") ) (fp_circle (center 17 -15) @@ -481,7 +481,7 @@ ) (fill no) (layer "Cmts.User") - (uuid "0886f924-5307-4e79-b256-aae22ffca89b") + (uuid "55d2e6c3-2709-4372-839d-1462bb268960") ) (fp_line (start -20 -30) @@ -491,7 +491,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "d980115c-4c9d-410d-8349-2e7ee9e9068a") + (uuid "f5fe3efe-0e52-4a10-81eb-f6fde5dc3326") ) (fp_line (start -20 -30) @@ -501,7 +501,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "6ae2f985-961f-41f7-9a57-92b4cf416baf") + (uuid "80fcd648-2225-4301-9b60-58ccafa3fea4") ) (fp_line (start 20 30) @@ -511,7 +511,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "9b7894ce-f525-4027-abc3-d471e921f1dc") + (uuid "422796d1-0442-43b6-b27a-59bef761c113") ) (fp_line (start 20 30) @@ -521,7 +521,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "0474488f-ff18-42e2-93f2-37c083a931f2") + (uuid "b04ee2c4-a676-4337-a2b9-d99fb576d1ba") ) (fp_line (start -10.16 -29.718) @@ -531,7 +531,7 @@ (type solid) ) (layer "F.Fab") - (uuid "ff1d05f3-c0f2-4558-a03a-f88e2d59ba96") + (uuid "c9618971-f03f-41ce-8f06-93336c696248") ) (fp_line (start -10.16 -27.178) @@ -541,7 +541,7 @@ (type solid) ) (layer "F.Fab") - (uuid "5c984077-9830-4606-b04a-ea3925314c21") + (uuid "4793966a-a40a-4ae9-86b5-ce1292b392c5") ) (fp_line (start 9.525 -27.178) @@ -551,7 +551,7 @@ (type solid) ) (layer "F.Fab") - (uuid "b2ce4a2b-2ea2-4707-9c44-92870e5d9288") + (uuid "b74bbf01-545f-47ee-a42a-9794d0fc830e") ) (fp_line (start 10.16 -29.718) @@ -561,7 +561,7 @@ (type solid) ) (layer "F.Fab") - (uuid "350a02a3-0d26-4a8e-ba86-24597b43527a") + (uuid "6cacdc83-e6a1-4747-8a13-450e0881f6ef") ) (fp_line (start 10.16 -27.813) @@ -571,7 +571,7 @@ (type solid) ) (layer "F.Fab") - (uuid "f2e73002-8da5-4e0c-a268-f91c6c19836c") + (uuid "7dce5538-1d22-4a1f-baaa-493941fc03e9") ) (fp_text user "${REFERENCE}" (at 0 2.5 0) @@ -590,28 +590,28 @@ (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") - (uuid "a393b9b7-9697-465e-98d2-711a2077ecca") + (uuid "7b9e1155-ff97-40c0-b70e-6b8623deeb02") ) (pad "" np_thru_hole circle (at -12.5 22.5) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") - (uuid "45b090e3-ab47-4a86-8802-1696c6b2df74") + (uuid "bebb6ad4-09f0-4ddb-b956-6a3e99fb4122") ) (pad "" np_thru_hole circle (at 12.5 22.5) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") - (uuid "6cc2ca5a-842f-4d8f-9ea0-0431a1a1ceae") + (uuid "fc094c68-8cca-40ce-b7f2-9a1d979ed443") ) (pad "" np_thru_hole circle (at 17 -15 180) (size 3.2 3.2) (drill 3.2) (layers "*.Cu" "*.Mask") - (uuid "24067097-2e1c-4938-8ded-72a5ae290368") + (uuid "b42a200f-1c0d-479e-9225-b38c920b6ef8") ) (pad "1" thru_hole rect (at 8.89 -28.448 270) @@ -702,7 +702,7 @@ (uuid "66297b9e-3070-4a73-be23-d9cafd008023") ) (embedded_fonts no) - (model "${KICAD9_3RD_3DMODEL_DIR}/RFID-RC522.STEP" + (model "${USER_3DMODEL}/RFID-RC522.STEP" (offset (xyz -4.12 -0.1 -50.9) ) @@ -790,7 +790,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "606d70d1-4005-4efd-a2c1-bd8e32792741") + (uuid "ea625bb4-37e6-4e5a-a5a5-299526458079") ) (fp_line (start -26.67 -11.43) @@ -800,7 +800,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "9face383-49a8-495b-b080-18c58240f5f1") + (uuid "61932ca7-555b-489c-b85a-f2e4ac2f697a") ) (fp_line (start -26.67 -11.43) @@ -810,7 +810,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "6b643396-ddf9-45b3-bf5c-ceac46116bc0") + (uuid "3d8aa82c-e22f-4cb1-9efc-4f1ed8b367b1") ) (fp_line (start 24 -6) @@ -820,7 +820,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0404a6f4-be0e-4d75-a3e6-b6640bcc79a3") + (uuid "f1ce7e97-77a9-4c41-af85-f4d8f3d2b5fe") ) (fp_line (start 22 -6) @@ -830,7 +830,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "36f097c3-be17-4219-8f39-f1eb3b6786e3") + (uuid "0e78faa0-55a8-48f1-90e4-da5fb4e403e0") ) (fp_line (start -25.5 -4.798) @@ -840,7 +840,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "7bf1f918-4235-48c7-be60-5dc45d7f1dcc") + (uuid "df4dc103-a4db-4a87-9d03-e87bf3706767") ) (fp_line (start -25.5 -4) @@ -850,7 +850,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "e3b1f709-eba2-40a1-b7fb-a2bd4c21ef40") + (uuid "a87d93d6-53da-4fff-9fe9-6dc8a12c5f37") ) (fp_line (start 3.889087 0) @@ -860,7 +860,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "2494ea7f-aed4-4c01-9b2d-8efe314a19bf") + (uuid "ea8a39b2-5fea-439c-9ff5-27f58779b618") ) (fp_line (start 3.889087 0) @@ -870,7 +870,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "25c619c8-8d86-432e-b69e-127a802b7dca") + (uuid "f34534fa-9a16-47c5-a711-6a498c6dd7ba") ) (fp_line (start -3.889087 0) @@ -880,7 +880,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "79d7e4b6-0962-4075-8912-1e0ddafe56eb") + (uuid "bc760ae9-1a47-487e-8854-1e47b59ff21f") ) (fp_line (start -3.889087 0) @@ -890,7 +890,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "90ddb612-15a0-456a-bf60-a260092d7c8a") + (uuid "921fec21-10fc-44bc-8eeb-ae0d57dc320e") ) (fp_line (start -25.5 4.775) @@ -900,7 +900,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "63e94d3e-a1b5-41ba-b1b0-0a4bd1affa80") + (uuid "f49133d5-d013-4b34-85a2-d4d4f58c6c14") ) (fp_line (start -26.67 5.945) @@ -910,7 +910,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "ac6beea4-5588-44a7-b930-600c33d6bff9") + (uuid "0bb4cde3-f3b4-4ebc-9ee0-69171928d220") ) (fp_line (start 24 6) @@ -920,7 +920,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0573d2b1-2c18-4df6-95ed-6c1d71b3d398") + (uuid "e880d804-4c89-4b4e-9e21-983ab0289eaf") ) (fp_line (start 22 6) @@ -930,7 +930,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "6f093e2a-40e3-408f-9b6b-4b71188459ae") + (uuid "850c9ae5-0e05-498b-80db-cbe579b13d1b") ) (fp_line (start 26.67 11.43) @@ -940,7 +940,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "e3dacad8-49f1-4957-bf75-c541e695492d") + (uuid "4ed2dcf9-ebfe-4776-a98f-d22d0097bc4c") ) (fp_poly (pts @@ -952,7 +952,7 @@ ) (fill yes) (layer "Cmts.User") - (uuid "a691f272-9aae-48d5-aa87-404e4905212e") + (uuid "cd483954-ebd7-4ed0-b806-c04eb945846d") ) (fp_line (start 26.67 -11.43) @@ -962,7 +962,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "fa966111-54c3-412e-883d-1839c2b8cfa1") + (uuid "f6105766-1ab7-4290-98c9-962338e33955") ) (fp_line (start -26.67 -11.43) @@ -972,7 +972,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "3296f4ff-e023-4782-8a5f-d93dc049d8f3") + (uuid "e48df105-044f-4cd4-8932-4b61a539eb27") ) (fp_line (start -26.67 -11.43) @@ -982,7 +982,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "3e53ce8c-a881-427c-be96-190d152cb831") + (uuid "b1b3acf2-16d4-493b-857a-0447f65f010d") ) (fp_line (start 26.67 11.43) @@ -992,7 +992,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "13dbed5a-80ba-4891-89e1-65a41436e0da") + (uuid "1506333f-383a-4691-b90a-11a2dbc3bf8f") ) (pad "1" thru_hole circle (at -24.13 7.62 90) @@ -1435,7 +1435,7 @@ (uuid "f791f411-9cc4-41c1-b256-27032e1e3856") ) (embedded_fonts no) - (model "${KICAD9_3RD_3DMODEL_DIR}/STM32F103C8T6 Blue Pill.step" + (model "${USER_3DMODEL}/STM32F103C8T6 Blue Pill.step" (offset (xyz 0 0 5.28) ) @@ -1469,6 +1469,417 @@ ) ) ) + (footprint "!Rayine_Components:Transformer_220_5_1A_Module" + (layer "F.Cu") + (uuid "6b9f0566-2ddd-4c72-b622-0c68058ef1c2") + (at 122.4 75.9) + (property "Reference" "T1" + (at -12.6 -11.6 0) + (unlocked yes) + (layer "F.SilkS") + (uuid "fdb98cb4-d42b-471f-8c8b-1bfa79399198") + (effects + (font + (size 1.27 1.27) + (thickness 0.15875) + ) + ) + ) + (property "Value" "220/5 1A" + (at 0 11 0) + (unlocked yes) + (layer "F.Fab") + (uuid "8f4cd08e-7f97-40eb-9fa6-fd3f95c3bf46") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Datasheet" "" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "ba278f7e-466d-43e7-9f08-26dbacc6073e") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (property "Description" "" + (at 0 0 0) + (unlocked yes) + (layer "F.Fab") + (hide yes) + (uuid "d462d110-a5d2-4dcf-86fb-392d9ccc5c51") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (path "/53bcd724-9051-4267-878c-98c09f17d998") + (sheetname "/") + (sheetfile "IntelliChargingPile.kicad_sch") + (attr through_hole) + (fp_line + (start -14.95 6.77) + (end -13.62 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "242750da-6143-48ac-9b3c-2ca96b1ac659") + ) + (fp_line + (start -14.95 8.1) + (end -14.95 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "3d043386-5b0b-4297-8b05-95dd233597cf") + ) + (fp_line + (start -12.35 6.77) + (end -4.67 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "483626ef-de42-4df2-bf76-19f03fad50ce") + ) + (fp_line + (start -12.35 9.43) + (end -12.35 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "9b33d216-97b9-4024-a1bb-011889191772") + ) + (fp_line + (start -12.35 9.43) + (end -4.67 9.43) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "0be8a9f7-3c3f-4cf7-b997-b1953be3a36a") + ) + (fp_line + (start -4.67 9.43) + (end -4.67 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "88b99736-2712-49f1-b588-80142c8f7073") + ) + (fp_line + (start 9.73 6.77) + (end 11.06 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "c6efd7c8-2827-4723-8272-03d7790be15e") + ) + (fp_line + (start 9.73 8.1) + (end 9.73 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "21463630-f153-48d1-ab00-715dc30b95fb") + ) + (fp_line + (start 12.33 6.77) + (end 14.93 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "6cf14024-a562-4494-8d22-67ff47cdddd4") + ) + (fp_line + (start 12.33 9.43) + (end 12.33 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "37877612-3a46-4b54-912f-c7d7c6bf9b1a") + ) + (fp_line + (start 12.33 9.43) + (end 14.93 9.43) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "d1c954b3-23ca-4257-a0a1-9f82c5a477bf") + ) + (fp_line + (start 14.93 9.43) + (end 14.93 6.77) + (stroke + (width 0.12) + (type solid) + ) + (layer "F.SilkS") + (uuid "94510d8b-6855-4612-892b-b4939bb3f9df") + ) + (fp_rect + (start -15 -10.5) + (end 15 9.5) + (stroke + (width 0.254) + (type solid) + ) + (fill no) + (layer "F.SilkS") + (uuid "7409393e-9842-48af-91de-914ce195b4c6") + ) + (fp_line + (start -14.89 7.465) + (end -14.255 6.83) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "c15ba24b-e58b-4f8d-9c29-7fbfad021f47") + ) + (fp_line + (start -14.89 9.37) + (end -14.89 7.465) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "1241cc98-9fcf-4498-be80-aef445138463") + ) + (fp_line + (start -14.255 6.83) + (end -4.73 6.83) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "582ed682-842d-4b41-8a5c-bb86855cdbf9") + ) + (fp_line + (start -4.73 6.83) + (end -4.73 9.37) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "7a24dec9-e65d-4d9c-8091-6fefd8c222e7") + ) + (fp_line + (start -4.73 9.37) + (end -14.89 9.37) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "6db030f1-96ca-4e9b-bc1b-eace70afb14e") + ) + (fp_line + (start 9.79 7.465) + (end 10.425 6.83) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "d4055f6c-ff92-44ff-8634-54ff4ebfe957") + ) + (fp_line + (start 9.79 9.37) + (end 9.79 7.465) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "4c9e9ace-6f43-46a1-b523-7e55706ed011") + ) + (fp_line + (start 10.425 6.83) + (end 14.87 6.83) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "78dec3c5-b0f8-4eef-ab06-c3af6d5045cf") + ) + (fp_line + (start 14.87 6.83) + (end 14.87 9.37) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "2be92585-e700-4836-80ac-935e900db00f") + ) + (fp_line + (start 14.87 9.37) + (end 9.79 9.37) + (stroke + (width 0.1) + (type solid) + ) + (layer "F.Fab") + (uuid "e3c0ce35-8684-48f1-bf9d-ac55ee580150") + ) + (fp_text user "L" + (at -13.6 5.6 0) + (unlocked yes) + (layer "F.SilkS") + (uuid "0dffec49-115f-430e-a19e-bcb987c0e8fe") + (effects + (font + (size 1.27 1.27) + (thickness 0.15875) + ) + ) + ) + (fp_text user "V+" + (at 13.6 5 90) + (unlocked yes) + (layer "F.SilkS") + (uuid "218c494a-2610-4478-90ef-cbc5800a5a67") + (effects + (font + (size 1.27 1.27) + (thickness 0.15875) + ) + ) + ) + (fp_text user "N" + (at -6 5.6 0) + (unlocked yes) + (layer "F.SilkS") + (uuid "2b2b19f4-bf99-41e1-a022-0c3c21447738") + (effects + (font + (size 1.27 1.27) + (thickness 0.15875) + ) + ) + ) + (fp_text user "V-" + (at 11 5 90) + (unlocked yes) + (layer "F.SilkS") + (uuid "f7d49f4c-b10b-44d1-b703-33a781adaaba") + (effects + (font + (size 1.27 1.27) + (thickness 0.15875) + ) + ) + ) + (fp_text user "${REFERENCE}" + (at 0 12.5 0) + (unlocked yes) + (layer "F.Fab") + (uuid "3163c13f-333c-4470-a9a1-e4ae493fa5aa") + (effects + (font + (size 1 1) + (thickness 0.15) + ) + ) + ) + (pad "" thru_hole oval + (at -11.066667 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (uuid "2cca0c59-7edd-4d28-bfd8-8fea90b2558a") + ) + (pad "" thru_hole oval + (at -8.533333 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (uuid "c24989e2-590d-4a71-b18d-309bb75b8725") + ) + (pad "1" thru_hole rect + (at -13.6 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 33 "L") + (pinfunction "AC/L") + (pintype "power_in") + (uuid "4ee35764-158a-435e-a5b4-5330764dad0b") + ) + (pad "2" thru_hole oval + (at -6 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 36 "N") + (pinfunction "AC/N") + (pintype "power_in") + (uuid "4a0cde69-7c81-435b-88d2-9d809542ae94") + ) + (pad "3" thru_hole oval + (at 13.6 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 13 "5V") + (pinfunction "Vout+") + (pintype "power_out") + (uuid "02512b45-e9ef-407b-9112-24c336cbc317") + ) + (pad "4" thru_hole rect + (at 11.06 8.1 90) + (size 1.7 1.7) + (drill 1) + (layers "*.Cu" "*.Mask") + (remove_unused_layers no) + (net 8 "GND") + (pinfunction "Vout-") + (pintype "power_out") + (uuid "f6034f16-3b00-414f-91f8-10c9efed7ed8") + ) + (embedded_fonts no) + ) (footprint "!Rayine_Components:OLED_12864_IIC_0.96" (layer "F.Cu") (uuid "7054d070-61bd-4c91-81c6-4da3b0173672") @@ -1485,7 +1896,7 @@ ) ) ) - (property "Value" "~" + (property "Value" "0.96\" IIC OLED 12864" (at 0 21.5 0) (unlocked yes) (layer "F.Fab") @@ -1535,7 +1946,7 @@ (type default) ) (layer "F.SilkS") - (uuid "5dcc7879-7bbb-4660-b680-39f1dbfbf7ef") + (uuid "ea6c84cf-9de3-48b8-8563-578bfbcf7583") ) (fp_line (start -13.5 14) @@ -1545,7 +1956,7 @@ (type default) ) (layer "F.SilkS") - (uuid "2fe9123a-b06b-49ac-8515-8715f8a49ea8") + (uuid "c36253f4-f284-4cdc-8204-25dc437178e8") ) (fp_line (start -13.5 14) @@ -1555,7 +1966,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f8ba7707-1d3f-4780-bfa7-46207f60e543") + (uuid "a6abc1ac-6519-49c4-8732-b094be7bde69") ) (fp_line (start -7 12) @@ -1565,7 +1976,7 @@ (type default) ) (layer "F.SilkS") - (uuid "98be4f31-c26a-4245-bde3-effbdd11d93c") + (uuid "81c04a26-eb41-46a9-81f5-2971b8e652ef") ) (fp_line (start -7 12) @@ -1575,7 +1986,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "dfbbace7-9782-4904-b49f-f0976279fb97") + (uuid "c4d63c2c-0632-477c-9d95-db3f7e123bbc") ) (fp_line (start 7 12) @@ -1585,7 +1996,7 @@ (type default) ) (layer "F.SilkS") - (uuid "75ea1d15-e90b-4bea-becd-021000c327a6") + (uuid "cf27b5ba-b5b8-4bb4-843c-0f249edd4866") ) (fp_line (start 13.5 -14) @@ -1595,7 +2006,7 @@ (type default) ) (layer "F.SilkS") - (uuid "ce4ca0a9-1fca-4d3a-bb69-4bbf5de15b96") + (uuid "04bb956f-f9f7-4720-a7f0-a6747bd6740b") ) (fp_line (start 13.5 14) @@ -1605,7 +2016,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0e0fe95d-6b09-43a5-ac85-a337ba71cffb") + (uuid "b3090bca-ab2c-45a8-b959-aa5109c2e1f5") ) (fp_rect (start -13 -9.8) @@ -1616,7 +2027,7 @@ ) (fill no) (layer "F.SilkS") - (uuid "f44c5367-02a4-4c8c-b696-883dacf063df") + (uuid "c88d6222-6b42-48d5-9848-5e4cd61809b4") ) (fp_line (start -5.15 -13.6) @@ -1626,7 +2037,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "8f78e51b-9f59-4bed-bee2-056f4a696032") + (uuid "3d179437-96a8-4ded-9e22-b058f48a8264") ) (fp_line (start -5.15 -10.94) @@ -1636,7 +2047,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "3106738d-56fb-4526-acd9-a2482de6fd13") + (uuid "6aadc684-93a7-4828-9fda-05fb5787bdab") ) (fp_line (start -5.15 -10.94) @@ -1646,7 +2057,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "90657ad6-cc02-4fa4-a455-2708b04c6f8d") + (uuid "281ab871-adba-45f7-bd9d-5a757d3df821") ) (fp_line (start -2.54 -13.6) @@ -1656,7 +2067,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "afabe8e1-d343-4a34-bbe6-179efca81acd") + (uuid "495442e1-7526-4f17-b8cb-d9b1fd538cf9") ) (fp_line (start -2.54 -10.94) @@ -1666,7 +2077,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "4e95f519-76dc-4878-9489-e9f05a75bf78") + (uuid "16351a3d-b96c-4b64-bdd0-4489a7a7c0fc") ) (fp_line (start -2.54 -10.94) @@ -1676,7 +2087,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "d001f1f6-a2e0-42f6-a93a-9e35777b1c37") + (uuid "8eeb0cd5-c529-4337-90be-d4b0bfc8f01b") ) (fp_line (start 5.14 -10.94) @@ -1686,7 +2097,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "57b8978d-b579-467e-a475-933e180687b4") + (uuid "904f1be1-d6fb-488f-8e71-81395255ebfe") ) (fp_poly (pts @@ -1698,7 +2109,7 @@ ) (fill no) (layer "F.CrtYd") - (uuid "c98c87bc-0570-4976-ad00-037eefb22295") + (uuid "965f59da-1cc3-4328-b16e-6f7068f94585") ) (fp_line (start -5.08 -12.905) @@ -1708,7 +2119,7 @@ (type solid) ) (layer "F.Fab") - (uuid "8a101fc6-cea0-440c-b674-4ad9685ab78a") + (uuid "628c79d0-697a-46b8-8cec-5429a7beb49d") ) (fp_line (start -5.08 -11) @@ -1718,7 +2129,7 @@ (type solid) ) (layer "F.Fab") - (uuid "64ce088b-fd0c-47c8-a699-5731d4686f94") + (uuid "a3c8bd17-16d3-4e09-92cc-84d46f6b82a0") ) (fp_line (start -4.445 -13.54) @@ -1728,7 +2139,7 @@ (type solid) ) (layer "F.Fab") - (uuid "6cab0b10-b304-4f44-bbe7-158adfa69f8d") + (uuid "868bd6c6-bc96-4b74-85d5-ab05dfc2474d") ) (fp_line (start 5.08 -13.54) @@ -1738,7 +2149,7 @@ (type solid) ) (layer "F.Fab") - (uuid "2aa216c3-171c-460c-b23a-170a1219aeca") + (uuid "f10ea840-4975-4f21-bcd3-6dadd02c04f9") ) (fp_line (start 5.08 -11) @@ -1748,7 +2159,7 @@ (type solid) ) (layer "F.Fab") - (uuid "9b7b42a1-2ad9-450b-a9a9-b1bb44316697") + (uuid "07ecdfb2-4a26-476d-a789-505238b54b1c") ) (fp_text user "GND" (at -5 -10 0) @@ -1871,7 +2282,7 @@ (uuid "24869423-ba45-4aa9-ab6d-ed6f2f040a1c") ) (embedded_fonts no) - (model "${KICAD9_3RD_3DMODEL_DIR}/OLED_IIC_12864_0.96.step" + (model "${USER_3DMODEL}/OLED_IIC_12864_0.96.step" (offset (xyz 34.3 5 12.1) ) @@ -1901,7 +2312,7 @@ (descr "Generic Phoenix Contact connector footprint for: MC_1,5/2-G-5.08; number of pins: 02; pin pitch: 5.08mm; Angled || order number: 1836189 8A 320V") (tags "phoenix_contact connector MC_01x02_G_5.08mm") (property "Reference" "J2" - (at -4.015 7.9325 0) + (at 2.54 -3 180) (layer "F.SilkS") (uuid "3785cd35-5404-4a2e-a6c6-c688346eebdd") (effects @@ -1912,8 +2323,8 @@ ) ) (property "Value" "AC OUT" - (at 2.54 9.2 0) - (layer "F.SilkS") + (at 2.54 9.2 180) + (layer "F.Fab") (uuid "2488f6f5-94d2-4977-b21c-7293ad88165c") (effects (font @@ -1961,7 +2372,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "4c837f5b-b041-49fc-8f9f-f8a1e664c759") + (uuid "0a602894-4e2e-493c-a698-d2396a58d5a1") ) (fp_line (start 7.73 -1.31) @@ -1971,7 +2382,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "2afb9d7e-8fff-45d2-b442-fe2bced44df7") + (uuid "d2f69a3d-c840-4d5e-ba17-0cca393839e6") ) (fp_line (start 1.05 -1.31) @@ -1981,7 +2392,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "bdee7a61-4970-4178-8530-1aa20a482c88") + (uuid "7981b6a2-6b80-493a-89be-717d20c1ab6b") ) (fp_line (start 0.3 -2.6) @@ -1991,7 +2402,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f126d062-d053-4fa1-a5d5-6aec6f9bac0d") + (uuid "649523db-8023-4ec0-a8cc-513efd50dd1b") ) (fp_line (start 0 -2) @@ -2001,7 +2412,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "c44d85bf-feb2-482a-b796-36f0b2c57a84") + (uuid "935f5476-5f5f-4e63-818b-9d9739a40727") ) (fp_line (start -0.3 -2.6) @@ -2011,7 +2422,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "b5a9adf8-8ecf-4139-bbb7-f96c5943af93") + (uuid "bfb79635-c354-4bdc-ac92-cd540f053816") ) (fp_line (start -2.65 8.11) @@ -2021,7 +2432,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "07982473-f543-42ce-beb4-88300372d19e") + (uuid "db3266cb-5d48-40dd-8666-b9aeb68086ac") ) (fp_line (start -2.65 4.8) @@ -2031,7 +2442,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "5c797e0e-9a04-4d48-93e8-89b1cd9ccde8") + (uuid "3eaf75f8-0d62-41cd-b985-975dfd1562f8") ) (fp_line (start -2.65 -1.31) @@ -2041,7 +2452,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "8033a9a0-22cb-4b3d-8b3e-31bd742de04e") + (uuid "0d0ba753-cdd2-4e1e-a0e3-9f48095aa5cd") ) (fp_line (start -2.65 -1.31) @@ -2051,7 +2462,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "37cec877-ab38-4e7c-b521-6670e830f27b") + (uuid "1b380fd6-8d18-4a80-9430-e306e8739d0e") ) (fp_line (start 8.12 8.5) @@ -2061,7 +2472,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "36c72c64-8b1f-45bc-8c04-f186aba8c1b6") + (uuid "0f862c1c-a07b-4172-bbf6-d4a160260f22") ) (fp_line (start 8.12 -2.3) @@ -2071,7 +2482,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "f0e9deeb-9ab5-4fa8-ad2d-f7b58561ee3b") + (uuid "7dcac1b5-1289-4622-aac1-0b7d9a1c4df4") ) (fp_line (start -3.15 8.5) @@ -2081,7 +2492,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "d4902ba1-1b8c-48a1-979e-1c3d1ba3e4ee") + (uuid "bca3c3ed-eda7-4e1f-bde3-8006fb3cdb18") ) (fp_line (start -3.15 -2.3) @@ -2091,7 +2502,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "964f2dd9-b756-47b0-b60e-4ec24479e75d") + (uuid "af9e6e06-2a07-479d-bae9-26b779d92a05") ) (fp_line (start 7.62 8) @@ -2101,7 +2512,7 @@ (type solid) ) (layer "F.Fab") - (uuid "2a49b0f0-bbd6-4eb4-b641-1ac637c64944") + (uuid "2509ff89-82e6-4051-a3c2-05294ccc66f7") ) (fp_line (start 7.62 -1.2) @@ -2111,7 +2522,7 @@ (type solid) ) (layer "F.Fab") - (uuid "44fc41fa-ced8-41be-bf38-eccf5b4adb49") + (uuid "8502afda-7f2e-4364-b77d-985a25f105f2") ) (fp_line (start 0.8 -1.2) @@ -2121,7 +2532,7 @@ (type solid) ) (layer "F.Fab") - (uuid "e02f3679-370e-4a50-a417-88b7f795ae74") + (uuid "38ebccd9-2e2f-4fa2-9b74-09360801a700") ) (fp_line (start 0 0) @@ -2131,7 +2542,7 @@ (type solid) ) (layer "F.Fab") - (uuid "88d8115c-0ba8-44b5-8df5-a24ec0a70065") + (uuid "5e21ad90-e600-42dc-b2de-4c59be8d0908") ) (fp_line (start -2.54 8) @@ -2141,7 +2552,7 @@ (type solid) ) (layer "F.Fab") - (uuid "60aff4b2-8d64-4a5c-a64d-60ab98c50518") + (uuid "fcd73795-57f8-443b-8239-f874eeb016c1") ) (fp_line (start -2.54 -1.2) @@ -2151,10 +2562,10 @@ (type solid) ) (layer "F.Fab") - (uuid "e5425808-d4bb-405f-bd2e-afbf53f480ff") + (uuid "f6c45ce1-ece8-441e-9875-b7797189cd76") ) (fp_text user "${REFERENCE}" - (at 2.54 -0.5 0) + (at 2.54 -0.5 180) (layer "F.Fab") (uuid "3a5c566b-510a-4dae-b989-b867f8f2a283") (effects @@ -2207,7 +2618,7 @@ (descr "Generic Phoenix Contact connector footprint for: MC_1,5/2-G-5.08; number of pins: 02; pin pitch: 5.08mm; Angled || order number: 1836189 8A 320V") (tags "phoenix_contact connector MC_01x02_G_5.08mm") (property "Reference" "J1" - (at 8.985 7.9325 0) + (at 2.54 -3 180) (layer "F.SilkS") (uuid "a935f3be-b657-4017-884a-f52d087221d6") (effects @@ -2218,8 +2629,8 @@ ) ) (property "Value" "AC IN" - (at 2.54 9.2 0) - (layer "F.SilkS") + (at 2.54 9.2 180) + (layer "F.Fab") (uuid "73744c79-9b01-4670-879f-d19f466413b8") (effects (font @@ -2267,7 +2678,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "2f6908c8-da99-4ea7-bbbc-117f08f2ca54") + (uuid "8be2398a-4909-4c8e-973d-d91871c41226") ) (fp_line (start 7.73 -1.31) @@ -2277,7 +2688,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "4a2e0672-d304-407f-be3e-d729461a937a") + (uuid "a41d14e0-277f-4b0f-a7d0-ba2e66ac63d5") ) (fp_line (start 1.05 -1.31) @@ -2287,7 +2698,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "c0df531a-c9e1-415d-826c-eaf7f58318bb") + (uuid "a2cda019-9ab0-4a26-985d-bb979e20c910") ) (fp_line (start 0.3 -2.6) @@ -2297,7 +2708,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "2c140512-0127-4245-8d6c-32346703a652") + (uuid "931f0ed4-687d-45be-93c8-c66b11db0d8a") ) (fp_line (start 0 -2) @@ -2307,7 +2718,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "3a9590f2-8cf6-46b5-84f6-06953e910812") + (uuid "4693e7d4-4c43-429e-b506-ae89ace8cfcd") ) (fp_line (start -0.3 -2.6) @@ -2317,7 +2728,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "709c1acc-5f22-4b89-817b-eb8ed2b1697d") + (uuid "e06aab80-0d4d-470a-8855-ab5521020e32") ) (fp_line (start -2.65 8.11) @@ -2327,7 +2738,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "65e7c7c2-fbdb-4257-8046-f6d8144b58c7") + (uuid "66e95267-e4de-4a07-a780-d62c71e3715d") ) (fp_line (start -2.65 4.8) @@ -2337,7 +2748,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "7979f507-bca1-47ea-8ca2-abfef8fc50ab") + (uuid "cfd372d8-e77c-44c1-9856-db774fd78d80") ) (fp_line (start -2.65 -1.31) @@ -2347,7 +2758,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "29967be5-b0df-407f-b678-6197a9ffaac9") + (uuid "07a561a7-7a59-488b-9f3c-c94e9e3c52de") ) (fp_line (start -2.65 -1.31) @@ -2357,7 +2768,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "25730ea6-7b96-48c8-a03f-28097d340f77") + (uuid "c131a959-2b8c-4272-9cc4-341fcfef1880") ) (fp_line (start 8.12 8.5) @@ -2367,7 +2778,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "c7e2ea05-453c-4209-b079-ddf2f70c70a4") + (uuid "b7880b25-b901-420e-ad77-9cce01ec4ac8") ) (fp_line (start 8.12 -2.3) @@ -2377,7 +2788,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "f155a444-90c6-49d1-864e-a01c76e1f2ba") + (uuid "cd693d63-210d-496d-805e-b0547aada9af") ) (fp_line (start -3.15 8.5) @@ -2387,7 +2798,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "33ae0226-58b8-4976-bac2-be6602fa6ec3") + (uuid "bc94a5d1-3be4-4c6e-8b99-5f917fdb6e16") ) (fp_line (start -3.15 -2.3) @@ -2397,7 +2808,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "121255e5-92a5-4f12-8dc5-9213b7abdefe") + (uuid "f32639b2-ab66-4f08-94ee-613e0da13ee0") ) (fp_line (start 7.62 8) @@ -2407,7 +2818,7 @@ (type solid) ) (layer "F.Fab") - (uuid "a916cea7-653f-42ca-b106-035862704b85") + (uuid "6e1f6d33-5a05-4709-8b78-131be3c8aa72") ) (fp_line (start 7.62 -1.2) @@ -2417,7 +2828,7 @@ (type solid) ) (layer "F.Fab") - (uuid "70fff3a8-e376-4142-bad0-23672a617602") + (uuid "38b7c387-0b9d-43fa-88de-2d16c355f73b") ) (fp_line (start 0.8 -1.2) @@ -2427,7 +2838,7 @@ (type solid) ) (layer "F.Fab") - (uuid "11749f8f-68d6-405e-8e93-9855c2ccb476") + (uuid "5d836604-9316-4660-ab5c-8664c00f3d34") ) (fp_line (start 0 0) @@ -2437,7 +2848,7 @@ (type solid) ) (layer "F.Fab") - (uuid "3a32ca7b-9e93-4b38-bcb2-2f01b9de96b3") + (uuid "3f31cb47-5c68-49bf-99dd-6b5ff754a5a0") ) (fp_line (start -2.54 8) @@ -2447,7 +2858,7 @@ (type solid) ) (layer "F.Fab") - (uuid "6de7dead-e093-4629-a138-e2d0ae0c9304") + (uuid "e59e00e2-7e76-4bfc-aeda-9ff1dddd45d4") ) (fp_line (start -2.54 -1.2) @@ -2457,10 +2868,10 @@ (type solid) ) (layer "F.Fab") - (uuid "40ae9980-ae8f-4b20-b3da-e1cf16c8c72d") + (uuid "9cbd69a4-cf3f-4f2d-b672-737882d24ff3") ) (fp_text user "${REFERENCE}" - (at 2.54 -0.5 0) + (at 2.54 -0.5 180) (layer "F.Fab") (uuid "ed3156ce-9009-4113-8ed7-f923125e8b2e") (effects @@ -2511,7 +2922,7 @@ (uuid "efac08d6-fc9b-4734-bdb4-05f73b2e42cd") (at 69 24.9588 -90) (property "Reference" "U2" - (at 2 -26.4 90) + (at 2 -26.4 270) (layer "F.SilkS") (uuid "ad5711ae-8a78-45ee-b8d3-4acbba8dd1e7") (effects @@ -2521,8 +2932,8 @@ ) ) ) - (property "Value" "~" - (at 21.50945 0.95 90) + (property "Value" "IM1281B" + (at 21.50945 0.95 270) (layer "F.Fab") (uuid "6e02d089-6bee-4255-97e9-61072c606fc9") (effects @@ -2533,7 +2944,7 @@ ) ) (property "Datasheet" "kicad-embed://IM1281B电能计量模块技术手册V1.8.pdf" - (at 0 0 90) + (at 0 0 270) (layer "F.Fab") (hide yes) (uuid "1ed04b2f-d19d-44ed-b19d-7978a33b7350") @@ -2545,7 +2956,7 @@ ) ) (property "Description" "" - (at 0 0 90) + (at 0 0 270) (layer "F.Fab") (hide yes) (uuid "c8e71a2f-2db6-4b19-8ac3-2812c883b127") @@ -2568,7 +2979,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "408adc9e-574b-4e58-b7e5-903aa752bafa") + (uuid "77f2a9f2-e87f-4c89-bb90-ee757d432e35") ) (fp_line (start 0.0254 -0.0508) @@ -2578,7 +2989,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f075212c-4342-4370-8106-57efd2b271e9") + (uuid "cbd96f41-5213-48e8-be4d-6be2eb9f7add") ) (fp_line (start 43.2054 -0.0508) @@ -2588,7 +2999,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "9f5718de-90fe-4454-b6da-1b409cf4b287") + (uuid "57973dbd-660a-4bc6-b72a-5431bb2a914a") ) (fp_line (start 30.8578 -1.3462) @@ -2598,7 +3009,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "90959a19-b64d-4c4e-b879-82e36b6b26b8") + (uuid "00b8ff2a-7c72-4e9c-b9a1-9d03f28e6469") ) (fp_line (start 41.3734 -1.3462) @@ -2608,7 +3019,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "5464db15-26ac-4ae0-ae4c-d9a225a397bc") + (uuid "cb2feea6-b92d-4ca0-810a-2646805c25a1") ) (fp_line (start 30.8578 -1.3716) @@ -2618,7 +3029,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "e2bdf13a-775f-4e1f-9d4c-72eb534f6b50") + (uuid "804489ac-f695-4930-aaf9-0d09cc2cb2a3") ) (fp_line (start 32.5088 -2.7544) @@ -2628,7 +3039,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0d7317dc-ec6f-4489-98c4-6ede43d0e805") + (uuid "012a75a4-f973-4a94-953a-f7f287af09ef") ) (fp_line (start 39.751 -2.7544) @@ -2638,7 +3049,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "6348e8c5-8313-4de9-9b52-0849ebc06b28") + (uuid "6abb4eee-ae29-4a23-99d3-6ee8acb26cd3") ) (fp_line (start 0.0508 -10.7188) @@ -2648,7 +3059,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "605899d7-2f82-40cc-8ae4-dc66854890d6") + (uuid "7ba653ad-437b-4cc6-b2f5-2b0c563e0aae") ) (fp_line (start 0.0508 -10.7188) @@ -2658,7 +3069,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "d049e5f3-ba26-4817-83e3-2f56515092ee") + (uuid "36bb5d23-738f-4b26-a130-fd6214107a97") ) (fp_line (start 12.2428 -10.7188) @@ -2668,7 +3079,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0e163096-7740-4458-ad8b-1b3bb06cd249") + (uuid "40d433b5-5e87-47bb-9e3c-cee207fbb07a") ) (fp_line (start 24.257 -10.7188) @@ -2678,7 +3089,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "dff4c218-f2d0-4097-a606-61bfef938316") + (uuid "002def51-e949-4748-8ad4-ea6b147a4040") ) (fp_line (start 6.4135 -10.795) @@ -2688,7 +3099,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "a1d992af-7729-46f4-937f-202bcf274bbe") + (uuid "b40617e7-b30d-4d32-a006-28cb84976318") ) (fp_line (start 24.257 -14.3891) @@ -2698,7 +3109,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "1e23772b-0f5d-4c9a-8dcf-f98b0bcc4c80") + (uuid "18e9a773-6549-41a9-9078-618ac45d02a1") ) (fp_line (start 24.257 -20.0025) @@ -2708,7 +3119,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "ad8bc41a-20c9-4b7e-b5b6-cab6a728b15e") + (uuid "299f503e-c51c-49ab-9d0a-6d1e4d9a2587") ) (fp_line (start 30.934 -21.209) @@ -2718,7 +3129,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "fe1a5aee-6ba3-43f1-aefb-355dea5a5e19") + (uuid "71f4d1c3-ec8d-4adf-ad4e-0ea0a9fbdbb0") ) (fp_line (start 24.7904 -22.86) @@ -2728,7 +3139,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "1ce50aef-049f-4be5-9758-a38e45bcc76f") + (uuid "26b2e7d5-ea42-4990-99ac-6106ec64efeb") ) (fp_line (start 24.7904 -22.86) @@ -2738,7 +3149,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "bb311341-b09f-4a15-ace3-d7dd13cfc5ce") + (uuid "360ab5d4-2355-46e4-a14d-288ae43f5c8b") ) (fp_line (start 30.5562 -22.86) @@ -2748,7 +3159,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "4ddc32b0-9c75-4431-9427-c3eb195d7549") + (uuid "d47bf3ae-4181-4b21-8471-7bdbf4407677") ) (fp_line (start 35.2552 -22.86) @@ -2758,7 +3169,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f15acfd6-94ea-4f44-ab1b-d47868f14762") + (uuid "3de030ed-1535-4f4b-a20e-4c55c5c03525") ) (fp_line (start 35.2552 -22.86) @@ -2768,7 +3179,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f0e65ae9-b8a7-4c1d-9d66-b7a3a6133158") + (uuid "0b92888a-7a4d-4e1c-ba8e-4c988951b952") ) (fp_line (start 41.021 -22.86) @@ -2778,7 +3189,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "8312ed7a-d3c0-4f71-8993-71976459240f") + (uuid "ccf97c6c-5ce2-4304-8218-ed2f845c29c2") ) (fp_line (start 0.0508 -23.6728) @@ -2788,7 +3199,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "632f0eb1-1cc4-4897-8374-85346811335b") + (uuid "6ba82396-89b6-4f56-8f6c-b50c84f28e0b") ) (fp_line (start 24.8158 -25.0952) @@ -2798,7 +3209,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "6283f279-30f2-4cb7-be28-68bab34076e8") + (uuid "99ca7b85-0861-41ee-9468-a6ab1a0342dd") ) (fp_line (start 35.2806 -25.0952) @@ -2808,7 +3219,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "c1544162-b469-4257-9d53-23cdabc822db") + (uuid "9f720d56-8198-4c21-80dd-b6b114268cdb") ) (fp_line (start 0.0254 -25.4762) @@ -2818,7 +3229,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "f723dd88-00b4-4b47-978e-56c9dd4a788c") + (uuid "649544f4-6c78-4955-a00c-d19d53d8e2b1") ) (fp_arc (start 36.2842 -3.5814) @@ -2829,7 +3240,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "08da5ebd-90d2-410e-b1fe-0c6609bfc805") + (uuid "b4ca1b5f-83bb-442e-8d73-31083c50935f") ) (fp_arc (start 33.4902 -3.6576) @@ -2840,7 +3251,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "92411cb0-88cd-4366-aa78-e32a5530ae3a") + (uuid "fb19705a-eb11-4b9b-8b7d-4d88d52956da") ) (fp_arc (start 36.0394 -18.923) @@ -2851,7 +3262,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "0d56a380-a8d1-4038-80c0-08a170851fbd") + (uuid "418b6f9e-ebe1-495c-b838-a1a7a8a94f44") ) (fp_arc (start 38.6302 -18.9992) @@ -2862,7 +3273,7 @@ (type solid) ) (layer "F.SilkS") - (uuid "29b3a0f7-7723-4c60-9fdd-663f68aa4f91") + (uuid "edd55d0d-d7d5-48b4-8103-f261d734dcc6") ) (fp_circle (center 2.7428 -12.1968) @@ -2873,7 +3284,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "bd517137-9784-4742-9d9e-ada8462a4291") + (uuid "d0410ee6-45d1-46ce-93ed-6900345f282e") ) (fp_circle (center 21.7428 -12.2476) @@ -2884,7 +3295,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "a9fd2857-de03-495c-8c8d-3975843f78c6") + (uuid "5dfa85af-c85d-4c22-8d97-f28dad54a776") ) (fp_circle (center 32.5088 -19.558) @@ -2895,7 +3306,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "09ab6723-f7ec-4399-8cb5-1fc33dea8986") + (uuid "d2f735d7-e228-4be1-871d-f2ee8ce9d71d") ) (fp_circle (center 39.751 -19.558) @@ -2906,7 +3317,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "99061b2c-de54-48c4-a9cd-cee47700ee35") + (uuid "f48a024e-ab58-4306-8782-f4194cf921a9") ) (fp_circle (center 4.6228 -22.6568) @@ -2917,7 +3328,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "8aeaaa78-a974-42f9-a2a7-56d70b746927") + (uuid "652ab31b-f094-4711-8e49-e455b8de2263") ) (fp_circle (center 19.8628 -22.6568) @@ -2928,7 +3339,7 @@ ) (fill yes) (layer "F.SilkS") - (uuid "a66ecddb-8c7b-4fe8-9082-f5b757167424") + (uuid "23d265dc-41a0-4b0c-8e4b-be17ebe999ec") ) (fp_line (start 15.5702 -0.6858) @@ -2938,7 +3349,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "3b466d2a-cc84-4fc0-acd6-9c86505b53fd") + (uuid "1617ab78-e829-47ee-95d4-3652d0f15982") ) (fp_line (start 15.5702 -0.6858) @@ -2948,7 +3359,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "d8a52196-8ea3-4972-9562-f9e84a00f20d") + (uuid "94f31eac-38f2-4f6c-b6fa-d788a565c4e1") ) (fp_line (start 18.1102 -0.6858) @@ -2958,7 +3369,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "f2817809-2e3c-472c-bfde-af7d0b170499") + (uuid "c5c563f5-70c6-486e-8390-c1cfb623b4bb") ) (fp_line (start 28.2702 -0.6858) @@ -2968,7 +3379,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "687b1181-2344-458c-add9-4ed6ea393dd5") + (uuid "504d723a-47b5-474b-9c73-f8fccb654fd8") ) (fp_line (start 15.5702 -3.2258) @@ -2978,7 +3389,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "8e15f1bd-1c87-4540-9dab-b335edfff473") + (uuid "801a16e7-1af7-4e25-b74d-bf8a3ac52a4c") ) (fp_line (start 27.8892 -22.6568) @@ -2988,7 +3399,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "e62fb862-80e5-4718-8538-fe6efd960fc3") + (uuid "6ce6c34b-f2aa-42ea-9109-2cc26882771b") ) (fp_line (start 27.8892 -22.6568) @@ -2998,7 +3409,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "166b6bc7-3461-4d0b-9b27-bd839753ccc3") + (uuid "09d1b434-aa6d-492e-880d-54c04429b23a") ) (fp_line (start 30.4292 -22.6568) @@ -3008,7 +3419,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "875f9342-117b-49ea-bcd9-c193c8987e9f") + (uuid "23bc4c1c-3edf-4548-a40a-ecf94d58645f") ) (fp_line (start 38.0492 -22.6568) @@ -3018,7 +3429,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "e3318f03-1689-45a7-a4a9-9cdd28b8c169") + (uuid "b01b37fa-0cff-44ab-a290-f653497a537c") ) (fp_line (start 27.8892 -25.1968) @@ -3028,7 +3439,7 @@ (type solid) ) (layer "B.SilkS") - (uuid "f1e15afa-e919-429b-a22e-73ce07d6915c") + (uuid "b438cb23-8be9-4f52-8c33-1977a0bc2234") ) (fp_line (start 0.0254 2.54) @@ -3038,7 +3449,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "80309118-173a-4cdc-8b1f-b108cbe46f5a") + (uuid "274c026e-d2e9-4dfd-a044-accbb4670d59") ) (fp_line (start 0.0254 2.54) @@ -3048,7 +3459,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "26f5c462-8555-44b3-b4b6-193ba005fec4") + (uuid "a90f83d6-b8ee-4685-ac82-ec27402d5beb") ) (fp_line (start 43.2054 2.54) @@ -3058,7 +3469,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "cb261ccb-e793-4c50-8d64-085105ca7521") + (uuid "bcd89717-1a1c-4c7d-99a7-4d9ad7584f49") ) (fp_line (start 0 -27.94) @@ -3068,7 +3479,7 @@ (type solid) ) (layer "F.CrtYd") - (uuid "280eed8e-1d88-493c-8a50-3c7d26e8f29c") + (uuid "64886c6c-c083-40ca-ab76-6a1a049d6506") ) (fp_text user "IM1281B" (at 0.4 -0.8 270) @@ -3129,8 +3540,8 @@ (uuid "6d3be69a-67cb-4a9d-a59e-f84e1e4e1b66") (effects (font - (size 0.8001 0.762) - (thickness 0.08001) + (size 0.762 0.762) + (thickness 0.0762) ) (justify left bottom) ) @@ -3311,7 +3722,7 @@ (checksum "37C4536ECD54D35324339BA4D1F17AB9") ) ) - (model "${KICAD9_3RD_3DMODEL_DIR}/IM1281B.step" + (model "${USER_3DMODEL}/IM1281B.step" (offset (xyz 36.8 23.5 0) ) diff --git a/IntelliChargingPile.kicad_sch b/IntelliChargingPile.kicad_sch index c7a8c07..3b5df0d 100644 --- a/IntelliChargingPile.kicad_sch +++ b/IntelliChargingPile.kicad_sch @@ -18,8 +18,8 @@ ) ) ) - (property "Value" "" - (at 0 0 0) + (property "Value" "IM1281B" + (at -1.27 -8.89 0) (effects (font (size 1.27 1.27) @@ -67,14 +67,6 @@ ) ) (symbol "IM1281B_1_1" - (text "IM1281B" - (at -1.27 -8.89 0) - (effects - (font - (size 1.27 1.27) - ) - ) - ) (pin passive line (at -7.62 3.81 0) (length 2.54) @@ -19982,11 +19974,11 @@ ) ) ) - (property "Value" "" - (at 0 0 0) + (property "Value" "0.96\" IIC OLED 12864" + (at 1.016 -3.302 0) (effects (font - (size 1.27 1.27) + (size 0.635 0.635) ) ) ) @@ -20031,14 +20023,6 @@ ) ) (symbol "OLED_0.96{dblquote}_IIC_12864_1_1" - (text "0.96 IIC OLED 12864" - (at 1.27 -3.302 0) - (effects - (font - (size 0.635 0.635) - ) - ) - ) (pin power_in line (at -3.81 6.35 270) (length 2.54) @@ -21245,7 +21229,7 @@ ) ) ) - (property "Value" "" + (property "Value" "220/5 1A" (at 0 0 0) (effects (font @@ -21253,8 +21237,8 @@ ) ) ) - (property "Footprint" "" - (at 0 0 0) + (property "Footprint" "!Rayine_Components:Transformer_220_5_1A_Module" + (at 0 -6.35 0) (effects (font (size 1.27 1.27) @@ -21391,14 +21375,6 @@ ) ) (symbol "Transformer_220/5_1_1" - (text "220/5 1A Transformer" - (at -0.762 -4.572 0) - (effects - (font - (size 0.635 0.635) - ) - ) - ) (pin power_in line (at -9.525 2.54 0) (length 2.54) @@ -21957,7 +21933,7 @@ ) (wire (pts - (xy 68.58 96.52) (xy 73.66 96.52) + (xy 64.77 96.52) (xy 69.85 96.52) ) (stroke (width 0) @@ -22037,7 +22013,7 @@ ) (wire (pts - (xy 68.58 88.9) (xy 73.66 88.9) + (xy 64.77 88.9) (xy 69.85 88.9) ) (stroke (width 0) @@ -22137,7 +22113,7 @@ ) (wire (pts - (xy 68.58 91.44) (xy 73.66 91.44) + (xy 64.77 91.44) (xy 69.85 91.44) ) (stroke (width 0) @@ -22287,7 +22263,7 @@ ) (wire (pts - (xy 68.58 93.98) (xy 73.66 93.98) + (xy 64.77 93.98) (xy 69.85 93.98) ) (stroke (width 0) @@ -22346,7 +22322,7 @@ (uuid "fc0cf128-4a2a-44db-b433-8b4686e0ebf5") ) (label "PB6" - (at 68.58 91.44 0) + (at 64.77 91.44 0) (effects (font (size 1.27 1.27) @@ -22396,7 +22372,7 @@ (uuid "367f0bc7-d119-41b8-a32d-b3b0d92bb6d9") ) (label "5V" - (at 68.58 93.98 0) + (at 64.77 93.98 0) (effects (font (size 1.27 1.27) @@ -22426,7 +22402,7 @@ (uuid "53981c77-947e-4905-8889-88f68d61f30d") ) (label "PB7" - (at 68.58 88.9 0) + (at 64.77 88.9 0) (effects (font (size 1.27 1.27) @@ -22646,7 +22622,7 @@ (uuid "f9db8495-7b9f-4e70-bb67-4f4c691f6f07") ) (label "GND" - (at 68.58 96.52 0) + (at 64.77 96.52 0) (effects (font (size 1.27 1.27) @@ -22787,7 +22763,7 @@ (fill (type none) ) - (uuid 995bf634-1bfd-409c-b626-c616374578f8) + (uuid e4e09650-2a51-4ea0-a704-3b2f57766ec2) ) ) (symbol @@ -22858,7 +22834,7 @@ ) (symbol (lib_id "!Rayine_Components:OLED_0.96{dblquote}_IIC_12864") - (at 80.01 92.71 90) + (at 76.2 92.71 90) (unit 1) (exclude_from_sim no) (in_bom yes) @@ -22867,7 +22843,7 @@ (fields_autoplaced yes) (uuid "2c3c3b1f-5a16-40ac-971d-c9b0e96314ab") (property "Reference" "U4" - (at 85.09 92.0319 90) + (at 81.28 92.0319 90) (effects (font (size 1.27 1.27) @@ -22875,8 +22851,8 @@ (justify right) ) ) - (property "Value" "~" - (at 85.09 93.937 90) + (property "Value" "0.96\" IIC OLED 12864" + (at 81.28 93.937 90) (effects (font (size 1.27 1.27) @@ -22885,7 +22861,7 @@ ) ) (property "Footprint" "!Rayine_Components:OLED_12864_IIC_0.96" - (at 80.01 92.71 0) + (at 76.2 92.71 0) (effects (font (size 1.27 1.27) @@ -22894,7 +22870,7 @@ ) ) (property "Datasheet" "" - (at 80.01 92.71 0) + (at 76.2 92.71 0) (effects (font (size 1.27 1.27) @@ -22903,7 +22879,7 @@ ) ) (property "Description" "" - (at 80.01 92.71 0) + (at 76.2 92.71 0) (effects (font (size 1.27 1.27) @@ -22940,7 +22916,6 @@ (in_bom yes) (on_board yes) (dnp no) - (fields_autoplaced yes) (uuid "2e0d4c3e-7784-486e-858d-d4df1995cedd") (property "Reference" "U2" (at 73.406 109.22 0) @@ -22951,8 +22926,8 @@ ) ) ) - (property "Value" "~" - (at 77.47 109.22 0) + (property "Value" "IM1281B" + (at 76.2 124.46 0) (effects (font (size 1.27 1.27) @@ -23030,7 +23005,6 @@ (in_bom yes) (on_board yes) (dnp no) - (fields_autoplaced yes) (uuid "53bcd724-9051-4267-878c-98c09f17d998") (property "Reference" "T1" (at 64.262 20.574 0) @@ -23041,15 +23015,15 @@ ) ) ) - (property "Value" "~" - (at 69.85 20.32 0) + (property "Value" "220/5 1A" + (at 71.374 20.32 0) (effects (font (size 1.27 1.27) ) ) ) - (property "Footprint" "" + (property "Footprint" "!Rayine_Components:Transformer_220_5_1A_Module" (at 69.85 25.4 0) (effects (font @@ -23269,7 +23243,7 @@ ) ) (property "Value" "AC OUT" - (at 47.752 39.116 0) + (at 51.308 36.83 0) (effects (font (size 1.27 1.27) @@ -23509,7 +23483,6 @@ (in_bom yes) (on_board yes) (dnp no) - (fields_autoplaced yes) (uuid "e0c1a886-015e-4d96-bc81-56107d6cd5ab") (property "Reference" "J1" (at 36.83 33.0199 90) @@ -23521,7 +23494,7 @@ ) ) (property "Value" "AC IN" - (at 36.83 35.5599 90) + (at 30.226 37.084 90) (effects (font (size 1.27 1.27) diff --git a/fp-info-cache b/fp-info-cache index 2af3f4c..2c5bb57 100644 --- a/fp-info-cache +++ b/fp-info-cache @@ -1,46 +1,53 @@ -44352696895475819 -!Rayine Elec +44358518362322020 +!Rayine_Components IM1281B 0 9 9 -!Rayine Elec +!Rayine_Components MEGA2560 Pro Mini 0 86 86 -!Rayine Elec +!Rayine_Components OLED_12864_IIC_0.96 0 4 4 -!Rayine Elec +!Rayine_Components RFID_RC522 0 8 8 -!Rayine Elec +!Rayine_Components STM32F103C8T6 Blue Pill 0 40 40 -!Rayine Elec +!Rayine_Components SW_PUSH_XC29 0 6 6 +!Rayine_Components +Transformer_220_5_1A_Module + + +0 +6 +4 Audio_Module Reverb_BTDR-1H Digital Reverberation Unit, http://www.belton.co.kr/inc/downfile.php?seq=17&file=pdf (footprint from http://www.uk-electronic.de/PDF/BTDR-1.pdf)