Nulo/rae-dux
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Increasing pinky stagger and fixing battery footprint to actually work

Browse source 
with JST PH (fixed upstream in ergogen fork).
This commit is contained in:
Andrew Rae 2022-01-21 12:18:05 -05:00
parent c66df02462
commit fcc9873003
6 changed files with 3841 additions and 3995 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3741
output/pcbs/board-routed.kicad_pcb
View file

File diff suppressed because it is too large Load diff

1
output/pcbs/board-routed.kicad_prl
View file

@ -36,7 +36,6 @@
8,
9,
10,
11,
12,
13,
14,

185
output/pcbs/board.dsn
View file

@ -21,33 +21,31 @@
)
)
(boundary
(path pcb 0 52150.9 68877.1 52648.8 68720.1 53089.1 68439.5 53441.9 68054.6
53682.9 67591.5 53796 67081.8 53876.9 66156.4 54014.9 65581.5
54315 65072.1 54750.9 64672.7 55284.6 64418.1 55869.3 64330.8
75167.9 64330.8 75685.5 64262.6 76167.9 64062.8 76582.1 63745
76899.9 63330.8 77099.7 62848.4 77167.9 62330.8 77167.9 61497.4
94167.9 61497.4 94776.4 61402.6 95327.2 61127.1 95768.1 60697.1
96057.2 60153.4 96167.2 59547.4 114068 59547.4 114585 59479.3
115068 59279.5 115482 58961.6 115800 58547.4 116000 58065.1
116068 57547.4 116068 1065.97 116158 -571.874 116426 -2190.13
116869 -3769.45 117481 -5290.95 118257 -6736.43 119185 -8088.6
132378 -25213 132696 -25627.2 132896 -26109.5 132964 -26627.2
132896 -27144.8 132696 -27627.2 132378 -28041.4 121772 -38648
121358 -38965.8 120875 -39165.6 120358 -39233.8 119840 -39165.6
119358 -38965.8 118943 -38648 74643.1 -14978.2 73409.9 -14389.9
72128.4 -13916.2 70809 -13561.1 69462.8 -13327.5 26894 -7924.86
25312.9 -7808.65 23728.4 -7859.95 22158.2 -8078.19 20619.8 -8460.92
8090.38 -12291.6 7575.44 -12377.7 7055.73 -12327.7 6566.69 -12144.8
6141.64 -11841.7 5809.54 -11438.8 5593.03 -10963.7 -8791.66 36086.5
-8877.83 36601.4 -8827.79 37121.1 -8644.94 37610.2 -8341.76 38035.2
-7938.89 38367.3 -7463.79 38583.9 11857.3 44490.9 12379.3 44737.7
12809.1 45123.3 13110.8 45615.6 13259.3 46173.6 13242.2 46750.8
11777.6 55056.7 11754.8 55578.3 11867.8 56088 12108.9 56551.1
12461.6 56936.1 12902 57216.6 13399.9 57373.6 32244.8 60696.5
32805.5 60884.1 33286.8 61227.4 33646.7 61696.5 33853.8 62250.3
33889.9 62840.4 33672.8 65321.2 33695.6 65842.8 33852.6 66340.8
34133.1 66781.1 34518.1 67133.8 34981.2 67374.9 35490.9 67487.9
51629.3 68899.8 52150.9 68877.1)
(path pcb 0 100494 124296 100992 124139 101432 123859 101785 123474
102026 123011 102139 122501 102220 121576 102358 121001 102658 120491
103094 120092 103628 119837 104213 119750 123511 119750 124029 119682
124511 119482 124925 119164 125243 118750 125443 118267 125511 117750
125511 116916 142511 116916 143120 116822 143670 116546 144111 116116
144400 115572 144510 114966 162411 114966 162929 114898 163411 114699
163825 114381 164143 113966 164343 113484 164411 112966 164411 56485
164501 54847.2 164769 53228.9 165212 51649.6 165825 50128.1
166600 48682.6 167529 47330.5 180722 30206.1 181039 29791.9
181239 29309.5 181307 28791.9 181239 28274.3 181039 27791.9
180722 27377.7 170115 16771.1 169701 16453.2 169218 16253.4
168701 16185.3 168183 16253.4 167701 16453.2 167287 16771.1
123747 40034.6 122461 40644.8 121124 41130.5 119747 41487.3
118342 41712 116922 41802.6 76149 42467.4 74585.6 42411.3
73036.7 42192.7 71518.9 41813.9 58090.4 37708.4 57575.4 37622.3
57055.7 37672.3 56566.7 37855.2 56141.6 38158.3 55809.5 38561.2
55593 39036.3 41208.3 86086.5 41122.2 86601.4 41172.2 87121.1
41355.1 87610.2 41658.2 88035.2 42061.1 88367.3 42536.2 88583.9
61191.9 94287.5 61713.9 94534.2 62143.7 94919.9 62445.4 95412.2
62593.9 95970.2 62576.8 96547.4 60120.8 110476 60098.1 110997
60211.1 111507 60452.1 111970 60804.9 112355 61245.2 112636
61743.1 112793 80588 116116 81148.7 116303 81630 116646 81989.9 117116
82197 117669 82233.1 118259 82016 120740 82038.8 121262 82195.8 121760
82476.3 122200 82861.3 122553 83324.4 122794 83834.1 122907
99972.5 124319 100494 124296)
)
(via "Via[0-1]_800:400_um")
(rule
@ -59,68 +57,71 @@
)
(placement
(component PG1350
(place S1 13029.7 -742.819 front 17)
(place S3 8059.36 15514.4 front 17)
(place S5 3089.04 31771.5 front 17)
(place S7 28947.9 15842.5 front 10)
(place S9 25995.9 32584.3 front 10)
(place S11 23043.9 49326 front 10)
(place S13 47360.1 24759.8 front 5)
(place S15 45878.4 41695.1 front 5)
(place S17 44396.8 58630.4 front 5)
(place S19 67067.9 20730.8 front 0)
(place S21 67067.9 37730.8 front 0)
(place S23 67067.9 54730.8 front 0)
(place S25 86067.9 17897.4 front 0)
(place S27 86067.9 34897.4 front 0)
(place S29 86067.9 51897.4 front 0)
(place S31 85547.8 -6380.32 front 345)
(place S33 104085 -14058.8 front 330)
(place S35 120004 -26273.6 front 315)
(place S1 63029.7 49257.2 front 17)
(place S3 58059.4 65514.4 front 17)
(place S5 53089 81771.5 front 17)
(place S7 77291.1 71261.6 front 10)
(place S9 74339.1 88003.3 front 10)
(place S11 71387.1 104745 front 10)
(place S13 95703.3 80178.9 front 5)
(place S15 94221.6 97114.2 front 5)
(place S17 92740 114049 front 5)
(place S19 115411 76149.8 front 0)
(place S21 115411 93149.8 front 0)
(place S23 115411 110150 front 0)
(place S25 134411 73316.5 front 0)
(place S27 134411 90316.5 front 0)
(place S29 134411 107316 front 0)
(place S31 133891 49038.7 front 345)
(place S33 152429 41360.2 front 330)
(place S35 168347 29145.4 front 315)
)
(component PG1350::1
(place S2 13029.7 -742.819 front 197)
(place S4 8059.36 15514.4 front 197)
(place S6 3089.04 31771.5 front 197)
(place S2 63029.7 49257.2 front 197)
(place S4 58059.4 65514.4 front 197)
(place S6 53089 81771.5 front 197)
)
(component PG1350::2
(place S8 28947.9 15842.5 front 190)
(place S10 25995.9 32584.3 front 190)
(place S12 23043.9 49326 front 190)
(place S8 77291.1 71261.6 front 190)
(place S10 74339.1 88003.3 front 190)
(place S12 71387.1 104745 front 190)
)
(component PG1350::3
(place S14 47360.1 24759.8 front 185)
(place S16 45878.4 41695.1 front 185)
(place S18 44396.8 58630.4 front 185)
(place S14 95703.3 80178.9 front 185)
(place S16 94221.6 97114.2 front 185)
(place S18 92740 114049 front 185)
)
(component PG1350::4
(place S20 67067.9 20730.8 front 180)
(place S22 67067.9 37730.8 front 180)
(place S24 67067.9 54730.8 front 180)
(place S26 86067.9 17897.4 front 180)
(place S28 86067.9 34897.4 front 180)
(place S30 86067.9 51897.4 front 180)
(place S20 115411 76149.8 front 180)
(place S22 115411 93149.8 front 180)
(place S24 115411 110150 front 180)
(place S26 134411 73316.5 front 180)
(place S28 134411 90316.5 front 180)
(place S30 134411 107316 front 180)
)
(component PG1350::5
(place S32 85547.8 -6380.32 front 165)
(place S32 133891 49038.7 front 165)
)
(component PG1350::6
(place S34 104085 -14058.8 front 150)
(place S34 152429 41360.2 front 150)
)
(component PG1350::7
(place S36 120004 -26273.6 front 135)
(place S36 168347 29145.4 front 135)
)
(component ProMicro
(place MCU1 106068 40897.4 front 270)
(place MCU1 154411 96316.5 front 270)
)
(component E73:SPDT_C128955
(place T1 114068 17897.4 front 270)
(place T1 162411 73316.5 front 270)
)
(component E73:SPDT_C128955::1
(place T2 114068 17897.4 front 270)
(place T2 162411 73316.5 front 270)
)
(component lib:bat
(place PAD1 154411 55816.5 front 0)
)
(component kbd:ResetSW
(place B1 113568 3897.42 front 270)
(place B1 161911 59316.5 front 270)
)
)
(library
@ -403,6 +404,11 @@
(pin Rect[B]Pad_900x900_um @5 -3700 -1100)
(pin Rect[B]Pad_900x900_um @6 -3700 1100)
)
(image lib:bat
(pin RoundRect[A]Pad_1500x2250_376.427_um 1 -2000 0)
(pin RoundRect[A]Pad_1500x2250_376.427_um 1@1 0 0)
(pin RoundRect[A]Pad_1500x2250_376.427_um 1@2 2000 0)
)
(image kbd:ResetSW
(outline (path signal 150 3000 -1500 3000 -1750))
(outline (path signal 150 3000 -1750 -3000 -1750))
@ -439,6 +445,31 @@
(shape (circle B.Cu 2032))
(attach off)
)
(padstack RoundRect[A]Pad_1500x2250_376.427_um
(shape (polygon F.Cu 0 440.366 1120.71 503.746 1103.73 563.213 1075.99 616.963 1038.36
663.36 991.963 700.995 938.214 728.726 878.746 745.708 815.366
751.427 750 751.427 -750 745.708 -815.366 728.726 -878.746
700.995 -938.213 663.36 -991.963 616.963 -1038.36 563.214 -1075.99
503.746 -1103.73 440.366 -1120.71 375 -1126.43 -375 -1126.43
-440.366 -1120.71 -503.746 -1103.73 -563.213 -1075.99 -616.963 -1038.36
-663.36 -991.963 -700.995 -938.214 -728.726 -878.746 -745.708 -815.366
-751.427 -750 -751.427 750 -745.708 815.366 -728.726 878.746
-700.995 938.213 -663.36 991.963 -616.963 1038.36 -563.214 1075.99
-503.746 1103.73 -440.366 1120.71 -375 1126.43 375 1126.43
440.366 1120.71))
(shape (polygon B.Cu 0 440.366 1120.71 503.746 1103.73 563.213 1075.99 616.963 1038.36
663.36 991.963 700.995 938.214 728.726 878.746 745.708 815.366
751.427 750 751.427 -750 745.708 -815.366 728.726 -878.746
700.995 -938.213 663.36 -991.963 616.963 -1038.36 563.214 -1075.99
503.746 -1103.73 440.366 -1120.71 375 -1126.43 -375 -1126.43
-440.366 -1120.71 -503.746 -1103.73 -563.213 -1075.99 -616.963 -1038.36
-663.36 -991.963 -700.995 -938.214 -728.726 -878.746 -745.708 -815.366
-751.427 -750 -751.427 750 -745.708 815.366 -728.726 878.746
-700.995 938.213 -663.36 991.963 -616.963 1038.36 -563.214 1075.99
-503.746 1103.73 -440.366 1120.71 -375 1126.43 375 1126.43
440.366 1120.71))
(attach off)
)
(padstack RoundRect[A]Pad_1500x1500_376.427_um
(shape (polygon F.Cu 0 440.366 745.708 503.746 728.726 563.213 700.995 616.963 663.36
663.36 616.963 700.995 563.214 728.726 503.746 745.708 440.366
@ -530,20 +561,20 @@
(net P1
(pins S13-1 S13-1@1 S14-1 S14-1@1 MCU1-13)
)
(net P10
(pins S15-1 S15-1@1 S16-1 S16-1@1 MCU1-12)
(net P18
(pins S15-1 S15-1@1 S16-1 S16-1@1 MCU1-8)
)
(net P16
(pins S17-1 S17-1@1 S18-1 S18-1@1 MCU1-11)
(net P15
(pins S17-1 S17-1@1 S18-1 S18-1@1 MCU1-9)
)
(net P14
(pins S19-1 S19-1@1 S20-1 S20-1@1 MCU1-10)
)
(net P15
(pins S21-1 S21-1@1 S22-1 S22-1@1 MCU1-9)
(net P16
(pins S21-1 S21-1@1 S22-1 S22-1@1 MCU1-11)
)
(net P18
(pins S23-1 S23-1@1 S24-1 S24-1@1 MCU1-8)
(net P10
(pins S23-1 S23-1@1 S24-1 S24-1@1 MCU1-12)
)
(net P19
(pins S25-1 S25-1@1 S26-1 S26-1@1 MCU1-7)
@ -576,10 +607,10 @@
(pins MCU1-25 T1-2 T2-2)
)
(net Bminus
(pins MCU1-25@1)
(pins MCU1-25@1 PAD1-1@1)
)
(net Braw
(pins T1-1 T2-1)
(pins T1-1 T2-1 PAD1-1 PAD1-1@2)
)
(class kicad_default "" P0 P1 P10 P14 P15 P16 P18 P19 P2 P20 P21 P3 P4
P5 P6 P7 P8 P9 RST

3896
output/pcbs/board.kicad_pcb
View file

File diff suppressed because it is too large Load diff

4
package-lock.json generated
View file

@ -323,7 +323,7 @@
},
"node_modules/ergogen": {
"version": "3.1.0",
"resolved": "git+ssh://git@github.com/andrewjrae/ergogen.git#e048e9081e4c664268213eb6f2a4aa9a505124de",
"resolved": "git+ssh://git@github.com/andrewjrae/ergogen.git#455988200fc6acf60ce5c7fea93c8499ad4e5bb1",
"license": "MIT",
"dependencies": {
"@jscad/openjscad": "github:ergogen/oldjscad",
@ -1033,7 +1033,7 @@
"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
},
"ergogen": {
"version": "git+ssh://git@github.com/andrewjrae/ergogen.git#e048e9081e4c664268213eb6f2a4aa9a505124de",
"version": "git+ssh://git@github.com/andrewjrae/ergogen.git#455988200fc6acf60ce5c7fea93c8499ad4e5bb1",
"from": "ergogen@github:andrewjrae/ergogen#rae-dux",
"requires": {
"@jscad/openjscad": "github:ergogen/oldjscad",

19
rae-dux.yaml
View file

@ -27,6 +27,8 @@ points:
reverse: true
zones:
matrix:
anchor:
shift: [50, 50]
key.padding: ky
columns:
pinky:
@ -44,7 +46,7 @@ points:
column_net: P4
ring:
spread: 18
stagger: 2 ky /3
stagger: ky
rotate: -7
origin: [0, -ky]
key:
@ -169,9 +171,22 @@ outlines:
name: controller_area
operation: add
pcb:
- type: outline
main:
type: outline
name: base_outline
fillet: 15
layout_tester:
main:
type: outline
name: pcb
keys:
type: keys
side: left
size: [kx - 0.01, ky - 0.01]
corner: px
bound: false
operation: subtract
pcbs:
board:
outlines: