martin
/
dactyl-high-profile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: martin:52e1f6160cdc602e319dab929f877eec46936741
Branches Tags
martin:main
martin:from-xps
martin:only-grid
..
compare: martin:b766fc465aec8bce1834de5abf965d57113aa1e0
Branches Tags
martin:from-xps
martin:only-grid
martin:main

No commits in common. "52e1f6160cdc602e319dab929f877eec46936741" and "b766fc465aec8bce1834de5abf965d57113aa1e0" have entirely different histories.
52e1f6160c ... b766fc465a

7 changed files with 43352 additions and 1755 deletions
Show Stats Expand all files Collapse all files

245
src/main.py
View File

@ -35,7 +35,7 @@ mount_height = keyswitch_height
mount_width = keyswitch_width mount_width = keyswitch_width
# use 10 for faster prototyping, 15 for real # use 10 for faster prototyping, 15 for real
tenting_angle = 11.0 tenting_angle = 11.0
z_offset = 6.0 z_offset = 9.0
should_include_risers = False should_include_risers = False
@ -477,7 +477,7 @@ def wall_connect_from_placer(
delta1=None, delta1=None,
delta2=None, delta2=None,
connectors=True, connectors=True,
walls=False walls=True
): ):
offsetter1 = make_offsetter(idx1, delta1) offsetter1 = make_offsetter(idx1, delta1)
offsetter2 = make_offsetter(idx2, delta2) offsetter2 = make_offsetter(idx2, delta2)
@ -487,8 +487,8 @@ def wall_connect_from_placer(
shapes = [] shapes = []
# if should_include_risers: if should_include_risers:
# shapes.append(hull(place_fn1(post1), place_fn2(post2))) shapes.append(hull(place_fn1(post1), place_fn2(post2)))
if connectors: if connectors:
shapes.append( shapes.append(
@ -498,15 +498,15 @@ def wall_connect_from_placer(
) )
) )
# if walls: if walls:
# shapes.append( shapes.append(
# bottom_hull( bottom_hull(
# hull( hull(
# place_fn1(offsetter1(switch_riser_raw_dot)), place_fn1(offsetter1(switch_riser_raw_dot)),
# place_fn2(offsetter2(switch_riser_raw_dot)), place_fn2(offsetter2(switch_riser_raw_dot)),
# ) )
# ) )
# ) )
return union(*shapes) return union(*shapes)
@ -543,8 +543,7 @@ def case_walls():
# Bottom wall # Bottom wall
def include_wall(col): def include_wall(col):
return False return col >= 2
# return col >= 2
for col in range(0, num_cols): for col in range(0, num_cols):
all_shapes.append( all_shapes.append(
@ -711,43 +710,43 @@ def thumb_walls():
walls=False, walls=False,
connectors=False, connectors=False,
), ),
# hull( hull(
# get_offset_thumb_placer(thumb_br_placer, square_idx_tr, top_dot), get_offset_thumb_placer(thumb_br_placer, square_idx_tr, top_dot),
# get_offset_thumb_placer(thumb_r_placer, square_idx_bl, top_dot), get_offset_thumb_placer(thumb_r_placer, square_idx_bl, top_dot),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_r_placer, square_idx_bl, switch_riser_raw_dot thumb_r_placer, square_idx_bl, switch_riser_raw_dot
# ), ),
# ), ),
# hull( hull(
# get_offset_thumb_placer(thumb_br_placer, square_idx_tr, top_dot), get_offset_thumb_placer(thumb_br_placer, square_idx_tr, top_dot),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_br_placer, square_idx_tr, switch_riser_raw_dot thumb_br_placer, square_idx_tr, switch_riser_raw_dot
# ), ),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_r_placer, square_idx_bl, switch_riser_raw_dot thumb_r_placer, square_idx_bl, switch_riser_raw_dot
# ), ),
# ), ),
# hull( hull(
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_r_placer, square_idx_br, switch_riser_raw_dot thumb_r_placer, square_idx_br, switch_riser_raw_dot
# ), ),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_r_placer, square_idx_bl, switch_riser_raw_dot thumb_r_placer, square_idx_bl, switch_riser_raw_dot
# ), ),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_br_placer, square_idx_tr, switch_riser_raw_dot thumb_br_placer, square_idx_tr, switch_riser_raw_dot
# ), ),
# ), ),
# bottom_hull( bottom_hull(
# hull( hull(
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_r_placer, square_idx_br, switch_riser_raw_dot thumb_r_placer, square_idx_br, switch_riser_raw_dot
# ), ),
# get_offset_thumb_placer( get_offset_thumb_placer(
# thumb_br_placer, square_idx_tr, switch_riser_raw_dot thumb_br_placer, square_idx_tr, switch_riser_raw_dot
# ), ),
# ) )
# ), ),
) )
@ -872,37 +871,37 @@ def thumb_connectors():
def thumb_to_body_connectors(): def thumb_to_body_connectors():
return union( return union(
# bottom_hull( bottom_hull(
# hull( hull(
# thumb_r_placer( thumb_r_placer(
# get_in_square(switch_riser_offset_square, square_idx_br)( get_in_square(switch_riser_offset_square, square_idx_br)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# place_on_grid(3, 2)( place_on_grid(3, 2)(
# get_in_square(switch_riser_offset_square, square_idx_bl)( get_in_square(switch_riser_offset_square, square_idx_bl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# ) )
# ), ),
# hull( hull(
# thumb_r_placer( thumb_r_placer(
# get_in_square(switch_riser_offset_square, square_idx_br)( get_in_square(switch_riser_offset_square, square_idx_br)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# thumb_r_placer( thumb_r_placer(
# get_in_square(switch_riser_offset_square, square_idx_tr)( get_in_square(switch_riser_offset_square, square_idx_tr)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# place_on_grid(3, 2)( place_on_grid(3, 2)(
# get_in_square(switch_riser_offset_square, square_idx_bl)( get_in_square(switch_riser_offset_square, square_idx_bl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# ), ),
hull( hull(
thumb_r_placer( thumb_r_placer(
get_in_square(switch_riser_offset_square, square_idx_tr)( get_in_square(switch_riser_offset_square, square_idx_tr)(
@ -937,37 +936,37 @@ def thumb_to_body_connectors():
) )
), ),
), ),
# bottom_hull( bottom_hull(
# hull( hull(
# thumb_m_placer( thumb_m_placer(
# get_in_square(switch_riser_offset_square, square_idx_tl)( get_in_square(switch_riser_offset_square, square_idx_tl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# place_on_grid(2, 0)( place_on_grid(2, 0)(
# get_in_square(switch_riser_offset_square, square_idx_bl)( get_in_square(switch_riser_offset_square, square_idx_bl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# ) )
# ), ),
# hull( hull(
# thumb_m_placer( thumb_m_placer(
# get_in_square(switch_riser_offset_square, square_idx_tl)( get_in_square(switch_riser_offset_square, square_idx_tl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# place_on_grid(2, 0)( place_on_grid(2, 0)(
# get_in_square(switch_riser_offset_square, square_idx_bl)( get_in_square(switch_riser_offset_square, square_idx_bl)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# place_on_grid(2, 0)( place_on_grid(2, 0)(
# get_in_square(switch_riser_offset_square, square_idx_br)( get_in_square(switch_riser_offset_square, square_idx_br)(
# switch_riser_raw_dot switch_riser_raw_dot
# ) )
# ), ),
# ), ),
) )
@ -1192,7 +1191,7 @@ def right_shell():
all_switches(), all_switches(),
connectors(), connectors(),
case_walls(), case_walls(),
# screw_insert_all_shapes(screw_insert_outer), screw_insert_all_shapes(screw_insert_outer),
# all_caps(), # all_caps(),
thumb_switches(), thumb_switches(),
thumb_walls(), thumb_walls(),
@ -1200,15 +1199,15 @@ def right_shell():
# thumb_caps(), # thumb_caps(),
thumb_to_body_connectors(), thumb_to_body_connectors(),
# trrs_holder(), trrs_holder(),
# usb_holder_rim(), usb_holder_rim(),
),
union(
blocker(),
screw_insert_all_shapes(screw_insert_inner),
trrs_holder_hole(),
usb_holder_hole(),
), ),
# union(
# blocker(),
# screw_insert_all_shapes(screw_insert_inner),
# trrs_holder_hole(),
# usb_holder_hole(),
# ),
) )
# return intersection(cover, full_proto) # return intersection(cover, full_proto)

7717
things/left.scad
View File

File diff suppressed because it is too large Load Diff

14714
things/left_bottom_plate.scad
View File

File diff suppressed because it is too large Load Diff

BIN
things/left_grid.stl
View File

Binary file not shown.

7717
things/right.scad
View File

File diff suppressed because it is too large Load Diff

14714
things/right_bottom_plate.scad
View File

File diff suppressed because it is too large Load Diff

BIN
things/right_grid.stl
View File

Binary file not shown.