Documented camera lens module.

Add cameras to lib.scad

lib.scad

@@ -29,6 +29,7 @@ include <vitamins/batteries.scad>
 include <vitamins/blowers.scad>
 include <vitamins/bulldogs.scad>
 include <vitamins/buttons.scad>
+include <vitamins/cameras.scad>
 include <vitamins/components.scad>
 include <vitamins/displays.scad>
 include <vitamins/extrusions.scad>

libtest.scad

@@ -385,7 +385,7 @@ sk_brackets_y = extrusion_brackets_y + 80;
 kp_pillow_blocks_y = sk_brackets_y + 50;
 scs_bearing_blocks_y = kp_pillow_blocks_y + 60;
 
-translate([x4 + 150, belts_y + 58]) {
+translate([x4 + 200, belts_y + 58]) {
     belt_test();
 
     translate([0, 60])

readme.md

@@ -457,6 +457,7 @@ PCB cameras.
 | Module | Description |
 |:--- |:--- |
 | ```camera(type)``` | Draw specified PCB camera |
+| ```camera_lens(type, offset = 0)``` | Draw the lens stack, with optional offset for making a clearance hole |
 
 ![cameras](tests/png/cameras.png)
 
@@ -464,6 +465,7 @@ PCB cameras.
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```camera(rpi_camera_v1)``` |  Raspberry Pi camera V1 |
+|   1 | ```camera(rpi_camera_v2)``` |  Raspberry Pi camera V2 |
 |   1 | ```camera(rpi_camera)``` |  Raspberry Pi focusable camera |
 
 

vitamins/camera.scad

@@ -29,7 +29,7 @@ function camera_lens(type)          = type[4]; //! Stack of lens parts, can be r
 function camera_connector_pos(type) = type[5]; //! The flex connector block for the camera itself's position
 function camera_connector_size(type)= type[6]; //! The flex connector block for the camera itself's size
 
-module camera_lens(type, offset = 0)
+module camera_lens(type, offset = 0) //! Draw the lens stack, with optional offset for making a clearance hole
     color(grey(20))
         translate(camera_lens_offset(type))
             for(p = camera_lens(type)) {
@@ -81,7 +81,7 @@ module camera(type) {           //! Draw specified PCB camera
                             cube([flex.x, eps, flex.y], center = true);
 
                     translate_z(conn.z - flex.y)
-                        translate(pos - [0, conn.y / 2])
+                        translate([camera_lens_offset(type).x, pos.y] - [0, conn.y / 2])
                              cube([flex.x, eps, flex.y], center = true);
                 }
         }

vitamins/cameras.scad

@@ -35,6 +35,21 @@ rpi_camera_v1 = ["rpi_camera_v1", "Raspberry Pi camera V1", rpi_camera_v1_pcb, [
     [0, 12 - 1.5 - 2.5], [8, 5, 1]
 ];
 
+rpi_camera_v2_pcb = ["", "",  25, 23.862, 1, 2, 2.2, 0, "green", false, [[2, -2], [-2, -2], [2, -14.5], [-2, -14.5]],
+    [
+        [12.5,   2.75,  0, "-flat_flex", true],
+    ],
+    []];
+
+rpi_camera_v2 = ["rpi_camera_v2", "Raspberry Pi camera V2", rpi_camera_v2_pcb, [0, 9.6 - 12],
+    [
+        [[8.5, 8.5, 3], 0],
+        [[0, 0, 4], 7.5 / 2],
+        [[0, 0, 5], 5.5 / 2, [1.5/2, 2/2, 0.5]],
+    ],
+    [-13.8 + 12.5, 23.862 / 2 - 4.7], [8.5, 4, 1]
+];
+
 rpi_camera_pcb = ["", "",  36, 36, 1.6, 0, 3.2, 0, "green", false, [[3.5, -3.5], [-3.5, -3.5], [3.5, 3.5], [-3.5, 3.5]],
     [
         [18,    4.25,  0, "-flat_flex", true],
@@ -53,6 +68,6 @@ rpi_camera = ["rpi_camera", "Raspberry Pi focusable camera", rpi_camera_pcb, [0,
     [0, 18 - 1.5 - 2.5], [8, 5, 1.6]
 ];
 
-cameras = [rpi_camera_v1, rpi_camera];
+cameras = [rpi_camera_v1, rpi_camera, rpi_camera_v2];
 
 use <camera.scad>

vitamins/pcb.scad

@@ -638,14 +638,13 @@ module flex(cutout = false) { //! Draw flexistrip connector
 
                         translate([0, -w / 2 + slot_offset + slot_w / 2])
                             square([slot_l, slot_w], center = true);
-
                     }
         }
     }
 }
 
 small_ff = [[11.8, 0.9], [17, 1.4, 1.2], [12, 1.6, 1.2], [16, 1.1, 1.2]];
-large_ff = [[16,  1.25], [22, 1.5, 2.25],[16, 4.0, 2.5], [21, 0,   2.5]];
+large_ff = [[16,  1.25], [22, 1.5, 2.5], [16, 4.0, 2.5], [21, 0,   2.5]];
 
 function ff_slot(type)  = type[0]; //! Flat flex slot size
 function ff_latch(type) = type[1]; //! Flat flex latch size
@@ -683,8 +682,8 @@ module flat_flex(type, cutout = false) { //! Draw flat flexistrip connector as u
        }
 
        color(grey(80))
-            translate([-back.x / 2, -w / 2 + back.y])
-                cube([back.x, mid.y, mid.z - eps]);
+            translate([-back.x / 2, -w / 2 + back.y + eps])
+                cube([back.x, mid.y - 2 * eps, mid.z - eps]);
     }
 }