Commit cf390577 authored by William Wadsworth's avatar William Wadsworth
Browse files

adjust oiling renders

parent 6bffd908
Loading
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -40,10 +40,11 @@ There is one "actuator column" for each of the three axes of the OpenFlexure Mic

![washer direction](diagrams/washer-direction.png)
![add washers to leadscrew](renders/actuator_assembly_washers{{var_actuators, default:}}.png)
![add washers to leadscrew 2](renders/actuator_assembly_washers2{{var_actuators, default:}}.png)
![oil lead screw](renders/actuator_assembly_oil{{var_actuators, default:}}.png)

* Line up two [washers][M3 stainless steel washers]{qty:{{var_n_washers, default:6}}, cat:mech} so that the slightly curved sides are facing each other
* Take the {{includetext: "thumbwheel", if: var_actuators is _manual}}{{includetext: "gear", if: var_actuators is not _manual }} with the hex bolt mounted into it, and push it through the two washers
* Take the {{includetext: "thumbwheel", if: var_actuators is _manual}}{{includetext: "gear", if: var_actuators is not _manual }} with the hex bolt mounted into it, and slip the two washers onto the thread
* Add one drop of [light oil]{qty:{{var_n_actuators, default:3}} drops, cat:consumable, Note: "Don't skip this or you will damage the screws"} onto the screw thread. 


+8 −6
Original line number Diff line number Diff line
@@ -456,18 +456,19 @@ def register_prepare_stand(rendersystem):
def register_actuator_assembly(rendersystem):
    input_file = "rendering/actuator_assembly.scad"
    cameras = [
        Camera(position=[2, 5, 14], angle=[33, 0, 242], distance=390),
        Camera(position=[2, 5, 14], angle=[33, 0, 242], distance=390),      # parts
        Camera(position=[-4.4, 7, 17.5], angle=[142, 319, 10], distance=190),
        Camera(position=[-4.4, 7, 17.5], angle=[142, 319, 10], distance=190),
        Camera(position=[-4.4, 7, 17.5], angle=[142, 319, 10], distance=190),
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),     # nut
        Camera(position=[1, -7, 3], angle=[236, 0, 35], distance=160),      # washers
        Camera(position=[1, -7, 3], angle=[236, 0, 35], distance=160),
        Camera(position=[9, -15, -13], angle=[236, 0, 35], distance=225),   # oil
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),
        Camera(position=[45, 100, 65], angle=[80, -45, 190], distance=190),
        Camera(position=[80, 94, 44], angle=[80, 270, 190], distance=300),
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),
        Camera(position=[4, 35, 35], angle=[71, 0, 186], distance=330),
        Camera(position=[0, 50, 30], angle=[62, 0, 145], distance=260),
        Camera(position=[0, 50, 30], angle=[62, 0, 145], distance=260),     # separate z actuator
    ]
    imgsize = [2400, 2000]
    pngs = [
@@ -477,6 +478,7 @@ def register_actuator_assembly(rendersystem):
        "actuator_assembly_lead_screw_only",
        "actuator_assembly_nut",
        "actuator_assembly_washers",
        "actuator_assembly_washers2",
        "actuator_assembly_oil",
        "actuator_assembly_gear",
        "actuator_assembly_gear2",
@@ -487,7 +489,7 @@ def register_actuator_assembly(rendersystem):
    for manual in ["false", "true"]:
        body = "_manual" if manual=="true" else ""
        for i, camera in enumerate(cameras):
            if (i in (0, 4, 7, 8, 9, 10)) and (manual=="false"):
            if (i in (0, 4, 8, 9, 10, 11)) and (manual=="false"):
                bodies = ["", "_upright"]
                for this_body in bodies:
                    optics_version = "upright" if this_body=="_upright" else "rms"
+16 −7
Original line number Diff line number Diff line
@@ -34,27 +34,36 @@ module render_actuator_assembly(frame, manual=false, optics_version="rms"){
    }else if (frame==5){
        body_with_x_nut(manual=manual, upright=upright, exploded=true);
    }else if (frame==6){
        x_lead_screw_assembly(manual=manual, exploded=true);
        rotate_y(90){
            lead_screw_assembly(manual=manual, exploded=true, construction_offset=[0, 0, -5]);
        }
    }
    else if (frame==7){
        x_lead_screw_assembly(manual=manual, exploded=false);
        rotate_y(90){
            lead_screw_assembly(manual=manual, exploded=false);
        }
    }
    else if (frame==8){
        rotate_y(90){
            lead_screw_assembly(manual=manual, exploded=false);
            place_part(x_lead_oil_placement()){
                oil_bottle();
            }
        }
    else if (frame==8){
        body_with_x_gear(manual=manual, upright=upright, exploded=true, lifted=false);
    }
    else if (frame==9){
        body_with_x_gear(manual=manual, upright=upright, exploded=false, lifted=false);
        body_with_x_gear(manual=manual, upright=upright, exploded=true, lifted=false);
    }
    else if (frame==10){
        body_with_assembled_actuators(manual=manual, upright=upright, x_only=true);
        body_with_x_gear(manual=manual, upright=upright, exploded=false, lifted=false);
    }
    else if (frame==11){
        body_with_assembled_actuators(manual=manual, upright=upright, x_only=false);
        body_with_assembled_actuators(manual=manual, upright=upright, x_only=true);
    }
    else if (frame==12){
        body_with_assembled_actuators(manual=manual, upright=upright, x_only=false);
    }
    else if (frame==13){
        separate_z_actuator_with_assembled_actuators(manual=manual);
    }
    
+3 −3
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ function x_lead_assembly_placement_exp() = create_placement_dict(x_lead_assembly
function y_lead_assembly_placement() = create_placement_dict(y_lead_assembly_pos(), rotation1=[0, 0, 135]);
function z_lead_assembly_placement() = create_placement_dict(z_lead_assembly_pos(), rotation3=z_actuator_rot(), rotation1=[0, 0, -90]);

function x_lead_oil_placement() = create_placement_dict(x_lead_assembly_pos()+[2,2,-12],
                                                        [0, 0, 20],
                                                        [0, -100, 0]);
function x_lead_oil_placement() = create_placement_dict(translation=[3,-1,-12],
                                                        rotation3=[0, 0, -20],
                                                        rotation1=[0, -100, 0]);

function x_foot_placement() = create_placement_dict(x_actuator_pos(PARAMS), [0, 0, -45]);
function y_foot_placement() = create_placement_dict(y_actuator_pos(PARAMS), [0, 0, 45]);