diff --git a/docs/specs/main_display_ILI9341.pdf b/docs/specs/main_display_ILI9341.pdf new file mode 100644 index 0000000..ef9388c Binary files /dev/null and b/docs/specs/main_display_ILI9341.pdf differ diff --git a/docs/specs/main_display_ST7735S.pdf b/docs/specs/main_display_ST7735S.pdf deleted file mode 100644 index 17df189..0000000 Binary files a/docs/specs/main_display_ST7735S.pdf and /dev/null differ diff --git a/model/right-half.scad b/model/right-half.scad index 2db645d..4c2080e 100644 --- a/model/right-half.scad +++ b/model/right-half.scad @@ -17,10 +17,10 @@ module right_half_door_only() { } // #right_half_door_only(); -module battery_spacer(cable_cube_additional_length=0) { +module battery_spacer(cable_cube_additional_length=0, cable_cube = 8.25) { length = 106; - rotate([0, 90, 90]) cylinder(d=18.5, h=length); - cable_cube = 8.25; + battery_d = 18; + rotate([0, 90, 90]) cylinder(d=battery_d+1.9, h=length); translate([0, 0, -cable_cube]) cube([cable_cube, length+cable_cube_additional_length, cable_cube]); } // !battery_spacer(); @@ -28,13 +28,13 @@ module battery_spacer(cable_cube_additional_length=0) { module battery_contact() { base_height = 4; - silver_wire_d = 1.15; + silver_wire_d = 1.7; module base_body() { rotate([90, 0, 0]) resize([0, base_height, 0], auto=[false, true, false]) - scale(0.99) - battery_spacer(); + scale(0.92) + battery_spacer(cable_cube=0); } module contact_spring() @@ -42,24 +42,24 @@ module battery_contact() spring_width = 11; translate([-2, -spring_width/2, 0]) difference() { - scale([1.75, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width); - scale([1.75, 1, 1.5]) rotate([-90, 0, 0]) cylinder(d=6, h=spring_width); - translate([-100, 0, -50]) cube(100); + scale([1.5, 1, 1]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width); + scale([0.95, 1, 0.87]) rotate([-90, 0, 0]) cylinder(d=10, h=spring_width); + translate([-101, 0, -50]) cube(100); translate([-50, 0, -100]) cube(100); - translate([0, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]); - translate([0, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]); + translate([-1, spring_width/3-silver_wire_d, 0]) cube([silver_wire_d, silver_wire_d, 50]); + translate([-1, spring_width*2/3, 0]) cube([silver_wire_d, silver_wire_d, 50]); } } + module silver_wire_channels() { - translate([7.3, 0, -6]) - rotate([-15, 0, 0]) - cylinder(d=silver_wire_d, h=15); + translate([6.5, -2.5, -7]) + #cylinder(d=silver_wire_d, h=15); - translate([7.3, 0, -6]) - rotate([15, 0, 0]) - cylinder(d=silver_wire_d, h=15); + translate([6.5, 2.5, -7]) + #cylinder(d=silver_wire_d, h=15); } + // silver_wire_channels(); translate([0, 0, base_height]) rotate([0, 0, 45]) @@ -74,7 +74,7 @@ module battery_contact() silver_wire_channels(); } } -// !battery_contact(); +battery_contact(); module right_half_hinge_only() { module original() { @@ -104,12 +104,12 @@ module right_half_hinge_only() { base_model(); // translate([0, -40, 11]) rotate([0, 0, 90]) battery(); } -// right_half_hinge_only(); +// !right_half_hinge_only(); module right_half() { right_half_door_only(); right_half_hinge_only(); } -right_half(); +// right_half(); // #right_half_components();