Compare commits
	
		
			No commits in common. "b766fc465aec8bce1834de5abf965d57113aa1e0" and "49a6933a927e842c6a78ee3b4697d731a8ecbaed" have entirely different histories.
		
	
	
		
			b766fc465a
			...
			49a6933a92
		
	
		
							
								
								
									
										10
									
								
								src/main.py
								
								
								
								
							
							
						
						
									
										10
									
								
								src/main.py
								
								
								
								
							|  | @ -1049,7 +1049,7 @@ def screw_insert_all_shapes(shape): | |||
|         screw_insert(2, 0, shape, -5.3, 5.9), | ||||
|         screw_insert(num_cols - 1, 0, shape, 6.7, 5.5), | ||||
|         screw_insert(num_cols - 1, num_rows_for_col(num_cols - 1), shape, 6.8, 14.4), | ||||
|         screw_insert(0, 0, shape, -6.2, -8), | ||||
|         screw_insert(0, 0, shape, -6.2, -6), | ||||
|         screw_insert(1, max_num_rows + 1, shape, -9.8, 3.4), | ||||
|         screw_insert(0, max_num_rows - 1, shape, -17.4, -2), | ||||
|     ) | ||||
|  | @ -1064,7 +1064,7 @@ trrs_front_thickness = 1.8 | |||
| 
 | ||||
| def trrs_key_holder_position(): | ||||
|     base_place = point_on_grid(0, 0, 0, keyswitch_width / 2, 0) | ||||
|     return [base_place[0] - 5, base_place[1] + 1.43, 9.0] | ||||
|     return [base_place[0] + 3, base_place[1] + 2.43, 8.5] | ||||
| 
 | ||||
| 
 | ||||
| def trrs_holder(): | ||||
|  | @ -1074,6 +1074,8 @@ def trrs_holder(): | |||
|         trrs_holder_size[2] + trrs_holder_thickness * 2, | ||||
|     ) | ||||
| 
 | ||||
|     pos = trrs_key_holder_position() | ||||
| 
 | ||||
|     placed_shape = translate( | ||||
|         -trrs_holder_size[0] / 2, | ||||
|         -trrs_holder_size[1], | ||||
|  | @ -1199,13 +1201,13 @@ def right_shell(): | |||
|             # thumb_caps(), | ||||
|             thumb_to_body_connectors(), | ||||
| 
 | ||||
|             trrs_holder(), | ||||
|             # trrs_holder(), | ||||
|             usb_holder_rim(), | ||||
|         ), | ||||
|         union( | ||||
|             blocker(), | ||||
|             screw_insert_all_shapes(screw_insert_inner), | ||||
|             trrs_holder_hole(), | ||||
|             # trrs_holder_hole(), | ||||
|             usb_holder_hole(), | ||||
|         ), | ||||
|     ) | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| // Generated by SolidPython 0.4.8 on 2024-09-05 11:44:27 | ||||
| // Generated by SolidPython 0.4.8 on 2022-02-01 13:57:26 | ||||
| 
 | ||||
| 
 | ||||
| mirror(v = [-1, 0, 0]) { | ||||
|  | @ -12235,7 +12235,7 @@ mirror(v = [-1, 0, 0]) { | |||
| 						cylinder($fn = 18, h = 6.2000000000, r1 = 4.6550000000, r2 = 4.5500000000); | ||||
| 					} | ||||
| 				} | ||||
| 				translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 				translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 					translate(v = [0, 0, 2]) { | ||||
| 						cylinder($fn = 18, h = 6.2000000000, r1 = 4.6550000000, r2 = 4.5500000000); | ||||
| 					} | ||||
|  | @ -16253,11 +16253,6 @@ mirror(v = [-1, 0, 0]) { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-55.537912117550164, 27.807955392906404, 9.0000000000]) { | ||||
| 				translate(v = [-3.0000000000, -11.0000000000, -6.0000000000]) { | ||||
| 					cube(size = [8.5000000000, 12.8000000000, 12.0000000000]); | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-42.537912117550164, 28.377955392906404, 4]) { | ||||
| 				translate(v = [-5.0000000000, 0, -2.2500000000]) { | ||||
| 					cube(size = [10.0000000000, 1.0000000000, 4.5000000000]); | ||||
|  | @ -16284,7 +16279,7 @@ mirror(v = [-1, 0, 0]) { | |||
| 						cylinder($fn = 18, h = 4.2000000000, r1 = 2.6550000000, r2 = 2.5500000000); | ||||
| 					} | ||||
| 				} | ||||
| 				translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 				translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 					translate(v = [0, 0, 2]) { | ||||
| 						cylinder($fn = 18, h = 4.2000000000, r1 = 2.6550000000, r2 = 2.5500000000); | ||||
| 					} | ||||
|  | @ -16300,18 +16295,6 @@ mirror(v = [-1, 0, 0]) { | |||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-55.537912117550164, 27.807955392906404, 9.0000000000]) { | ||||
| 				union() { | ||||
| 					translate(v = [-3.0000000000, -11.0000000000, -3.5000000000]) { | ||||
| 						cube(size = [6.0000000000, 11.0000000000, 7.0000000000]); | ||||
| 					} | ||||
| 					translate(v = [0, 5, 0]) { | ||||
| 						rotate(a = 90, v = [1, 0, 0]) { | ||||
| 							cylinder($fn = 30, h = 10.0000000000, r = 2.6000000000); | ||||
| 						} | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-42.537912117550164, 28.377955392906404, 4]) { | ||||
| 				translate(v = [-4.5000000000, -4.0000000000, -1.7500000000]) { | ||||
| 					cube(size = [9, 8, 3.5000000000]); | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| // Generated by SolidPython 0.4.8 on 2024-09-05 11:44:27 | ||||
| // Generated by SolidPython 0.4.8 on 2022-02-01 13:57:26 | ||||
| 
 | ||||
| 
 | ||||
| mirror(v = [-1, 0, 0]) { | ||||
|  | @ -25829,7 +25829,7 @@ mirror(v = [-1, 0, 0]) { | |||
| 				translate(v = [49.65354174552968, -38.614127899174086, 0.0]) { | ||||
| 					cylinder($fn = 18, h = 1.0000000000, r1 = 2.7500000000, r2 = 2.7500000000); | ||||
| 				} | ||||
| 				translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 				translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 					cylinder($fn = 18, h = 1.0000000000, r1 = 2.7500000000, r2 = 2.7500000000); | ||||
| 				} | ||||
| 				translate(v = [-31.824128050589394, -57.50598575660748, 0.0]) { | ||||
|  | @ -25849,7 +25849,7 @@ mirror(v = [-1, 0, 0]) { | |||
| 				translate(v = [49.65354174552968, -38.614127899174086, 0.0]) { | ||||
| 					cylinder($fn = 18, h = 2, r1 = 1.7000000000, r2 = 1.7000000000); | ||||
| 				} | ||||
| 				translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 				translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 					cylinder($fn = 18, h = 2, r1 = 1.7000000000, r2 = 1.7000000000); | ||||
| 				} | ||||
| 				translate(v = [-31.824128050589394, -57.50598575660748, 0.0]) { | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| // Generated by SolidPython 0.4.8 on 2024-09-05 11:44:27 | ||||
| // Generated by SolidPython 0.4.8 on 2022-02-01 13:57:25 | ||||
| 
 | ||||
| 
 | ||||
| difference() { | ||||
|  | @ -12234,7 +12234,7 @@ difference() { | |||
| 					cylinder($fn = 18, h = 6.2000000000, r1 = 4.6550000000, r2 = 4.5500000000); | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 			translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 				translate(v = [0, 0, 2]) { | ||||
| 					cylinder($fn = 18, h = 6.2000000000, r1 = 4.6550000000, r2 = 4.5500000000); | ||||
| 				} | ||||
|  | @ -16252,11 +16252,6 @@ difference() { | |||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		translate(v = [-55.537912117550164, 27.807955392906404, 9.0000000000]) { | ||||
| 			translate(v = [-3.0000000000, -11.0000000000, -6.0000000000]) { | ||||
| 				cube(size = [8.5000000000, 12.8000000000, 12.0000000000]); | ||||
| 			} | ||||
| 		} | ||||
| 		translate(v = [-42.537912117550164, 28.377955392906404, 4]) { | ||||
| 			translate(v = [-5.0000000000, 0, -2.2500000000]) { | ||||
| 				cube(size = [10.0000000000, 1.0000000000, 4.5000000000]); | ||||
|  | @ -16283,7 +16278,7 @@ difference() { | |||
| 					cylinder($fn = 18, h = 4.2000000000, r1 = 2.6550000000, r2 = 2.5500000000); | ||||
| 				} | ||||
| 			} | ||||
| 			translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 			translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 				translate(v = [0, 0, 2]) { | ||||
| 					cylinder($fn = 18, h = 4.2000000000, r1 = 2.6550000000, r2 = 2.5500000000); | ||||
| 				} | ||||
|  | @ -16299,18 +16294,6 @@ difference() { | |||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		translate(v = [-55.537912117550164, 27.807955392906404, 9.0000000000]) { | ||||
| 			union() { | ||||
| 				translate(v = [-3.0000000000, -11.0000000000, -3.5000000000]) { | ||||
| 					cube(size = [6.0000000000, 11.0000000000, 7.0000000000]); | ||||
| 				} | ||||
| 				translate(v = [0, 5, 0]) { | ||||
| 					rotate(a = 90, v = [1, 0, 0]) { | ||||
| 						cylinder($fn = 30, h = 10.0000000000, r = 2.6000000000); | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		translate(v = [-42.537912117550164, 28.377955392906404, 4]) { | ||||
| 			translate(v = [-4.5000000000, -4.0000000000, -1.7500000000]) { | ||||
| 				cube(size = [9, 8, 3.5000000000]); | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| // Generated by SolidPython 0.4.8 on 2024-09-05 11:44:27 | ||||
| // Generated by SolidPython 0.4.8 on 2022-02-01 13:57:26 | ||||
| 
 | ||||
| 
 | ||||
| difference() { | ||||
|  | @ -25828,7 +25828,7 @@ difference() { | |||
| 			translate(v = [49.65354174552968, -38.614127899174086, 0.0]) { | ||||
| 				cylinder($fn = 18, h = 1.0000000000, r1 = 2.7500000000, r2 = 2.7500000000); | ||||
| 			} | ||||
| 			translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 			translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 				cylinder($fn = 18, h = 1.0000000000, r1 = 2.7500000000, r2 = 2.7500000000); | ||||
| 			} | ||||
| 			translate(v = [-31.824128050589394, -57.50598575660748, 0.0]) { | ||||
|  | @ -25848,7 +25848,7 @@ difference() { | |||
| 			translate(v = [49.65354174552968, -38.614127899174086, 0.0]) { | ||||
| 				cylinder($fn = 18, h = 2, r1 = 1.7000000000, r2 = 1.7000000000); | ||||
| 			} | ||||
| 			translate(v = [-57.59470256348502, 11.20566972318364, 0.0]) { | ||||
| 			translate(v = [-57.59470256348502, 13.20566972318364, 0.0]) { | ||||
| 				cylinder($fn = 18, h = 2, r1 = 1.7000000000, r2 = 1.7000000000); | ||||
| 			} | ||||
| 			translate(v = [-31.824128050589394, -57.50598575660748, 0.0]) { | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue