kim/modular-kbd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hardware-65percent' into dev

Browse Source
This commit is contained in:
Oliver "Kim" Avecilla Cabral
2025-11-11 17:23:06 -08:00
parent 1ce70beb45 d6cd8b532f
commit 0975d6a797
95 changed files with 317971 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

397
hardware/68percent/68percent.kicad_sch
View File

@@ -4622,6 +4622,19 @@
)
(wire
(pts
<<<<<<< HEAD
=======
(xy 237.49 111.76) (xy 237.49 113.03)
)
(stroke
(width 0)
(type default)
)
(uuid "02f26d5e-f208-4852-831f-33981d6c61c3")
)
(wire
(pts
>>>>>>> hardware-65percent
(xy 43.18 58.42) (xy 49.53 58.42)
)
(stroke
@@ -4692,6 +4705,7 @@
)
(wire
(pts
<<<<<<< HEAD
(xy 162.56 132.08) (xy 162.56 151.13)
)
(stroke
@@ -4702,6 +4716,8 @@
)
(wire
(pts
=======
>>>>>>> hardware-65percent
(xy 147.32 77.47) (xy 147.32 88.9)
)
(stroke
@@ -5052,6 +5068,7 @@
)
(wire
(pts
<<<<<<< HEAD
(xy 175.26 63.5) (xy 175.26 88.9)
)
(stroke
@@ -5062,6 +5079,8 @@
)
(wire
(pts
=======
>>>>>>> hardware-65percent
(xy 248.92 129.54) (xy 248.92 132.08)
)
(stroke
@@ -5082,6 +5101,7 @@
)
(wire
(pts
<<<<<<< HEAD
(xy 154.94 132.08) (xy 154.94 147.32)
)
(stroke
@@ -5092,6 +5112,8 @@
)
(wire
(pts
=======
>>>>>>> hardware-65percent
(xy 119.38 129.54) (xy 113.03 129.54)
)
(stroke
@@ -5792,13 +5814,21 @@
)
(wire
(pts
<<<<<<< HEAD
(xy 160.02 132.08) (xy 160.02 151.13)
=======
(xy 180.34 74.93) (xy 180.34 88.9)
>>>>>>> hardware-65percent
)
(stroke
(width 0)
(type default)
)
<<<<<<< HEAD
(uuid "a53cb74b-b460-44ad-b050-031ab179966a")
=======
(uuid "a57d5cf2-2916-462d-9d02-f6005455b75d")
>>>>>>> hardware-65percent
)
(wire
(pts
@@ -5902,6 +5932,19 @@
)
(wire
(pts
<<<<<<< HEAD
=======
(xy 175.26 63.5) (xy 175.26 88.9)
)
(stroke
(width 0)
(type default)
)
(uuid "b82c56aa-688c-40b5-b8b5-ff1b4a6b304f")
)
(wire
(pts
>>>>>>> hardware-65percent
(xy 116.84 104.14) (xy 144.78 104.14)
)
(stroke
@@ -6002,6 +6045,7 @@
)
(wire
(pts
<<<<<<< HEAD
(xy 180.34 74.93) (xy 180.34 88.9)
)
(stroke
@@ -6012,6 +6056,8 @@
)
(wire
(pts
=======
>>>>>>> hardware-65percent
(xy 182.88 74.93) (xy 182.88 88.9)
)
(stroke
@@ -6342,6 +6388,19 @@
)
(wire
(pts
<<<<<<< HEAD
=======
(xy 241.3 111.76) (xy 237.49 111.76)
)
(stroke
(width 0)
(type default)
)
(uuid "f2d50c5d-23ff-4ca6-9c6b-30baf9349883")
)
(wire
(pts
>>>>>>> hardware-65percent
(xy 222.25 101.6) (xy 231.14 101.6)
)
(stroke
@@ -6460,6 +6519,19 @@
)
(uuid "ffd7b1eb-f0cb-4e45-bbcc-845c938910c9")
)
<<<<<<< HEAD
=======
(label "COL13"
(at 165.1 76.2 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "0872e688-18d5-464b-b239-05b725809904")
)
>>>>>>> hardware-65percent
(label "ROW5"
(at 167.64 146.05 90)
(effects
@@ -6500,6 +6572,19 @@
)
(uuid "1491677d-b6de-4782-8f1b-3412b5901f80")
)
<<<<<<< HEAD
=======
(label "COL2"
(at 203.2 124.46 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "14d9996a-aa1d-461c-947b-ff3f45311543")
)
>>>>>>> hardware-65percent
(label "UART_TX_NORTH"
(at 49.53 92.71 180)
(effects
@@ -6520,6 +6605,19 @@
)
(uuid "1a741b36-5f5e-4bd0-ab79-047d4eb60e4c")
)
<<<<<<< HEAD
=======
(label "COL11"
(at 177.8 74.93 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "1bb7e52c-8660-41fe-b7b9-24d5679fd926")
)
>>>>>>> hardware-65percent
(label "COL5"
(at 242.57 26.67 270)
(effects
@@ -6530,6 +6628,7 @@
)
(uuid "1fc100fc-abc3-448f-82e1-8234efa092aa")
)
<<<<<<< HEAD
(label "COL8"
(at 203.2 109.22 180)
(effects
@@ -6540,6 +6639,8 @@
)
(uuid "2120f686-1469-485c-a964-4af544d4c8a0")
)
=======
>>>>>>> hardware-65percent
(label "UART_TX_SOUTH"
(at 53.34 95.25 0)
(effects
@@ -6560,6 +6661,19 @@
)
(uuid "24f3dd47-e1e3-4f7f-8d03-05628870f1ec")
)
<<<<<<< HEAD
=======
(label "UART_TX_NORTH"
(at 123.19 129.54 0)
(effects
(font
(size 1.27 1.27)
)
(justify left bottom)
)
(uuid "2b2b9379-b6f0-4bcf-bddf-b2315719acaf")
)
>>>>>>> hardware-65percent
(label "Place Near VDD Ports"
(at 41.91 165.1 0)
(effects
@@ -6570,6 +6684,7 @@
)
(uuid "2bb4aae6-3cf2-49aa-87c1-180df30a6830")
)
<<<<<<< HEAD
(label "COL12"
(at 203.2 119.38 180)
(effects
@@ -6580,6 +6695,8 @@
)
(uuid "2dd81f62-0ea1-48ba-94ce-6214aee431b5")
)
=======
>>>>>>> hardware-65percent
(label "ROW1"
(at 177.8 146.05 90)
(effects
@@ -6590,6 +6707,7 @@
)
(uuid "2df47b70-1930-4887-8317-8498f4292996")
)
<<<<<<< HEAD
(label "COL1"
(at 160.02 76.2 270)
(effects
@@ -6600,6 +6718,8 @@
)
(uuid "35cf5703-b237-43e3-8def-1a83fcdd56a2")
)
=======
>>>>>>> hardware-65percent
(label "NRST"
(at 229.87 142.24 0)
(effects
@@ -6610,6 +6730,19 @@
)
(uuid "377aec81-2f9d-439a-8ff8-8351613b5a76")
)
<<<<<<< HEAD
=======
(label "COL6"
(at 203.2 114.3 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "38b93aeb-c3f7-4775-8c5d-f4fdd328edc5")
)
>>>>>>> hardware-65percent
(label "SWO"
(at 170.18 74.93 270)
(effects
@@ -6630,6 +6763,7 @@
)
(uuid "3bb57688-3b26-4654-b7b3-b2e87452539d")
)
<<<<<<< HEAD
(label "COL7"
(at 182.88 74.93 270)
(effects
@@ -6640,6 +6774,8 @@
)
(uuid "40ac12a5-ccc3-4c63-8eaa-cd830bb4c50c")
)
=======
>>>>>>> hardware-65percent
(label "VDD"
(at 139.7 73.66 180)
(effects
@@ -6651,13 +6787,18 @@
(uuid "41d1ade5-8210-4054-9cb5-676e258ad061")
)
(label "COL3"
<<<<<<< HEAD
(at 165.1 76.2 270)
=======
(at 203.2 121.92 180)
>>>>>>> hardware-65percent
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
<<<<<<< HEAD
(uuid "450f42af-3bab-4873-883e-859e675ee261")
)
(label "UART_TX_NORTH"
@@ -6679,6 +6820,9 @@
(justify left bottom)
)
(uuid "49a74743-1f19-4803-95ce-65fbcfcf3666")
=======
(uuid "4665b37a-1cc0-472f-9aaa-24e2ffcaec18")
>>>>>>> hardware-65percent
)
(label "COL3"
(at 237.49 26.67 270)
@@ -6700,6 +6844,19 @@
)
(uuid "4f52174a-7166-4096-85f8-c4b3064c9d92")
)
<<<<<<< HEAD
=======
(label "COL14"
(at 162.56 76.2 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "51b3d42b-59cf-4c8b-8004-acd7db548d6b")
)
>>>>>>> hardware-65percent
(label "VDD"
(at 33.02 152.4 0)
(effects
@@ -6710,6 +6867,7 @@
)
(uuid "52f6274d-9319-425e-9856-6028f0c4375f")
)
<<<<<<< HEAD
(label "COL6"
(at 180.34 74.93 270)
(effects
@@ -6720,6 +6878,8 @@
)
(uuid "55ef1033-52ad-4a4c-abb2-4a87f669e520")
)
=======
>>>>>>> hardware-65percent
(label "COL4"
(at 240.03 26.67 270)
(effects
@@ -6740,6 +6900,7 @@
)
(uuid "5795c40c-5423-450b-aa2a-1bd4abcf5b2c")
)
<<<<<<< HEAD
(label "COL9"
(at 203.2 111.76 180)
(effects
@@ -6750,6 +6911,8 @@
)
(uuid "5972eccf-3778-4255-b912-a7f3aa8a6514")
)
=======
>>>>>>> hardware-65percent
(label "D+"
(at 231.14 99.06 180)
(effects
@@ -6760,6 +6923,7 @@
)
(uuid "5a0b3c86-9793-44d1-a2d8-9600402ced23")
)
<<<<<<< HEAD
(label "COL4"
(at 167.64 76.2 270)
(effects
@@ -6770,6 +6934,8 @@
)
(uuid "5a35616b-57aa-45a3-9a4c-738dea73386b")
)
=======
>>>>>>> hardware-65percent
(label "NRST"
(at 133.35 106.68 180)
(effects
@@ -6780,6 +6946,7 @@
)
(uuid "5d2adaf2-8f8b-4999-9547-ccedb6613e09")
)
<<<<<<< HEAD
(label "COL15"
(at 203.2 127 180)
(effects
@@ -6790,6 +6957,8 @@
)
(uuid "5e32798c-498a-4ed5-abb2-ce1d9bb0940a")
)
=======
>>>>>>> hardware-65percent
(label "SWO"
(at 229.87 144.78 0)
(effects
@@ -6800,15 +6969,34 @@
)
(uuid "5ecab8f8-63a0-4572-9b85-28a525a98633")
)
<<<<<<< HEAD
(label "UART_RX_SOUTH"
(at 147.32 154.94 90)
=======
(label "UART_RX_NORTH"
(at 147.32 139.7 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "6122bc97-e07e-4adf-89b2-180f85ee6966")
)
(label "UART_RX_SOUTH"
(at 172.72 78.74 90)
>>>>>>> hardware-65percent
(effects
(font
(size 1.27 1.27)
)
(justify left bottom)
)
<<<<<<< HEAD
(uuid "64a8185d-c8c9-437e-aa1e-0840591f81c7")
=======
(uuid "63fc0654-be18-4f2a-a55b-53555edbe2c2")
>>>>>>> hardware-65percent
)
(label "UART_TX_WEST"
(at 49.53 107.95 180)
@@ -6821,6 +7009,29 @@
(uuid "6a08174c-d5da-4dc2-99f0-c0d2873ea18b")
)
(label "COL10"
<<<<<<< HEAD
=======
(at 180.34 74.93 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "6a58c484-2ea3-413b-8615-ba2811c350c7")
)
(label "COL12"
(at 167.64 76.2 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "6b5fc549-d58c-4de2-b4bb-118b4976d050")
)
(label "COL10"
>>>>>>> hardware-65percent
(at 255.27 26.67 270)
(effects
(font
@@ -6870,6 +7081,7 @@
)
(uuid "77a3d361-47a0-4b74-9b05-707429d9cf5a")
)
<<<<<<< HEAD
(label "COL10"
(at 203.2 114.3 180)
(effects
@@ -6880,6 +7092,8 @@
)
(uuid "77a693a8-cbb0-4a16-9ffa-ff644b1ef66d")
)
=======
>>>>>>> hardware-65percent
(label "VSS"
(at 149.86 77.47 270)
(effects
@@ -6890,6 +7104,7 @@
)
(uuid "780166be-d300-4885-bbb9-b8b93658a286")
)
<<<<<<< HEAD
(label "COL11"
(at 203.2 116.84 180)
(effects
@@ -6900,6 +7115,8 @@
)
(uuid "7ca58e08-c365-4691-8526-02e2f709f173")
)
=======
>>>>>>> hardware-65percent
(label "VSS"
(at 149.86 143.51 90)
(effects
@@ -6930,6 +7147,7 @@
)
(uuid "8348d23a-0a8c-4a80-a092-2c011e4ecf26")
)
<<<<<<< HEAD
(label "COL13"
(at 203.2 121.92 180)
(effects
@@ -6940,6 +7158,8 @@
)
(uuid "861b9f69-5164-46d8-ad69-517a598a79a4")
)
=======
>>>>>>> hardware-65percent
(label "VSS"
(at 201.93 93.98 180)
(effects
@@ -7000,6 +7220,7 @@
)
(uuid "8bd4b99c-2cb7-4e42-a63a-d77ead0034b9")
)
<<<<<<< HEAD
(label "COL2"
(at 162.56 76.2 270)
(effects
@@ -7010,6 +7231,8 @@
)
(uuid "8d5ea51c-3018-499a-9feb-77558fc69925")
)
=======
>>>>>>> hardware-65percent
(label "Place near USB port"
(at 92.71 50.8 0)
(effects
@@ -7030,15 +7253,34 @@
)
(uuid "92086348-c6ef-454f-890c-11a873ceb43a")
)
<<<<<<< HEAD
(label "COL5"
(at 177.8 74.93 270)
=======
(label "COL4"
(at 203.2 119.38 180)
>>>>>>> hardware-65percent
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
<<<<<<< HEAD
(uuid "959bf094-985a-4d26-85c6-29f58b765d35")
=======
(uuid "95fa2f23-8b81-47b7-bccb-9760f7b22390")
)
(label "COL9"
(at 182.88 74.93 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "96ffef80-1b7b-4d2b-a1f7-1b8580e75eed")
>>>>>>> hardware-65percent
)
(label "Place Near VBAT"
(at 116.84 80.01 0)
@@ -7060,6 +7302,39 @@
)
(uuid "98066d23-6bbb-440b-b346-e60179dceea1")
)
<<<<<<< HEAD
=======
(label "COL15"
(at 160.02 76.2 270)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "996c67c9-193a-4c61-9328-9fc555becd3d")
)
(label "RGB_DATAIN"
(at 237.49 113.03 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "9fa75837-02a6-4f2b-8b4a-bf84097a30c4")
)
(label "UART_TX_SOUTH"
(at 175.26 78.74 90)
(effects
(font
(size 1.27 1.27)
)
(justify left bottom)
)
(uuid "a21ae7e0-711c-45a6-9e0f-0ffa2e2613b5")
)
>>>>>>> hardware-65percent
(label "UART_RX_WEST"
(at 212.09 106.68 180)
(effects
@@ -7110,6 +7385,19 @@
)
(uuid "ae8d8e37-f38f-41fe-903a-1eb9be3bd21d")
)
<<<<<<< HEAD
=======
(label "COL5"
(at 203.2 116.84 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "aecd807f-0dae-4de9-9f2a-7205af2df165")
)
>>>>>>> hardware-65percent
(label "JTMS"
(at 229.87 139.7 0)
(effects
@@ -7120,6 +7408,7 @@
)
(uuid "b1459e8f-23e1-418c-abf2-ccad8c3f1fe5")
)
<<<<<<< HEAD
(label "UART_TX_SOUTH"
(at 123.19 129.54 0)
(effects
@@ -7130,6 +7419,8 @@
)
(uuid "b1ac5c45-29f6-49be-86d9-d334cdf2d7b7")
)
=======
>>>>>>> hardware-65percent
(label "COL6"
(at 245.11 26.67 270)
(effects
@@ -7140,6 +7431,7 @@
)
(uuid "b6dc15c4-5294-4338-988f-8c3f870110f4")
)
<<<<<<< HEAD
(label "COL14"
(at 203.2 124.46 180)
(effects
@@ -7150,6 +7442,8 @@
)
(uuid "bb2ad147-d245-4431-84b9-4648d501513f")
)
=======
>>>>>>> hardware-65percent
(label "UART_TX_EAST"
(at 123.19 127 0)
(effects
@@ -7170,6 +7464,19 @@
)
(uuid "bf953326-f2e8-4e46-9ecf-e9fe4295b6b1")
)
<<<<<<< HEAD
=======
(label "COL8"
(at 203.2 109.22 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "c1c2ccbf-4c9e-486b-9a84-3f54fb5a6e01")
)
>>>>>>> hardware-65percent
(label "COL2"
(at 234.95 26.67 270)
(effects
@@ -7230,6 +7537,19 @@
)
(uuid "d312f0f4-cc79-473f-a2ed-836b5642b4a2")
)
<<<<<<< HEAD
=======
(label "COL1"
(at 203.2 127 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "d4e6b922-25eb-4849-9db9-6f6185ed1afd")
)
>>>>>>> hardware-65percent
(label "ROW4"
(at 209.55 55.88 0)
(effects
@@ -7260,6 +7580,19 @@
)
(uuid "dfbee201-609e-420a-8bd4-bc98bce299e1")
)
<<<<<<< HEAD
=======
(label "COL7"
(at 203.2 111.76 180)
(effects
(font
(size 1.27 1.27)
)
(justify right bottom)
)
(uuid "e443e11e-99a4-44c1-9116-18729e86e186")
)
>>>>>>> hardware-65percent
(label "VDD"
(at 201.93 91.44 180)
(effects
@@ -7270,6 +7603,7 @@
)
(uuid "e9b26d3d-3813-4e99-8ea8-af0648067087")
)
<<<<<<< HEAD
(label "ROT_SW"
(at 154.94 147.32 90)
(effects
@@ -7280,6 +7614,8 @@
)
(uuid "ecce62bc-b4cc-48bb-a6e3-988ce1c4f4c4")
)
=======
>>>>>>> hardware-65percent
(label "UART_RX_SOUTH"
(at 53.34 92.71 0)
(effects
@@ -7290,6 +7626,7 @@
)
(uuid "ef17a05a-3c4b-4a77-a598-a5f8ad4599a9")
)
<<<<<<< HEAD
(label "UART_RX_NORTH"
(at 172.72 63.5 270)
(effects
@@ -7300,6 +7637,8 @@
)
(uuid "f0af64ee-d378-41f3-842f-24d5ad4f75d3")
)
=======
>>>>>>> hardware-65percent
(label "COL8"
(at 250.19 26.67 270)
(effects
@@ -7310,6 +7649,7 @@
)
(uuid "f325fd11-511d-4af8-8e04-8af1e81ceee5")
)
<<<<<<< HEAD
(label "ROT_TIMB"
(at 160.02 151.13 90)
(effects
@@ -7320,6 +7660,8 @@
)
(uuid "fe355360-6bef-43f4-a60d-7c9f0aed2700")
)
=======
>>>>>>> hardware-65percent
(symbol
(lib_id "PCM_4ms_Power-symbol:GND")
(at 149.86 144.145 0)
@@ -11703,6 +12045,61 @@
)
)
(sheet
<<<<<<< HEAD
=======
(at 241.3 93.98)
(size 36.83 20.32)
(exclude_from_sim no)
(in_bom yes)
(on_board yes)
(dnp no)
(fields_autoplaced yes)
(stroke
(width 0.1524)
(type solid)
)
(fill
(color 0 0 0 0.0000)
)
(uuid "0330dd45-2776-4667-9e47-eb2dbca2bb32")
(property "Sheetname" "RGB Lights"
(at 241.3 93.2684 0)
(effects
(font
(size 1.27 1.27)
)
(justify left bottom)
)
)
(property "Sheetfile" "untitled.kicad_sch"
(at 241.3 114.8846 0)
(effects
(font
(size 1.27 1.27)
)
(justify left top)
)
)
(pin "RGB IN" input
(at 241.3 111.76 180)
(uuid "2bc0b118-22f4-44df-9631-a4ce548bbecf")
(effects
(font
(size 1.27 1.27)
)
(justify left)
)
)
(instances
(project "68percent"
(path "/a3d0d559-cac8-4859-ad0f-79ad0c1a1a82"
(page "3")
)
)
)
)
(sheet
>>>>>>> hardware-65percent
(at 217.17 33.02)
(size 55.88 34.925)
(exclude_from_sim no)