diff --git a/.gitignore b/.gitignore index 6ceba7d..eff47ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ output fp-info-cache +.ninja* diff --git a/build.ninja b/build.ninja index 39545d6..3f6b924 100644 --- a/build.ninja +++ b/build.ninja @@ -1,6 +1,6 @@ rule ergogen command = ergogen $infolder -o $outfolder -build pcb/pcbs/keyboard.kicad_pcb: ergogen +build pcb/pcbs/keyboard.kicad_pcb pcb/pcbs/switchplate.kicad_pcb: ergogen infolder = ./ergogen outfolder = ./pcb diff --git a/ergogen/config.yaml b/ergogen/config.yaml index ec942b9..c963a20 100644 --- a/ergogen/config.yaml +++ b/ergogen/config.yaml @@ -17,8 +17,8 @@ units: screen_screw_diameter: 4 screen_screw_hole: 2.2 switchplate_switch_cutout: 14 - switchplate_scrollwheel_cutout_x: 17 - switchplate_scrollwheel_cutout_y: 14 + switchplate_scrollwheel_cutout_x: 17.5 + switchplate_scrollwheel_cutout_y: 14.5 switchplate_screw_diameter: 3.3 switchplate_screw_hole: 2.2 points: @@ -229,9 +229,9 @@ outlines: - ref: matrix_inner_num shift: [0.5px, 0.5py] - ref: matrix_inner_bottom - shift: [0.5px, 0.5py+2] + shift: [0.5px, 0.5py+1.5] - ref: matrix_inner_bottom - shift: [0.5px+mcu_padding+mcu_width+0.25, 0.5py+2] + shift: [0.5px+mcu_padding+mcu_width+0.25, 0.5py+1.5] - ref: matrix_inner_bottom shift: [0.5px+mcu_padding+mcu_width+0.25, -0.5py] - ref: thumbs_space_cluster diff --git a/pcb/outlines/switchplate.dxf b/pcb/outlines/switchplate.dxf index 3509efd..79cac34 100644 --- a/pcb/outlines/switchplate.dxf +++ b/pcb/outlines/switchplate.dxf @@ -139,7 +139,7 @@ LINE 11 179.0024765 21 --101.2181453 +-101.7181453 0 LINE 8 @@ -147,11 +147,11 @@ LINE 10 181.0024765 20 --103.2181453 +-103.7181453 11 196.7524766 21 --103.2181453 +-103.7181453 0 LINE 8 @@ -159,7 +159,7 @@ LINE 10 198.7524766 20 --105.2181453 +-105.7181453 11 198.7524766 21 @@ -329,7 +329,7 @@ ARC 10 181.0024765 20 --101.2181453 +-101.7181453 40 2 50 @@ -343,7 +343,7 @@ ARC 10 196.7524766 20 --105.2181453 +-105.7181453 40 2 50 @@ -1783,49 +1783,49 @@ LINE 8 0 10 -178.7524766 +178.5024766 20 --121.7181453 +-121.9681453 11 -195.7524766 +196.0024766 21 --121.7181453 +-121.9681453 0 LINE 8 0 10 -195.7524766 +196.0024766 20 --121.7181453 +-121.9681453 11 -195.7524766 +196.0024766 21 --107.7181453 +-107.4681453 0 LINE 8 0 10 -195.7524766 +196.0024766 20 --107.7181453 +-107.4681453 11 -178.7524766 +178.5024766 21 --107.7181453 +-107.4681453 0 LINE 8 0 10 -178.7524766 +178.5024766 20 --107.7181453 +-107.4681453 11 -178.7524766 +178.5024766 21 --121.7181453 +-121.9681453 0 ENDSEC 0 diff --git a/pcb/pcbs/switchplate.kicad_pcb b/pcb/pcbs/switchplate.kicad_pcb index 1ff1795..929b7ba 100644 --- a/pcb/pcbs/switchplate.kicad_pcb +++ b/pcb/pcbs/switchplate.kicad_pcb @@ -161,9 +161,9 @@ (gr_line (start 105.23410495083945 51.645954463587316) (end 122.71182110054527 46.198732899999996) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 123.30692130054526 46.1081453) (end 142.77998656161589 46.1081453) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 143.2195267616159 46.157041899999996) (end 177.44201669999998 53.86660828827905) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 179.0024765 55.817711688279054) (end 179.0024765 101.2181453) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 181.0024765 103.2181453) (end 196.7524766 103.2181453) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 198.7524766 105.2181453) (end 198.7524766 124.03422620266917) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 179.0024765 55.817711688279054) (end 179.0024765 101.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 181.0024765 103.7181453) (end 196.7524766 103.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 198.7524766 105.7181453) (end 198.7524766 124.03422620266917) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 198.78601921793185 124.39897999934306) (end 201.5798643491806 139.46113601074512) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 201.3454577671124 140.82588980741883) (end 192.5584778613928 156.04538538270447) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 190.13157369397126 156.92079969477498) (end 141.19106693062298 138.78801926092302) (angle 90) (layer Edge.Cuts) (width 0.15)) @@ -176,8 +176,8 @@ (gr_arc (start 123.30692130054526 48.1081453) (end 123.30692130054526 46.1081453) (angle -17.31051580173535) (layer Edge.Cuts) (width 0.15)) (gr_arc (start 142.77998656161589 48.1081453) (end 143.2195267616159 46.157041899999996) (angle -12.695530120298244) (layer Edge.Cuts) (width 0.15)) (gr_arc (start 177.0024765 55.817711688279054) (end 179.0024765 55.817711688279054) (angle -77.30446987970257) (layer Edge.Cuts) (width 0.15)) -(gr_arc (start 181.0024765 101.2181453) (end 179.0024765 101.2181453) (angle -90) (layer Edge.Cuts) (width 0.15)) -(gr_arc (start 196.7524766 105.2181453) (end 198.7524766 105.2181453) (angle -90) (layer Edge.Cuts) (width 0.15)) +(gr_arc (start 181.0024765 101.7181453) (end 179.0024765 101.7181453) (angle -90) (layer Edge.Cuts) (width 0.15)) +(gr_arc (start 196.7524766 105.7181453) (end 198.7524766 105.7181453) (angle -90) (layer Edge.Cuts) (width 0.15)) (gr_arc (start 200.7524766 124.03422620266917) (end 198.7524766 124.03422620266917) (angle -10.508238166377566) (layer Edge.Cuts) (width 0.15)) (gr_arc (start 199.6134069671124 139.8258898074189) (end 201.3454577671124 140.8258898074189) (angle -40.50823827478888) (layer Edge.Cuts) (width 0.15)) (gr_arc (start 190.8264270613928 155.04538538270447) (end 190.1315736613928 156.92079968270446) (angle -80.32999991007168) (layer Edge.Cuts) (width 0.15)) @@ -296,10 +296,10 @@ (gr_line (start 198.0493954 141.5348373) (end 185.9250398 134.5348373) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 185.9250398 134.5348373) (end 178.9250398 146.6591929) (angle 90) (layer Edge.Cuts) (width 0.15)) (gr_line (start 178.9250398 146.6591929) (end 191.0493954 153.6591929) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 178.7524766 121.7181453) (end 195.7524766 121.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 195.7524766 121.7181453) (end 195.7524766 107.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 195.7524766 107.7181453) (end 178.7524766 107.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) -(gr_line (start 178.7524766 107.7181453) (end 178.7524766 121.7181453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 178.5024766 121.9681453) (end 196.0024766 121.9681453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 196.0024766 121.9681453) (end 196.0024766 107.4681453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 196.0024766 107.4681453) (end 178.5024766 107.4681453) (angle 90) (layer Edge.Cuts) (width 0.15)) +(gr_line (start 178.5024766 107.4681453) (end 178.5024766 121.9681453) (angle 90) (layer Edge.Cuts) (width 0.15)) )