Commit 2d8ff5dd authored by William Wadsworth's avatar William Wadsworth
Browse files

low-cost upright assembly images

parent 7939838d
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ Take the [lens spacer][Lens spacer](fromstep){qty:1, cat:printedpart} and confir

## Attach the {{includetext:"Pi Camera", if: var_lens is pi_lens}}{{includetext:"assembled camera module", if: var_lens is c270_lens}} {pagestep}

![](renders/low_cost_optics_assembly_camera_{{var_lens}}.png)
![](renders/low_cost_optics_assembly_camera_{{var_lens}}{{includetext: "_upright", if: var_body is upright}}.png)

{{includetext:"* Locate the dimple on top of the [camera platform][Camera platform](fromstep){qty:1, cat:printedpart} (highlighted with a red circle in the picture.)
* Take the Pi Camera and place it on top of the camera platform so that the centre of the camera sensor is directly above the dimple.
@@ -94,7 +94,7 @@ Take the [lens spacer][Lens spacer](fromstep){qty:1, cat:printedpart} and confir

## Attach the mounting screw {pagestep}

![](renders/low_cost_optics_assembly_screw_{{var_lens}}.png)
![](renders/low_cost_optics_assembly_screw_{{var_lens}}{{includetext: "_upright", if: var_body is upright}}.png)

* Take an [M3 nut]{qty:1, cat:mech} and push it into the nut trap from the top
* Take an [M3x10 cap head screw][M3x10 cap head screws](parts/mechanical.yml#CapScrew_M3x10mm_SS){qty: 1, cat:mech} and screw it into the nut.
@@ -114,7 +114,7 @@ Take the [lens spacer][Lens spacer](fromstep){qty:1, cat:printedpart} and confir

## Connect the ribbon cable {pagestep}

![](renders/low_cost_optics_assembly_ribbon_pi_lens.png)
![](renders/low_cost_optics_assembly_ribbon_pi_lens{{includetext: "_upright", if: var_body is upright}}.png)

* Pull the catch forward on the exposed Pi Camera connector
* Insert the ribbon cable with the contacts towards the board
+9 −11
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ def register_rms_optics_assembly(rendersystem):
def register_low_cost_optics_assembly(rendersystem):
    input_file = "rendering/low_cost_optics_assembly.scad"
    for camera_type in ["pi_camera", "c270"]:
        for upright in ["true", "false"]:
            upright_text = "_upright" if upright == "true" else ""
            if not (camera_type == "c270" and upright):
                lens_type = "c270_lens" if camera_type=="c270" else "pi_lens"
                cameras = []
                imgsizes = []
@@ -91,6 +94,7 @@ def register_low_cost_optics_assembly(rendersystem):
                output_files = []

                for frame in [1, 2, 3]:
                    if upright == "false":
                        cameras.append(Camera(position=[29, 0, 59], angle=[69, 0, 90], distance=290))
                        imgsizes.append([1000, 2000])
                        output_files.append(f'rendering/annotations/low_cost_optics_assembly_tube_lens_{lens_type}{frame}.png')
@@ -99,9 +103,6 @@ def register_low_cost_optics_assembly(rendersystem):
                camera_png_files = []
                # frame 4,5
                for frame in [1, 2]:
            for upright in [True, False]:
                upright_text = "_upright" if upright else ""
                if not (camera_type == "c270" and upright):
                    cameras.append(Camera(position=[1, -8.5, 32], angle=[64, 0, 200], distance=300))
                    imgsizes.append([1200, 2000])
                    output_files.append(f'docs/renders/low_cost_optics_assembly_camera_{lens_type}{upright_text}{frame}.png')
@@ -111,9 +112,6 @@ def register_low_cost_optics_assembly(rendersystem):
                screw_png_files = []
                # frame 6,7,8
                for frame in [1, 2, 3]:
            for upright in [True, False]:
                upright_text = "_upright" if upright else ""
                if not (camera_type == "c270" and upright):
                            cameras.append(Camera(position=[-11, 19, 33], angle=[71, 0, 106], distance=192))
                            imgsizes.append([1000, 2000])
                            output_files.append(f'docs/renders/low_cost_optics_assembly_screw_{lens_type}{upright_text}{frame}.png')
@@ -126,9 +124,9 @@ def register_low_cost_optics_assembly(rendersystem):
                    for frame in [1, 2, 3]:
                        cameras.append(Camera(position=[-7, -7, 40.5], angle=[54, 0, 90], distance=237))
                        imgsizes.append([1200, 2000])
                output_files.append(f'docs/renders/low_cost_optics_assembly_ribbon_{lens_type}{frame}.png')
                        output_files.append(f'docs/renders/low_cost_optics_assembly_ribbon_{lens_type}{upright_text}{frame}.png')
                        ribbon_png_files.append(output_files[-1])
                scad_lines.append(f'render_low_cost_assembly({frame+8}, camera_type = "{camera_type}");')
                        scad_lines.append(f'render_low_cost_assembly({frame+8}, camera_type = "{camera_type}", upright = "{upright}");')

                c270_screw_png_files = []
                # frame 12,13
@@ -159,16 +157,16 @@ def register_low_cost_optics_assembly(rendersystem):
                    f'rendering/annotations/annotate_optics_assembly_{lens_type}.svg'
                )
                rendersystem.register_imagemagick_sequence(
            f'docs/renders/low_cost_optics_assembly_camera_{lens_type}.png',
                    f'docs/renders/low_cost_optics_assembly_camera_{lens_type}{upright_text}.png',
                    camera_png_files
                )
                rendersystem.register_imagemagick_sequence(
            f'docs/renders/low_cost_optics_assembly_screw_{lens_type}.png',
                    f'docs/renders/low_cost_optics_assembly_screw_{lens_type}{upright_text}.png',
                    screw_png_files
                )
                if camera_type == "pi_camera":
                    rendersystem.register_imagemagick_sequence(
                "docs/renders/low_cost_optics_assembly_ribbon_pi_lens.png",
                        f'docs/renders/low_cost_optics_assembly_ribbon_pi_lens{upright_text}.png',
                        ribbon_png_files
                    )

+1 −1

File changed.

Contains only whitespace changes.