Corrected core XY comment.

Fix to centering of carbon fiber tubing.

lib.scad

@@ -54,6 +54,7 @@ include <vitamins/ring_terminals.scad>
 include <vitamins/rails.scad>
 include <vitamins/rod.scad>
 include <vitamins/scs_bearing_blocks.scad>
+include <vitamins/shaft_couplings.scad>
 include <vitamins/sheets.scad>
 include <vitamins/sk_brackets.scad>
 include <vitamins/spools.scad>

libtest.scad

@@ -47,6 +47,7 @@ use <tests/bulldogs.scad>
 use <tests/buttons.scad>
 use <tests/cable_strips.scad>
 use <tests/cameras.scad>
+use <tests/camera_housing.scad>
 use <tests/circlips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
@@ -85,6 +86,7 @@ use <tests/rod.scad>
 use <tests/screws.scad>
 use <tests/SCS_bearing_blocks.scad>
 use <tests/sealing_strip.scad>
+use <tests/shaft_couplings.scad>
 use <tests/sheets.scad>
 use <tests/SK_brackets.scad>
 use <tests/spades.scad>
@@ -363,6 +365,9 @@ translate([x3 + 170, veroboard_y + 16])
 translate([x3, d_connectors_y])
     d_connectors();
 
+translate([x3 + 170, d_connectors_y - 10])
+    camera_housings();
+
 translate([x3, iecs_y])
     iecs();
 
@@ -429,6 +434,9 @@ translate([x4, sk_brackets_y])
 translate([x4, extrusion_brackets_y])
     extrusion_brackets();
 
+translate([x4 + 120, extrusion_brackets_y])
+    shaft_couplings();
+
 translate([x4, scs_bearing_blocks_y])
     scs_bearing_blocks();
 

printed/camera_housing.scad

@@ -0,0 +1,392 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Housings for PCB cameras.
+//
+include <../core.scad>
+include <../vitamins/cameras.scad>
+use <../vitamins/pcb.scad>
+use <../vitamins/insert.scad>
+
+wall = 1.75;
+min_wall = 2 * extrusion_width;
+clearance = 0.2;
+
+connector_size = [23, 6, 2.65]; // Worst case size of flat flex connector
+
+cam_back_clearance = round_to_layer(1.5);    // Clearance for components on the back of the pcb
+cam_back_overlap = 1;                        // How much the back overlaps the edge of the pcb
+cam_back_wall = min_wall;
+
+function cam_front_clearance(cam) = round_to_layer(camera_connector_size(cam).z + clearance);
+
+function cam_back_size(cam) = let(
+    pcb = camera_pcb(cam),
+    pcb_size = pcb_size(pcb),
+    nut = screw_nut(pcb_screw(pcb)),
+    holes = [for(h = pcb_holes(pcb)) pcb_coord(pcb, h).x],
+    pitch = max(holes) - min(holes),
+    length = pitch + 2 * (nut_radius(nut) + min_wall),
+    width = pcb_size.y + (length - pcb_size.x) * cos(30)
+    ) [length, width, wall + max(connector_size.z, cam_back_clearance + nut_trap_depth(nut))];
+
+
+function cam_front_size(cam) = cam_back_size(cam) + [ //! Outside dimensions of the case
+    2 * (wall + clearance),
+    2 * (wall + clearance),
+    pcb_thickness(camera_pcb(cam)) + cam_front_clearance(cam) + wall
+];
+
+hinge_screw = M2_cap_screw;
+hinge_nut = screw_nut(hinge_screw);
+hinge_screw_length = 12;
+
+hinge_r = nut_trap_radius(hinge_nut) + 3 * extrusion_width;
+hinge_h = wall + nut_trap_depth(hinge_nut);
+hinge_offset = hinge_r + 1;
+
+bracket_screw = M3_dome_screw;
+
+function cam_screw_length(cam) = let(
+    front = cam_front_size(cam),
+    screw = pcb_screw(camera_pcb(cam)),
+    nut = screw_nut(screw)
+    ) screw_longer_than(front.z + washer_thickness(screw_washer(screw)) - nut_trap_depth(nut) + nut_thickness(nut, true));
+
+function hinge_z(cam) = cam_screw_length(cam) - hinge_r;
+
+module cam_holes(cam) {
+    pcb = camera_pcb(cam);
+    lens_y = camera_lens_offset(cam).y;
+    two_holes = !!len([for (h = pcb_holes(pcb)) if(abs(pcb_coord(pcb, h).y - lens_y) < 1) true]);
+    pcb_screw_positions(pcb)                                                    // screw holes
+        if($i > 1 || !two_holes)
+            children();
+}
+
+module rpi_camera_focus_ring_stl() { //! Focus ring the glue onto RPI lens
+    stl("rpi_camera_focus_ring");
+
+    rad = 15 / 2;
+    hole_r1 = 2.5 / 2;
+    hole_r2 = 5 / 2;
+    thickness = 3;
+    flutes = 8;
+    angle = 180 / flutes;
+    x = rad / (sin(angle / 2) + cos(angle / 2));
+    r = x * sin(angle / 2);
+
+    difference() {
+        linear_extrude(height = thickness, convexity = 5)
+            difference() {
+                union() {
+                    circle(x);
+                    for(i = [0 : flutes - 1])
+                        rotate([0, 0, 2 * angle * i])
+                            translate([x, 0])
+                                circle(r);
+                }
+                for(i = [0 : flutes - 1])
+                    rotate([0, 0, 2 * angle * i + angle])
+                        translate([x, 0])
+                            circle(r);
+            }
+        hull() {
+            poly_cylinder(r = hole_r1, h = 0.1, center = true);
+
+            translate([0, 0, thickness])
+                poly_cylinder(r = hole_r2, h = 0.1, center = true);
+        }
+    }
+}
+
+module camera_back(cam) { //! Make the STL for a camera case back
+    stl(str("camera_back_", cam[0]));
+    pcb = camera_pcb(cam);
+    back = cam_back_size(cam);
+    screw = pcb_screw(pcb);
+    nut = screw_nut(screw);
+
+    translate_z(back.z)
+        hflip()
+            difference() {
+                translate_z(back.z / 2)
+                    cube(back, center = true);
+
+                translate([0, -cam_back_overlap])
+                    cube([pcb_length(pcb) - 2 * cam_back_overlap, pcb_width(pcb), 2 * cam_back_clearance], center = true);
+
+                translate([0, -pcb_width(pcb) / 2])
+                    cube([connector_size.x + 2 * clearance, 2 * connector_size.y + 1, 2 * round_to_layer(connector_size.z + clearance)], center = true);
+
+                translate_z(back.z)
+                    cam_holes(cam)
+                        hflip()
+                            nut_trap(screw, nut, supported = true);
+            }
+}
+
+module camera_front(cam, hinge = 0) { //! Make the STL for a camera case front
+    stl(str("camera_front_", cam[0]));
+    front = cam_front_size(cam);
+    back = cam_back_size(cam);
+    pcb = camera_pcb(cam);
+    pcb_size = pcb_size(pcb);
+    lens_offset = camera_lens_offset(cam);
+    screw = pcb_screw(pcb);
+
+    shelf = front.z - back.z;
+
+    connector_slot = connector_size + 2 * [clearance, 0, layer_height];
+    rad = wall;
+    led_hole_r = 1;
+    led_clearance = [5,   2, 1 * 2];
+    res_clearance = [3.5, 2, 1 * 2];
+
+    conn_pos = camera_connector_pos(cam);
+    conn = camera_connector_size(cam);
+    sensor_length = conn_pos.y + conn.y / 2 - lens_offset.y + clearance;
+
+    module hinge_pos()
+        if(!is_undef(hinge))
+            rotate(hinge * 90)
+                translate([0, (hinge ? front.x * hinge : front.y) / 2 + hinge_offset, hinge_r])
+                    children();
+
+    difference() {
+        union() {
+            hull()
+                for(x = [-1, 1], y = [-1, 1])
+                    translate([x * (front.x / 2 - rad), y * (front.y / 2 - rad)])
+                        hull() {    // 3D truncated teardrop gives radiused edges without exceeding 45 degree overhang
+                            translate_z(front.z - 1)
+                                cylinder(r = rad, h = 1);
+
+                            translate_z(rad)
+                                sphere(rad);
+
+                            cylinder(r = rad * (sqrt(2) - 1), h = eps);
+                        }
+
+            hinge_pos()
+                hull() {
+                    rotate([-90, 0, -90])
+                        teardrop(r = hinge_r, h = hinge_h, center = false);
+
+                    translate([0, -10, -hinge_r])
+                        cube([hinge_h, eps, 2 * hinge_r]);
+                }
+        }
+
+        hinge_pos()
+            rotate([90, 0, 90])
+                teardrop_plus(r = screw_clearance_radius(hinge_screw), h = 100, center = true);
+
+        translate_z(front.z / 2 + shelf - layer_height)                                 // recess for the back
+            cube([back.x + 2 * clearance, back.y + 2 * clearance, front.z], center = true);
+
+        translate_z(front.z / 2 + shelf - pcb_size.z)                                   // recess for PCB
+            cube([pcb_size.x + 2 * clearance, pcb_size.y + 2 * clearance, front.z], center = true);
+
+        translate_z(shelf)
+            hflip() {
+                pcb_component_position(pcb, "smd_led")                                  // clearance for LED
+                    cube(led_clearance, center = true);
+
+                pcb_component_position(pcb, "smd_res")                                  // clearance for resistor
+                    cube(res_clearance, center = true);
+            }
+
+        translate([conn_pos.x, lens_offset.y + sensor_length / 2, shelf - pcb_size.z])  // clearance for sensor connector
+            cube([conn.x + 2 * clearance, sensor_length, 2 * cam_front_clearance(cam)], center = true);
+
+        translate([0, -front.y / 2, shelf + front.z / 2])                               // slot for connector
+            cube([connector_slot.x, connector_slot.y, front.z], center = true);
+
+        translate_z(cam_back_clearance + layer_height)
+            cam_holes(cam)
+                rotate(90)
+                    poly_cylinder(r = screw_clearance_radius(screw), h = 100, center = true);
+
+        translate_z(shelf - pcb_size.z)
+            hflip()
+                camera_lens(cam, clearance);
+
+        hflip()
+            pcb_component_position(pcb, "smd_led")
+                rotate(45)
+                    poly_cylinder(r = led_hole_r, h = 100, center = true);              // hole for led
+    }
+}
+
+function bracket_thickness(cam) = max(wall, min(3.5, hinge_z(cam) - hinge_r - 1));
+
+module camera_bracket_screw_positions(cam) { //! Position children at the bracket screw positions
+    r = washer_radius(screw_washer(bracket_screw)) + 0.5;
+    wide = bracket_thickness(cam) == wall;
+    pitch = wide ? cam_front_size(cam).x / 2 - r : hinge_h + 1 + r;
+
+    for(side = [-1, 1])
+        translate([side * pitch, 0])
+            children();
+}
+
+module camera_bracket_position(cam) //! Position children at the bracket position
+    translate([0,  cam_front_size(cam).y / 2 + hinge_offset])
+        children();
+
+module camera_bracket(cam) { //! Make the STL for the camera bracket
+    stl(str("camera_bracket_", cam[0]));
+
+    t = bracket_thickness(cam);
+    z = hinge_z(cam);
+    translate([hinge_h / 2, 0])
+        difference() {
+            hull() {
+                translate_z(eps / 2)
+                    cube([hinge_h, 2 * hinge_r, eps], center = true);
+
+                translate_z(z)
+                    rotate([0, 90, 0])
+                        cylinder(r = hinge_r, h = hinge_h, center = true);
+            }
+            translate([hinge_h / 2, 0, z])
+                rotate([90, 0, 90])
+                    nut_trap(hinge_screw, screw_nut(hinge_screw), horizontal = true);
+        }
+
+    linear_extrude(t)
+        difference() {
+            hull()
+                camera_bracket_screw_positions(cam)
+                    circle(washer_radius(screw_washer(bracket_screw)) + 0.5);
+
+            camera_bracket_screw_positions(cam)
+                poly_circle(screw_clearance_radius(bracket_screw));
+        }
+}
+
+module camera_assembly(cam, angle = 0) //! Camera case assembly
+assembly(str("camera_", cam[0])) {
+    front = cam_front_size(cam);
+    screw = pcb_screw(camera_pcb(cam));
+    nut = screw_nut(screw);
+    screw_length = cam_screw_length(cam);
+    hinge_z = hinge_z(cam);
+    hinge_pos = [0, front.y / 2  + hinge_offset, -hinge_r];
+
+    camera_bracket_position(cam) {
+        nut = screw_nut(hinge_screw);
+
+        stl_colour(pp1_colour) render()
+            camera_bracket(cam);
+
+        translate([-hinge_h, 0, hinge_z(cam)])
+            rotate([-90, 0, 90]) {
+                vflip()
+                    translate_z(2 * hinge_h - nut_trap_depth(nut))
+                        nut(nut, true);
+
+                screw_and_washer(hinge_screw, screw_longer_than(2 * hinge_h));
+            }
+    }
+
+    translate_z(hinge_z(cam) + hinge_r)
+        translate(hinge_pos)
+            rotate([-angle, 0, 0])
+                translate(-hinge_pos) {
+                    translate_z(cam_back_size(cam).z - front.z)
+                        camera(cam);
+
+                    stl_colour(pp1_colour) render()
+                        translate_z(-front.z)
+                            camera_back(cam);
+
+                    cam_holes(cam) {
+                        screw_and_washer(screw, screw_length);
+
+                        translate_z(-front.z + nut_trap_depth(nut))
+                            vflip()
+                                nut(nut, true);
+                    }
+
+                    *translate(camera_lens_offset(cam))
+                        translate_z(1.5)
+                            stl_colour(pp1_colour) render()
+                                rpi_camera_focus_ring_stl();
+
+                    stl_colour(pp2_colour) render()
+                        hflip()
+                            camera_front(cam, 0);
+                }
+}
+
+module camera_fastened_assembly(cam, thickness, angle = 0) {
+    camera_assembly(cam, angle);
+
+    camera_bracket_position(cam)
+        camera_bracket_screw_positions(cam) {
+            nut = screw_nut(bracket_screw);
+            washer = screw_washer(bracket_screw);
+            t = bracket_thickness(cam);
+            screw_length = screw_longer_than(thickness + t + nut_thickness(nut, true) + 2 * washer_thickness(washer));
+            vflip()
+                translate_z(thickness)
+                    screw_and_washer(bracket_screw, screw_length);
+
+            translate_z(t)
+                nut_and_washer(nut, true);
+        }
+}
+
+module camera_back_rpi_camera_stl()    camera_back(rpi_camera);
+module camera_back_rpi_camera_v1_stl() camera_back(rpi_camera_v1);
+module camera_back_rpi_camera_v2_stl() camera_back(rpi_camera_v2);
+
+module camera_front_rpi_camera_stl()    camera_front(rpi_camera);
+module camera_front_rpi_camera_v1_stl() camera_front(rpi_camera_v1);
+module camera_front_rpi_camera_v2_stl() camera_front(rpi_camera_v2);
+
+module camera_bracket_rpi_camera_stl()    camera_bracket(rpi_camera);
+module camera_bracket_rpi_camera_v1_stl() camera_bracket(rpi_camera_v1);
+module camera_bracket_rpi_camera_v2_stl() camera_bracket(rpi_camera_v2);
+
+module camera_rpi_camera_assembly()    camera_assembly(rpi_camera);
+module camera_rpi_camera_v1_assembly() camera_assembly(rpi_camera_v1);
+module camera_rpi_camera_v2_assembly() camera_assembly(rpi_camera_v2);
+
+module camera_housing(cam) {
+    front = cam_front_size(cam);
+
+    camera_front(cam, 0);
+
+    translate([front.x, 0])
+        camera_back(cam);
+
+    translate([-front.x / 2 - 2 - hinge_r, 0])
+        rotate(90)
+            camera_bracket(cam);
+}
+
+cam = rpi_camera_v2;
+if($preview)
+    camera_fastened_assembly(cam, 3);
+else
+    camera_housing(cam);

readme.md

@@ -23,27 +23,28 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <tr><td> <a href = "#Axials">Axials</a> </td><td> <a href = "#Jack">Jack</a> </td><td> <a href = "#Rails">Rails</a> </td><td> <a href = "#Box">Box</a> </td><td> <a href = "#Annotation">Annotation</a> </td><td> <a href = "#BOM">BOM</a> </td></tr>
 <tr><td> <a href = "#Ball_bearings">Ball_bearings</a> </td><td> <a href = "#KP_pillow_blocks">KP_pillow_blocks</a> </td><td> <a href = "#Ring_terminals">Ring_terminals</a> </td><td> <a href = "#Butt_box">Butt_box</a> </td><td> <a href = "#Bezier">Bezier</a> </td><td> <a href = "#Clip">Clip</a> </td></tr>
 <tr><td> <a href = "#Batteries">Batteries</a> </td><td> <a href = "#LDRs">LDRs</a> </td><td> <a href = "#Rockers">Rockers</a> </td><td> <a href = "#Cable_grommets">Cable_grommets</a> </td><td> <a href = "#Catenary">Catenary</a> </td><td> <a href = "#Global">Global</a> </td></tr>
-<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#LED_meters">LED_meters</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
-<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#SCS_bearing_blocks">SCS_bearing_blocks</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
-<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#SK_brackets">SK_brackets</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Gears">Gears</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
-<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#SMDs">SMDs</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
-<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Horiholes">Horiholes</a> </td><td></td></tr>
-<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Magnets">Magnets</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Layout">Layout</a> </td><td></td></tr>
-<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Maths">Maths</a> </td><td></td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
-<tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
-<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
-<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
-<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
-<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
-<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
-<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
-<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#IECs">IECs</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
-<tr><td> <a href = "#Inserts">Inserts</a> </td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Belts">Belts</a> </td><td> <a href = "#LED_meters">LED_meters</a> </td><td> <a href = "#Rod">Rod</a> </td><td> <a href = "#Camera_housing">Camera_housing</a> </td><td> <a href = "#Dogbones">Dogbones</a> </td><td> <a href = "#Polyholes">Polyholes</a> </td></tr>
+<tr><td> <a href = "#Blowers">Blowers</a> </td><td> <a href = "#LEDs">LEDs</a> </td><td> <a href = "#SCS_bearing_blocks">SCS_bearing_blocks</a> </td><td> <a href = "#Carriers">Carriers</a> </td><td> <a href = "#Fillet">Fillet</a> </td><td> <a href = "#Rounded_rectangle">Rounded_rectangle</a> </td></tr>
+<tr><td> <a href = "#Bulldogs">Bulldogs</a> </td><td> <a href = "#Leadnuts">Leadnuts</a> </td><td> <a href = "#SK_brackets">SK_brackets</a> </td><td> <a href = "#Corner_block">Corner_block</a> </td><td> <a href = "#Gears">Gears</a> </td><td> <a href = "#Sphere">Sphere</a> </td></tr>
+<tr><td> <a href = "#Buttons">Buttons</a> </td><td> <a href = "#Light_strips">Light_strips</a> </td><td> <a href = "#SMDs">SMDs</a> </td><td> <a href = "#Door_hinge">Door_hinge</a> </td><td> <a href = "#Hanging_hole">Hanging_hole</a> </td><td> <a href = "#Teardrops">Teardrops</a> </td></tr>
+<tr><td> <a href = "#Cable_strips">Cable_strips</a> </td><td> <a href = "#Linear_bearings">Linear_bearings</a> </td><td> <a href = "#SSRs">SSRs</a> </td><td> <a href = "#Door_latch">Door_latch</a> </td><td> <a href = "#Horiholes">Horiholes</a> </td><td></td></tr>
+<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Magnets">Magnets</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Fan_guard">Fan_guard</a> </td><td> <a href = "#Layout">Layout</a> </td><td></td></tr>
+<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Maths">Maths</a> </td><td></td></tr>
+<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Shaft_couplings">Shaft_couplings</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Offset">Offset</a> </td><td></td></tr>
+<tr><td> <a href = "#DIP">DIP</a> </td><td> <a href = "#Microview">Microview</a> </td><td> <a href = "#Sheets">Sheets</a> </td><td> <a href = "#Foot">Foot</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</a> </td><td> <a href = "#Modules">Modules</a> </td><td> <a href = "#Spades">Spades</a> </td><td> <a href = "#Handle">Handle</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</a> </td><td> <a href = "#Nuts">Nuts</a> </td><td> <a href = "#Spools">Spools</a> </td><td> <a href = "#PCB_mount">PCB_mount</a> </td><td> <a href = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</a> </td><td> <a href = "#O_ring">O_ring</a> </td><td> <a href = "#Springs">Springs</a> </td><td> <a href = "#PSU_shroud">PSU_shroud</a> </td><td> <a href = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</a> </td><td> <a href = "#Opengrab">Opengrab</a> </td><td> <a href = "#Stepper_motors">Stepper_motors</a> </td><td> <a href = "#Printed_box">Printed_box</a> </td><td> <a href = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</a> </td><td> <a href = "#PCB">PCB</a> </td><td> <a href = "#Swiss_clips">Swiss_clips</a> </td><td> <a href = "#Ribbon_clamp">Ribbon_clamp</a> </td><td> <a href = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</a> </td><td> <a href = "#PCBs">PCBs</a> </td><td> <a href = "#Toggles">Toggles</a> </td><td> <a href = "#SSR_shroud">SSR_shroud</a> </td><td> <a href = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</a> </td><td> <a href = "#PSUs">PSUs</a> </td><td> <a href = "#Transformers">Transformers</a> </td><td> <a href = "#Screw_knob">Screw_knob</a> </td><td> <a href = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Green_terminals">Green_terminals</a> </td><td> <a href = "#Panel_meters">Panel_meters</a> </td><td> <a href = "#Tubings">Tubings</a> </td><td> <a href = "#Socket_box">Socket_box</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hot_ends">Hot_ends</a> </td><td> <a href = "#Pillars">Pillars</a> </td><td> <a href = "#Variacs">Variacs</a> </td><td> <a href = "#Strap_handle">Strap_handle</a> </td><td></td><td></td></tr>
+<tr><td> <a href = "#Hygrometer">Hygrometer</a> </td><td> <a href = "#Pin_headers">Pin_headers</a> </td><td> <a href = "#Veroboard">Veroboard</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#IECs">IECs</a> </td><td> <a href = "#Pulleys">Pulleys</a> </td><td> <a href = "#Washers">Washers</a> </td><td></td><td></td><td></td></tr>
+<tr><td> <a href = "#Inserts">Inserts</a> </td><td></td><td> <a href = "#Wire">Wire</a> </td><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td> <a href = "#Zipties">Zipties</a> </td><td></td><td></td><td></td></tr>
 </table>
 
 ---
@@ -207,7 +208,7 @@ exposing enough information to make a battery box.
 <a name="Belts"></a>
 ## Belts
 Models timing belt running over toothed or smooth pulleys and calculates an accurate length.
-Only models 2D paths, so not core XY!
+Only models 2D paths, so not crossed belt core XY!
 
 To make the back of the belt run against a smooth pulley on the outside of the loop specify a negative pitch radius.
 
@@ -249,15 +250,16 @@ Individual teeth are not drawn, instead they are represented by a lighter colour
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
 |   1 | ```belt(GT2x6, [ ... ])``` |  Belt GT2 x 6mm x 128mm |
-|   1 | ```belt(GT2x6, [ ... ], 80, [0, 0])``` |  Belt GT2 x 6mm x 696mm |
+|   2 | ```belt(GT2x6, [ ... ], 80, [0, 0])``` |  Belt GT2 x 6mm x 572mm |
 |   1 | ```belt(T2p5x6, [ ... ])``` |  Belt T2.5 x 6mm x 130mm |
 |   1 | ```belt(T5x10, [ ... ])``` |  Belt T5 x 10mm x 130mm |
 |   1 | ```belt(T5x6, [ ... ])``` |  Belt T5 x 6mm x 130mm |
-|   1 | ```insert(F1BM3)``` |  Heatfit insert M3 |
-|   2 | ```pulley(GT2x20_toothed_idler)``` |  Pulley GT2 idler 20 teeth |
+|   2 | ```insert(F1BM3)``` |  Heatfit insert M3 |
+|   2 | ```pulley(GT2x16_toothed_idler)``` |  Pulley GT2 idler 16 teeth |
+|   4 | ```pulley(GT2x20_toothed_idler)``` |  Pulley GT2 idler 20 teeth |
 |   2 | ```pulley(GT2x16_plain_idler)``` |  Pulley GT2 idler smooth 9.63mm |
 |   2 | ```pulley(GT2x20ob_pulley)``` |  Pulley GT2OB 20 teeth |
-|   1 | ```screw(M3_cs_cap_screw, 20)``` |  Screw M3 cs cap x 20mm |
+|   2 | ```screw(M3_cs_cap_screw, 20)``` |  Screw M3 cs cap x 20mm |
 |   4 | ```screw(M3_grub_screw, 6)``` |  Screw M3 grub x  6mm |
 
 
@@ -756,6 +758,7 @@ LCD dispays.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
+|   1 | ```display(BigTreeTech_TFT35v3_0)``` |  BigTreeTech TFT35 v3.0 |
 |   1 | ```display(HDMI5)``` |  HDMI display 5" |
 |   1 | ```display(LCD1602A)``` |  LCD display 1602A |
 |   1 | ```display(LCDS7282B)``` |  LCD display S-7282B |
@@ -1104,7 +1107,7 @@ Needs updating as mostly obsolete versions.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| ```hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0])``` | Draw specified hot end |
+| ```hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0], bowden = false)``` | Draw specified hot end |
 
 ![hot_ends](tests/png/hot_ends.png)
 
@@ -3054,6 +3057,41 @@ Sealing strip from B&Q used to seal around the door of 3D printers.
 |   1 | ```sealing_strip(100)``` |  Sealing strip 10mm x 4mm x 100mm |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Shaft_couplings"></a>
+## Shaft_couplings
+Shaft couplings
+
+
+[vitamins/shaft_couplings.scad](vitamins/shaft_couplings.scad) Object definitions.
+
+[vitamins/shaft_coupling.scad](vitamins/shaft_coupling.scad) Implementation.
+
+[tests/shaft_couplings.scad](tests/shaft_couplings.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```sc_diameter(type)``` | Coupling outer diameter |
+| ```sc_diameter1(type)``` | Diameter of smaller shaft |
+| ```sc_diameter2(type)``` | Diameter of larger shaft |
+| ```sc_length(type)``` | Coupling length |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```shaft_coupling(type, colour = "silver")``` | Draw the shaft coupling |
+
+![shaft_couplings](tests/png/shaft_couplings.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```shaft_coupling(SC_5x8_rigid)``` |  Shaft coupling SC_5x8_rigid |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -4225,6 +4263,72 @@ of conductive panels, an extra layer of insulation.
 |   1 | round_grommet_top_60_3.stl |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Camera_housing"></a>
+## Camera_housing
+Housings for PCB cameras.
+
+
+[printed/camera_housing.scad](printed/camera_housing.scad) Implementation.
+
+[tests/camera_housing.scad](tests/camera_housing.scad) Code for this example.
+
+### Functions
+| Function | Description |
+|:--- |:--- |
+| ```cam_front_size(cam)``` | Outside dimensions of the case |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```camera_assembly(cam, angle = 0)``` | Camera case assembly |
+| ```camera_back(cam)``` | Make the STL for a camera case back |
+| ```camera_bracket(cam)``` | Make the STL for the camera bracket |
+| ```camera_bracket_position(cam)``` | Position children at the bracket position |
+| ```camera_bracket_screw_positions(cam)``` | Position children at the bracket screw positions |
+| ```camera_front(cam, hinge = 0)``` | Make the STL for a camera case front |
+| ```rpi_camera_focus_ring_stl()``` | Focus ring the glue onto RPI lens |
+
+![camera_housing](tests/png/camera_housing.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   7 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
+|  10 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|   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 |
+|   7 | ```screw(M2_cap_screw, 10)``` |  Screw M2 cap x 10mm |
+|   4 | ```screw(M3_cap_screw, 16)``` |  Screw M3 cap x 16mm |
+|   4 | ```screw(M3_dome_screw, 10)``` |  Screw M3 dome x 10mm |
+|   2 | ```screw(M3_dome_screw, 12)``` |  Screw M3 dome x 12mm |
+|   7 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
+|  16 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+
+### Printed
+| Qty | Filename |
+| ---:|:--- |
+|   1 | camera_back_rpi_camera.stl |
+|   1 | camera_back_rpi_camera_v1.stl |
+|   1 | camera_back_rpi_camera_v2.stl |
+|   1 | camera_bracket_rpi_camera.stl |
+|   1 | camera_bracket_rpi_camera_v1.stl |
+|   1 | camera_bracket_rpi_camera_v2.stl |
+|   1 | camera_front_rpi_camera.stl |
+|   1 | camera_front_rpi_camera_v1.stl |
+|   1 | camera_front_rpi_camera_v2.stl |
+
+### Assemblies
+| Qty | Name |
+| ---:|:--- |
+|   1 | camera_rpi_camera_assembly |
+|   1 | camera_rpi_camera_v1_assembly |
+|   1 | camera_rpi_camera_v2_assembly |
+
+
 <a href="#top">Top</a>
 
 ---

tests/belts.scad

@@ -23,46 +23,52 @@ use <../vitamins/insert.scad>
 use <../utils/layout.scad>
 
 module belt_test() {
-    p1 = [75,  -50];
     p2 = [-75, -50];
     p3 = [-75, 100];
     p4 = [75,  100];
 
-    p5 = [75  - pulley_pr(GT2x20ob_pulley) - pulley_pr(GT2x16_plain_idler),  -pulley_pr(GT2x16_plain_idler)];
-    p6 = [-75 + pulley_pr(GT2x20ob_pulley) + pulley_pr(GT2x16_plain_idler),  -pulley_pr(GT2x16_plain_idler)];
+    p5 = [75  + pulley_pr(GT2x20ob_pulley) - pulley_pr(GT2x16_plain_idler), +pulley_pr(GT2x16_plain_idler)];
+    p6 = [-75 + pulley_pr(GT2x20ob_pulley) + pulley_pr(GT2x16_plain_idler), -pulley_pr(GT2x16_plain_idler)];
 
-    translate(p1) pulley_assembly(GT2x20ob_pulley);
-    translate(p2) pulley_assembly(GT2x20ob_pulley);
-    translate(p3) pulley_assembly(GT2x20_toothed_idler);
-    translate(p4) pulley_assembly(GT2x20_toothed_idler);
+    module pulleys(flip = false) {
+        translate(p2) rotate([0, flip ? 180 : 0, 0]) pulley_assembly(GT2x20ob_pulley);
+        translate(p3) pulley_assembly(GT2x20_toothed_idler);
+        translate(p4) pulley_assembly(GT2x20_toothed_idler);
+        translate(p5) {
+            pulley = GT2x16_toothed_idler;
+            screw = find_screw(hs_cs_cap, pulley_bore(pulley));
+            insert = screw_insert(screw);
 
-    translate(p5) {
-        pulley = GT2x16_plain_idler;
-        screw = find_screw(hs_cs_cap, pulley_bore(pulley));
-        insert = screw_insert(screw);
-
-        pulley_assembly(pulley);
-        translate_z(pulley_height(pulley) + pulley_offset(pulley) + screw_head_depth(screw, pulley_bore(pulley)))
-            screw(screw, 20);
-
-        translate_z(pulley_offset(pulley) - insert_length(insert))
-            vflip()
-                insert(insert);
+            rotate([0, flip ? 180 : 0, 0]) {
+                pulley_assembly(pulley);
+                translate_z(pulley_height(pulley) + pulley_offset(pulley) + screw_head_depth(screw, pulley_bore(pulley)))
+                    screw(screw, 20);
 
+                translate_z(pulley_offset(pulley) - insert_length(insert))
+                    vflip()
+                        insert(insert);
+            }
+        }
+        translate(p6) pulley_assembly(GT2x16_plain_idler);
     }
-    translate(p6) pulley_assembly(GT2x16_plain_idler);
 
-    path = [ [p1.x, p1.y, pulley_pr(GT2x20ob_pulley)],
-             [p5.x, p5.y, -pulley_pr(GT2x16_plain_idler)],
+    path = [ [p5.x, p5.y, pulley_pr(GT2x16_plain_idler)],
              [p6.x, p6.y, -pulley_pr(GT2x16_plain_idler)],
              [p2.x, p2.y, pulley_pr(GT2x20ob_pulley)],
              [p3.x, p3.y, pulley_pr(GT2x20ob_pulley)],
              [p4.x, p4.y, pulley_pr(GT2x20ob_pulley)]
            ];
+
     belt = GT2x6;
     belt(belt, path, 80, [0,  0]);
+    pulleys();
+    translate_z(20)
+        hflip() {
+            belt(belt, path, 80, [0,  0], belt_colour = grey(90), tooth_colour = grey(50));
+            pulleys(flip=true);
+        }
 
-    translate([-25, 0])
+    translate([-25, 0, 10])
         layout([for(b = belts) belt_width(b)], 10)
             rotate([0, 90, 0])
                 belt(belts[$i], [[0, 0, 20], [0, 1, 20]], belt_colour = $i%2==0 ? grey(90) : grey(20), tooth_colour = $i%2==0 ? grey(70) : grey(50));

tests/camera_housing.scad

@@ -0,0 +1,33 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+use <../utils/layout.scad>
+
+use <../printed/camera_housing.scad>
+
+include <../vitamins/cameras.scad>
+
+use <../vitamins/pcb.scad>
+
+module camera_housings()
+    layout([for(c = cameras) pcb_length(camera_pcb(c))], 15, false) let(c = cameras[$i])
+        camera_fastened_assembly(c, 3);
+
+if($preview)
+    camera_housings();

tests/cameras.scad

@@ -24,7 +24,7 @@ include <../vitamins/cameras.scad>
 use <../vitamins/pcb.scad>
 
 module cameras()
-    layout([for(c = cameras) pcb_length(camera_pcb(c))], 10, false) let(c = cameras[$i])
+    layout([for(c = cameras) pcb_length(camera_pcb(c))], 15, false) let(c = cameras[$i])
         camera(c);
 
 if($preview)

tests/hot_ends.scad

@@ -25,7 +25,7 @@ module hot_ends()
     layout([for(h = hot_ends) 40])
         translate([-20, 0])
             rotate(90)
-                hot_end(hot_ends[$i], 3);
+                hot_end(hot_ends[$i], 3, bowden = $i == 3);
 
 if($preview)
     hot_ends();

tests/shaft_couplings.scad

@@ -0,0 +1,30 @@
+//
+// NopSCADlib Copyright Chris Palmer 2018
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+include <../core.scad>
+include <../vitamins/shaft_couplings.scad>
+
+use <../utils/layout.scad>
+
+module shaft_couplings()
+    layout([for(s = shaft_couplings) sc_diameter(s)],5)
+        shaft_coupling(shaft_couplings[$i]);
+
+if($preview)
+    shaft_couplings();
+

vitamins/belt.scad

@@ -19,7 +19,7 @@
 
 //
 //! Models timing belt running over toothed or smooth pulleys and calculates an accurate length.
-//! Only models 2D paths, so not core XY!
+//! Only models 2D paths, so not crossed belt core XY!
 //!
 //! To make the back of the belt run against a smooth pulley on the outside of the loop specify a negative pitch radius.
 //!

vitamins/cameras.scad

@@ -68,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, rpi_camera_v2];
+cameras = [rpi_camera_v1, rpi_camera_v2, rpi_camera];
 
 use <camera.scad>

vitamins/displays.scad

@@ -73,6 +73,42 @@ SSD1963_4p3 = ["SSD1963_4p3", "LCD display SSD1963 4.3\"", 105.5, 67.2, 3.4, SSD
         [[0, -34.5], [12, -31.5]],
         ];
 
-displays = [HDMI5, SSD1963_4p3, LCD1602A, LCDS7282B];
+BigTreeTech_TFT35v3_0_PCB = ["", "",
+    110, 55.77, 1.6, 0, 3, 0, "green",  false,
+    [ [-3.12, 3.17], [-3.12, -3.17], [3.12, -3.17], [3.12, 3.17] ],
+    [
+        [  10, 7.5,    0, "-button_6mm" ],
+        [   9,  43,    0, "-buzzer", 5, 9 ],
+        [   9,  27,    0, "-potentiometer" ],
+        [ 102,28.82,   0, "uSD", [26.5, 16, 3] ],
+        [16.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [36.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [56.5, 5.9,    0, "2p54boxhdr", 5, 2 ],
+        [82.5,   4,    0, "jst_xh", 5 ],
+        [26.5, 52.8, 180, "jst_xh", 2 ],
+        [39.5, 52.8, 180, "jst_xh", 3 ],
+        [52.5, 52.8, 180, "jst_xh", 3 ],
+        [65.5, 52.8, 180, "jst_xh", 3 ],
+        [78.5, 52.8, 180, "jst_xh", 3 ],
+        [94.5, 52.8, 180, "jst_xh", 5 ],
+        [   8,  43,  180, "usb_A" ],
+        [  97,   4,    0, "chip", 9, 3.5, 1, grey(20) ],
+        // ESP-8266
+        [  23,  28,   90, "2p54socket", 4, 2 ],
+    ],
+    []
+];
+
+BigTreeTech_TFT35v3_0 = ["BigTreeTech_TFT35v3_0", "BigTreeTech TFT35 v3.0",
+    84.5, 54.5, 4, BigTreeTech_TFT35v3_0_PCB,
+    [-6, 0, 0],                         // pcb offset
+    [[-40, -26.5], [41.5, 26.5, 0.5]],  // aperture
+    [],                                 // touch screen
+    0,                                  // thread length
+    [],                                 // clearance need for the ts ribbon
+];
+
+
+displays = [HDMI5, SSD1963_4p3, BigTreeTech_TFT35v3_0, LCD1602A, LCDS7282B];
 
 use <display.scad>

vitamins/e3d.scad

@@ -26,6 +26,8 @@ include <tubings.scad>
 include <zipties.scad>
 include <fans.scad>
 
+use <../utils/rounded_cylinder.scad>
+use <../utils/thread.scad>
 use <../utils/tube.scad>
 
 rad_dia = 22; // Diam of the part with ailettes
@@ -94,7 +96,34 @@ module heater_block(type, naked = false, resistor_wire_rotate = [0,0,0]) {
     }
 }
 
+module bowden_connector(cap_colour = grey(20)) {
+    ir = 4.25 / 2;
+    body_colour = silver;
 
+    color(body_colour) {
+        translate_z(-4.5) {
+            tube(or = 2.5, ir = ir, h = 4.5, center = false);
+            male_metric_thread(6, metric_coarse_pitch(5), length = 4.5, center = false, solid = false, colour = body_colour);
+        }
+        tube(or = 7.7 / 2, ir = ir, h = 2, center = false);
+        translate_z(2)
+            linear_extrude(6.5)
+                difference() {
+                    circle(d = 11.55, $fn = 6);
+                    circle(r = ir);
+                }
+        translate_z(8.5)
+            rounded_cylinder(r = 9.8 / 2, h = 2, r2 = 1.5, ir = ir);
+        translate_z(10.5)
+            tube(or = 3.5, ir = ir, h = 0.5, center = false);
+    }
+    color(cap_colour) {
+        translate_z(11)
+            tube(or = 3, ir = ir, h = 1, center = false);
+        translate_z(12)
+            tube(or = 5.5, ir = ir, h = 1.75, center = false);
+    }
+}
 
 module e3d_fan_duct(type) {
     color("DeepSkyBlue")
@@ -123,7 +152,7 @@ module e3d_fan(type) {
                 fan(fan30x10);
 }
 
-module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) {
+module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0], bowden = false) {
     insulator_length = hot_end_insulator_length(type);
     inset = hot_end_inset(type);
     h_ailettes = rad_len / (2 * rad_nb_ailettes - 1);
@@ -150,6 +179,10 @@ module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]
                         square([100, hot_end_groove(type)]);
             }
 
+    if(bowden)
+        translate_z(inset)
+            bowden_connector();
+
     rotate(90)
         heater_block(type, naked, resistor_wire_rotate);
 
@@ -158,10 +191,10 @@ module e3d_hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]
             e3d_fan();
 }
 
-module e3d_hot_end_assembly(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) {
+module e3d_hot_end_assembly(type, filament, naked = false, resistor_wire_rotate = [0,0,0], bowden = false) {
     bundle = 3.2;
 
-    e3d_hot_end(type, filament, naked, resistor_wire_rotate);
+    e3d_hot_end(type, filament, naked, resistor_wire_rotate, bowden);
 
     // Wire and ziptie
     if(!naked)

vitamins/hot_end.scad

@@ -44,10 +44,10 @@ function hot_end_length(type) = hot_end_total_length(type) - hot_end_inset(type)
 use <jhead.scad>
 use <e3d.scad>
 
-module hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0]) { //! Draw specified hot end
+module hot_end(type, filament, naked = false, resistor_wire_rotate = [0,0,0], bowden = false) { //! Draw specified hot end
     if(hot_end_style(type) == jhead)
         jhead_hot_end_assembly(type, filament, naked);
 
     if(hot_end_style(type) == e3d)
-        e3d_hot_end_assembly(type, filament, naked, resistor_wire_rotate);
+        e3d_hot_end_assembly(type, filament, naked, resistor_wire_rotate, bowden);
 }

vitamins/shaft_coupling.scad

@@ -0,0 +1,65 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+
+//
+//! Shaft couplings
+//
+include <../core.scad>
+use <../utils/tube.scad>
+
+function sc_length(type)       = type[1]; //! Coupling length
+function sc_diameter(type)     = type[2]; //! Coupling outer diameter
+function sc_diameter1(type)    = type[3]; //! Diameter of smaller shaft
+function sc_diameter2(type)    = type[4]; //! Diameter of larger shaft
+
+module shaft_coupling(type, colour = "silver") { //! Draw the shaft coupling
+    vitamin(str("shaft_coupling(", type[0], "): Shaft coupling ", type[0]));
+
+    length = sc_length(type);
+    radius = sc_diameter(type) / 2;
+    r1 = sc_diameter1(type) / 2;
+    r2 = sc_diameter2(type) / 2;
+
+    grub_length = 3;
+    module grub_screw_positions() {
+        grub_offset_z = 5;
+        for(z = [-length / 2 + grub_offset_z, length / 2 - grub_offset_z])
+            translate_z(z)
+                for(a = [0, 90])
+                    rotate([-90, 0, a])
+                        translate_z(radius + 1)
+                            children();
+    }
+
+    color(colour) {
+        render(convexity=2) difference() {
+            union() {
+                translate_z(-length / 2)
+                    tube(radius, r1, length / 2, false);
+
+                tube(radius, r2, length / 2, false);
+            }
+            grub_screw_positions()
+                rotate([180, 0, 0])
+                    cylinder(r = screw_radius(M3_grub_screw), h = 5);
+        }
+    }
+
+    grub_screw_positions()
+        not_on_bom() screw(M3_grub_screw, grub_length);
+}

vitamins/shaft_couplings.scad

@@ -0,0 +1,29 @@
+//
+// NopSCADlib Copyright Chris Palmer 2020
+// nop.head@gmail.com
+// hydraraptor.blogspot.com
+//
+// This file is part of NopSCADlib.
+//
+// NopSCADlib is free software: you can redistribute it and/or modify it under the terms of the
+// GNU General Public License as published by the Free Software Foundation, either version 3 of
+// the License, or (at your option) any later version.
+//
+// NopSCADlib is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with NopSCADlib.
+// If not, see <https://www.gnu.org/licenses/>.
+//
+
+//
+//! Shaft couplings
+//
+
+//                                   L   D        d1   d2
+SC_5x8_rigid  = [ "SC_5x8_rigid",    25, 12.5,    5,   8 ];
+
+shaft_couplings = [SC_5x8_rigid];
+
+use <shaft_coupling.scad>

vitamins/tubing.scad

@@ -41,7 +41,7 @@ module tubing(type, length = 15, forced_id = 0, center = true) { //! Draw specif
         vitamin(str("tubing(", type[0], arg(length, 15), "): ", tubing_material(type), " OD ", original_od, "mm ID ", original_id,"mm x ",length, "mm"));
 
     if(tubing_material(type) == "Carbon fiber")
-        woven_tube(od / 2, id /2, length, colour = tubing_colour(type));
+        woven_tube(od / 2, id /2, center = center, length, colour = tubing_colour(type));
     else
         color(tubing_colour(type))
             linear_extrude(length, center = center, convexity = 4)