src/main.py

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