Added MGN12H rail and included MGN12 in the test.

libtest.scad

@@ -29,6 +29,7 @@ use <tests/blowers.scad>
 use <tests/bulldogs.scad>
 use <tests/buttons.scad>
 use <tests/cable_strips.scad>
+use <tests/cameras.scad>
 use <tests/circlips.scad>
 use <tests/components.scad>
 use <tests/d_connectors.scad>
@@ -334,6 +335,9 @@ translate([x3 + 70, veroboard_y + 30])
 translate([x3 + 140, veroboard_y + 20])
     pcb_mounts();
 
+translate([x3 + 170, veroboard_y + 16])
+    cameras();
+
 translate([x3, d_connectors_y])
     d_connectors();
 

readme.md

@@ -26,22 +26,22 @@ See [usage](docs/usage.md) for requirements, installation instructions and a usa
 <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 = "#Layout">Layout</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 = "#Maths">Maths</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 = "#Offset">Offset</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 = "#Screws">Screws</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
-<tr><td> <a href = "#Components">Components</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</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 = "#Rounded_cylinder">Rounded_cylinder</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 = "#Rounded_polygon">Rounded_polygon</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 = "#Sector">Sector</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 = "#Sweep">Sweep</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 = "#Thread">Thread</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 = "#Tube">Tube</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></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></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>
+<tr><td> <a href = "#Cameras">Cameras</a> </td><td> <a href = "#Mains_sockets">Mains_sockets</a> </td><td> <a href = "#Screws">Screws</a> </td><td> <a href = "#Fixing_block">Fixing_block</a> </td><td> <a href = "#Quadrant">Quadrant</a> </td><td></td></tr>
+<tr><td> <a href = "#Circlips">Circlips</a> </td><td> <a href = "#Microswitches">Microswitches</a> </td><td> <a href = "#Sealing_strip">Sealing_strip</a> </td><td> <a href = "#Flat_hinge">Flat_hinge</a> </td><td> <a href = "#Round">Round</a> </td><td></td></tr>
+<tr><td> <a href = "#Components">Components</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 = "#Rounded_cylinder">Rounded_cylinder</a> </td><td></td></tr>
+<tr><td> <a href = "#DIP">DIP</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 = "#Rounded_polygon">Rounded_polygon</a> </td><td></td></tr>
+<tr><td> <a href = "#D_connectors">D_connectors</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 = "#Sector">Sector</a> </td><td></td></tr>
+<tr><td> <a href = "#Displays">Displays</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 = "#Sweep">Sweep</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusion_brackets">Extrusion_brackets</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 = "#Thread">Thread</a> </td><td></td></tr>
+<tr><td> <a href = "#Extrusions">Extrusions</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 = "#Tube">Tube</a> </td><td></td></tr>
+<tr><td> <a href = "#Fans">Fans</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></td><td></td></tr>
+<tr><td> <a href = "#Fuseholder">Fuseholder</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></td><td></td></tr>
+<tr><td> <a href = "#Geared_steppers">Geared_steppers</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 = "#Green_terminals">Green_terminals</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 = "#Hot_ends">Hot_ends</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 = "#Hygrometer">Hygrometer</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 = "#IECs">IECs</a> </td><td></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>
 </table>
 
 ---
@@ -430,6 +430,42 @@ When the sides are constrained then a circular model is more accurate.
 |   3 | ```cable_strip(20, 25, 100, 30)``` |  Polypropylene strip 189mm x 24mm x 0.8mm |
 
 
+<a href="#top">Top</a>
+
+---
+<a name="Cameras"></a>
+## Cameras
+PCB cameras.
+
+
+[vitamins/cameras.scad](vitamins/cameras.scad) Object definitions.
+
+[vitamins/camera.scad](vitamins/camera.scad) Implementation.
+
+[tests/cameras.scad](tests/cameras.scad) Code for this example.
+
+### Properties
+| Function | Description |
+|:--- |:--- |
+| ```camera_connector(type)``` | The flex connector block for the camera itself |
+| ```camera_lens(type)``` | Stack of lens parts, can be round, rectanular or rounded rectangular, with optional tapered aperture |
+| ```camera_lens_offset(type)``` | Offset of the lens center from the PCB centre |
+| ```camera_pcb(type)``` | The PCB part of the camera |
+
+### Modules
+| Module | Description |
+|:--- |:--- |
+| ```camera(type)``` | Draw specified PCB camera |
+
+![cameras](tests/png/cameras.png)
+
+### Vitamins
+| Qty | Module call | BOM entry |
+| ---:|:--- |:---|
+|   1 | ```camera(rpi_camera_v1)``` |  Raspberry Pi camera V1 |
+|   1 | ```camera(rpi_camera)``` |  Raspberry Pi focusable camera |
+
+
 <a href="#top">Top</a>
 
 ---
@@ -1554,9 +1590,10 @@ The `light_strip_clip()` module makes a clip to go around the light that can be
 | Function | Description |
 |:--- |:--- |
 | ```light_strip_clip_depth(light)``` | Depth of the clip |
-| ```light_strip_clip_length(light)``` | Outside length |
+| ```light_strip_clip_length(light)``` | Outside length of clip |
 | ```light_strip_clip_slot(light)``` | Clip slot size |
-| ```light_strip_clip_width(light)``` | Outside width |
+| ```light_strip_clip_wall()``` | Clip wall thickness |
+| ```light_strip_clip_width(light)``` | Outside width of clip |
 | ```light_strip_cut_length(type, segs)``` | Calculate cut length given segments |
 | ```light_strip_segments(type, max_length)``` | Calculate the maximum number of segments that fit in max_length |
 
@@ -2033,6 +2070,10 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| ```ff_back(type)``` | Flat flex back section size |
+| ```ff_latch(type)``` | Flat flex latch size |
+| ```ff_mid(type)``` | Flat flex middle section size |
+| ```ff_slot(type)``` | Flat flex slot size |
 | ```hdmi_depth(type)``` | Front to back depth |
 | ```hdmi_height(type)``` | Outside height above the PCB |
 | ```hdmi_height1(type)``` | Inside height at the sides |
@@ -2070,7 +2111,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ```block(size, colour, makes_cutout, cutouts)``` | Draw a coloured cube to represent a random PCB component |
 | ```buzzer(height, diameter, colour)``` | Draw PCB buzzer with specified height, diameter and colour |
 | ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
-| ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
+| ```flat_flex(type, cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
 | ```flex(cutout = false)``` | Draw flexistrip connector |
 | ```hdmi(type, cutout = false)``` | Draw HDMI socket |
 | ```jack(cutout = false)``` | Draw 3.5mm jack |
@@ -2125,7 +2166,11 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | ```ax_res(res1_4, 10000)``` |  Resistor 10000 Ohms 5% 0.25W |
 |   1 | ```ax_res(res1_2, 100000)``` |  Resistor 100000 Ohms 5% 0.5W |
 |   1 | ```ax_res(res1_8, 1e+6, tol = 1)``` |  Resistor 1e+6 Ohms 1% 0.125W |
+|   1 | ```smd_led(LED0603, orange)``` |  SMD LED 0603 orange |
 |   1 | ```smd_led(LED0805, red)``` |  SMD LED 0805 red |
+|   1 | ```smd_resistor(RES0603, 1K)``` |  SMD resistor 0603 1K 0.1W |
+|   1 | ```smd_resistor(RES0805, 1K)``` |  SMD resistor 0805 1K 0.125W |
+|   1 | ```smd_resistor(RES1206, 1K)``` |  SMD resistor 1206 1K 0.25W |
 |   1 | ```square_button(button_6mm)``` |  Square button 6mm |
 |   1 | ```pcb(TMC2130)``` |  TMC2130 |
 |   1 | ```green_terminal(gt_5p08, 2)``` |  Terminal block 2 way 0.2" |
@@ -2157,6 +2202,10 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 ### Properties
 | Function | Description |
 |:--- |:--- |
+| ```ff_back(type)``` | Flat flex back section size |
+| ```ff_latch(type)``` | Flat flex latch size |
+| ```ff_mid(type)``` | Flat flex middle section size |
+| ```ff_slot(type)``` | Flat flex slot size |
 | ```hdmi_depth(type)``` | Front to back depth |
 | ```hdmi_height(type)``` | Outside height above the PCB |
 | ```hdmi_height1(type)``` | Inside height at the sides |
@@ -2194,7 +2243,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ```block(size, colour, makes_cutout, cutouts)``` | Draw a coloured cube to represent a random PCB component |
 | ```buzzer(height, diameter, colour)``` | Draw PCB buzzer with specified height, diameter and colour |
 | ```chip(length, width, thickness, colour, cutout = false)``` | Draw a coloured cube to represent a chip, or other rectangular component |
-| ```flat_flex(cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
+| ```flat_flex(type, cutout = false)``` | Draw flat flexistrip connector as used on RPI0 |
 | ```flex(cutout = false)``` | Draw flexistrip connector |
 | ```hdmi(type, cutout = false)``` | Draw HDMI socket |
 | ```jack(cutout = false)``` | Draw 3.5mm jack |
@@ -2603,24 +2652,27 @@ Linear rails with carriages.
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```rail(MGN15, 260)``` |  Linear rail MGN15 x 260mm |
+|   1 | ```rail(MGN12, 200)``` |  Linear rail MGN12 x 200mm |
+|   1 | ```rail(MGN12H, 200)``` |  Linear rail MGN12H x 200mm |
+|   1 | ```rail(MGN15, 200)``` |  Linear rail MGN15 x 200mm |
 |   1 | ```rail(MGN5, 200)``` |  Linear rail MGN5 x 200mm |
 |   1 | ```rail(MGN7, 200)``` |  Linear rail MGN7 x 200mm |
 |   1 | ```rail(MGN9, 200)``` |  Linear rail MGN9 x 200mm |
 |   1 | ```rail(SSR15, 200)``` |  Linear rail SSR15 x 200mm |
 |  26 | ```nut(M2_nut, nyloc = true)``` |  Nut M2 x 1.6mm nyloc |
-|  17 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
+|  31 | ```nut(M3_nut, nyloc = true)``` |  Nut M3 x 2.4mm nyloc |
 |   4 | ```nut(M4_nut, nyloc = true)``` |  Nut M4 x 3.2mm nyloc |
 |  11 | ```screw(M2_cap_screw, 10)``` |  Screw M2 cap x 10mm |
 |  15 | ```screw(M2_cs_cap_screw, 10)``` |  Screw M2 cs cap x 10mm |
 |   8 | ```screw(M3_cap_screw, 10)``` |  Screw M3 cap x 10mm |
-|   5 | ```screw(M3_cap_screw, 16)``` |  Screw M3 cap x 16mm |
+|  12 | ```screw(M3_cap_screw, 12)``` |  Screw M3 cap x 12mm |
+|   3 | ```screw(M3_cap_screw, 16)``` |  Screw M3 cap x 16mm |
 |   2 | ```screw(M3_cs_cap_screw, 12)``` |  Screw M3 cs cap x 12mm |
-|   2 | ```screw(M3_cs_cap_screw, 16)``` |  Screw M3 cs cap x 16mm |
+|   6 | ```screw(M3_cs_cap_screw, 16)``` |  Screw M3 cs cap x 16mm |
 |   2 | ```screw(M4_cap_screw, 16)``` |  Screw M4 cap x 16mm |
 |   2 | ```screw(M4_cs_cap_screw, 20)``` |  Screw M4 cs cap x 20mm |
 |  26 | ```washer(M2_washer)``` |  Washer  M2 x 5mm x 0.3mm |
-|  17 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
+|  31 | ```washer(M3_washer)``` |  Washer  M3 x 7mm x 0.5mm |
 |   4 | ```washer(M4_washer)``` |  Washer  M4 x 9mm x 0.8mm |
 
 
@@ -3080,11 +3132,14 @@ Surface mount components for PCBs.
 |:--- |:--- |
 | ```smd_led_lens(type)``` | Lens length width and height |
 | ```smd_led_size(type)``` | Body length, width and height |
+| ```smd_res_end_cap(type)``` | End cap width |
+| ```smd_res_power(type)``` | Power rating in Watts |
+| ```smd_res_size(type)``` | Body length, width and height |
 
 ### Functions
 | Function | Description |
 |:--- |:--- |
-| ```smd_100th(x)``` | Convert dimesion to 1/100" notation |
+| ```smd_100th(x)``` | Convert dimension to 1/100" notation |
 | ```smd_led_height(type)``` | Total height |
 | ```smd_size(size)``` | Convert size to 1/100" notation |
 
@@ -3092,13 +3147,18 @@ Surface mount components for PCBs.
 | Module | Description |
 |:--- |:--- |
 | ```smd_led(type, colour, cutout)``` | Draw an SMD LED with specified ```colour``` |
+| ```smd_resistor(type, value)``` | Draw an SMD resistor with specified value |
 
 ![smds](tests/png/smds.png)
 
 ### Vitamins
 | Qty | Module call | BOM entry |
 | ---:|:--- |:---|
-|   1 | ```smd_led(LED0805, green)``` |  SMD LED 0805 green |
+|   1 | ```smd_led(LED0603, green)``` |  SMD LED 0603 green |
+|   1 | ```smd_led(LED0805, blue)``` |  SMD LED 0805 blue |
+|   1 | ```smd_resistor(RES0603, 1R0)``` |  SMD resistor 0603 1R0 0.1W |
+|   1 | ```smd_resistor(RES0805, 10M)``` |  SMD resistor 0805 10M 0.125W |
+|   1 | ```smd_resistor(RES1206, 100K)``` |  SMD resistor 1206 100K 0.25W |
 
 
 <a href="#top">Top</a>

scripts/plateup.py

@@ -45,6 +45,7 @@ def plateup(target, part_type, usage = None):
     # Loop through source directories
     #
     used = []
+    all_sources = []
     for dir in [source_dir1, source_dir2]:
         if not os.path.isdir(dir):
             continue
@@ -60,6 +61,7 @@ def plateup(target, part_type, usage = None):
         # Decide which files to make
         #
         sources = [file for file in os.listdir(dir) if file.endswith('.scad')]
+        all_sources += sources
         #
         # Run OpenSCAD on the source files to make the targets
         #
@@ -100,7 +102,7 @@ def plateup(target, part_type, usage = None):
     #
     # Remove any cruft
     #
-    targets = [file[:-4] + part_type for file in sources]
+    targets = [file[:-4] + part_type for file in all_sources]
     for file in os.listdir(target_dir):
         if file.endswith('.' + part_type):
             if not file in targets and not file in copied:

tests/PCB.scad

@@ -58,8 +58,12 @@ test_pcb = ["TestPCB", "Test PCB",
     // components
     [
         [ 20, -5, 180, "trimpot10"],
-        [ 20, -15,  0, "trimpot10", true],
-        [ 10,  2,   0, "smd_led", LED0805, "red"],
+        [ 20, -15,  90, "trimpot10", true],
+        [ 10,  2,   90, "smd_led", LED0805, "red"],
+        [ 13,  2,   90, "smd_led", LED0603, "orange"],
+        [ 16,  2,   90, "smd_res", RES1206, "1K"],
+        [ 19,  2,   90, "smd_res", RES0805, "1K"],
+        [ 22,  2,   90, "smd_res", RES0603, "1K"],
         [ 10,  10,   0, "2p54header", 4, 1],
         [ 25,  10,   0, "2p54header", 5, 1, false, "blue" ],
         [ 10,  20,   0, "2p54boxhdr", 4, 2],
@@ -91,7 +95,8 @@ test_pcb = ["TestPCB", "Test PCB",
         [ 80,  22,   0, "ax_res", res1_2, 10,     10, inch(0.2)],
 
         [ 60,   3,   0, "flex"],
-        [ 50,  15,   0, "flat_flex"],
+        [ 50,  15, -90, "flat_flex"],
+        [ 40,  15, -90, "flat_flex", true],
         [ 60,  35,   0, "D_plug", DCONN9],
 
         [ 50,  50,   0, "molex_hdr", 2],

tests/SMDs.scad

@@ -21,9 +21,14 @@ use <../utils/layout.scad>
 
 include <../vitamins/smds.scad>
 
-module smds()
-    layout([for(l = smd_leds) smd_led_size(l).x], 1)
-        smd_led(smd_leds[$i], ["green", "blue", "red"][$i % 3]);
+module smds() {
+    layout([for(r = smd_resistors) smd_res_size(r).x], 1)
+        smd_resistor(smd_resistors[$i], ["1R0", "10M", "100K"][$i % 3]);
+
+    translate([0, 3])
+        layout([for(l = smd_leds) smd_led_size(l).x], 1)
+            smd_led(smd_leds[$i], ["green", "blue", "red"][$i % 3]);
+}
 
 if($preview)
     smds();

tests/cameras.scad

@@ -0,0 +1,31 @@
+//
+// 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>
+
+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])
+        camera(c);
+
+if($preview)
+    cameras();

tests/rails.scad

@@ -25,10 +25,10 @@ use <../vitamins/nut.scad>
 sheet = 3;
 
 module rails()
-    layout([for(l = rails) carriage_width(rail_carriage(l))], 25)
+    layout([for(l = rails) carriage_width(rail_carriage(l))], 20)
         rotate(-90) {
             rail = rails[$i];
-            length = rail == MGN15 ? 260 : 200;
+            length = 200;
             screw = rail_screw(rail);
             nut = screw_nut(screw);
             washer = screw_washer(screw);

utils/layout.scad

@@ -28,6 +28,6 @@ function layout_offset(widths, i, gap = 2) = //! Calculate the offset for the ``
 
 module layout(widths, gap = 2, no_offset = false) //! Layout children passing ```$i```
     translate([no_offset ? -widths[0] / 2 : 0, 0])
-        for($i = [0 : len(widths) - 1])
+        for($i = [0 : 1 : len(widths) - 1])
             translate([layout_offset(widths, $i, gap), 0])
                 children();

vitamins/camera.scad

@@ -0,0 +1,83 @@
+//
+// 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/>.
+//
+
+//
+//! PCB cameras.
+//
+include <../utils/core/core.scad>
+use <pcb.scad>
+
+function camera_pcb(type)         = type[2]; //! The PCB part of the camera
+function camera_lens_offset(type) = type[3]; //! Offset of the lens center from the PCB centre
+function camera_lens(type)        = type[4]; //! Stack of lens parts, can be round, rectanular or rounded rectangular, with optional tapered aperture
+function camera_connector(type)   = type[5]; //! The flex connector block for the camera itself
+
+module camera(type) {           //! Draw specified PCB camera
+    vitamin(str("camera(", type[0], "): ", type[1]));
+    pcb = camera_pcb(type);
+
+    not_on_bom()
+        pcb(pcb);
+
+    translate_z(pcb_thickness(pcb)) {
+        color(grey(20))
+            translate(camera_lens_offset(type))
+                for(p = camera_lens(type)) {
+                    size = p[0];
+                    r = p[1];
+                    app = p[2];
+                    if(size.x)
+                        rounded_rectangle(size, r, center = false);
+                    else
+                        translate_z(size.y)
+                            rotate_extrude()
+                                difference() {
+                                    square([r, size.z]);
+
+                                    if(app)
+                                        translate([0, size.z])
+                                            hull() {
+                                                translate([0, -eps])
+                                                    square([app.y, eps * 2]);
+
+                                                translate([0, -app.z])
+                                                    square([app.x, app.z]);
+                                            }
+                                }
+                }
+        conn = camera_connector(type);
+        if(conn) {
+            color(grey(20))
+                translate(conn[0])
+                    rounded_rectangle(conn[1], 0.5, center = false);
+
+            flex = [5, 0.1];
+            color("orange")
+                hull() {
+                    translate_z(flex.y /2)
+                        translate(camera_lens_offset(type) + [0, camera_lens(type)[0][0].y / 2])
+                            cube([flex.x, eps, flex.y], center = true);
+
+                    translate_z(conn[1].z - flex.y)
+                        translate(conn[0] - [0, conn[1].y / 2])
+                             cube([flex.x, eps, flex.y], center = true);
+                }
+        }
+    }
+}

vitamins/cameras.scad

@@ -0,0 +1,58 @@
+//
+// 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 <smds.scad>
+
+rpi_camera_v1_pcb = ["", "",  25, 24, 1, 0, 2.1, 0, "green", false, [[2, -2], [-2, -2], [2, 9.6], [-2, 9.6]],
+    [
+        [12,   3.25,  0, "-flat_flex", true],
+        [-4.5, -4,    0, "smd_led", LED0603, "red"],
+        [-5.5, -3,    0, "smd_res", RES0603, "10K"],
+    ],
+    []];
+
+rpi_camera_v1 = ["rpi_camera_v1", "Raspberry Pi camera V1", rpi_camera_v1_pcb, [0, 9.6 - 12],
+    [
+        [[8, 8, 3], 0],
+        [[0, 0, 4], 7.5 / 2],
+        [[0, 0, 5], 5.5 / 2, [1.5/2, 2/2, 0.5]],
+    ],
+    [[0, 12 - 1.5 - 2.5], [8, 5, 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],
+        [-3.8, -7.8,  0, "smd_led", LED0805, "red"],
+    ],
+    []];
+
+rpi_camera = ["rpi_camera", "Raspberry Pi focusable camera", rpi_camera_pcb, [0, 0],
+    [
+        [[13, 13, 3], 0],
+        [[22,  4, 3], 2 - eps],
+        [[0, 0, 8.5], 7],
+        [[0, 0,  12], 6],
+        [[0, 11, 4.3], 14 / 2, [8/2, 11/2, 1]],
+    ],
+    [[0, 18 - 1.5 - 2.5], [8, 5, 1]]
+];
+
+cameras = [rpi_camera_v1, rpi_camera];
+
+use <camera.scad>

vitamins/light_strip.scad

@@ -137,7 +137,6 @@ module light_strip(type, segs = undef) { //! Draw specified light strip, segs ca
             linear_extrude(0.55 + eps)
                 resistor_positions()
                     square([2.1, 1.5 + 2 * eps], center = true);
-
     }
 
     if(show_rays)
@@ -148,8 +147,9 @@ wall = 1.8;
 clearance = 0.2;
 function light_strip_clip_slot(light) = light_strip_width(light) + clearance;       //! Clip slot size
 function light_strip_clip_depth(light) = 10;                                        //! Depth of the clip
-function light_strip_clip_length(light) = light_strip_clip_slot(light) + 2 * wall;  //! Outside length
-function light_strip_clip_width(light) = light_strip_depth(light) + 2 * wall;       //! Outside width
+function light_strip_clip_length(light) = light_strip_clip_slot(light) + 2 * wall;  //! Outside length of clip
+function light_strip_clip_width(light) = light_strip_depth(light) + 2 * wall;       //! Outside width of clip
+function light_strip_clip_wall() = wall;                                            //! Clip wall thickness
 
 module light_strip_clip(light) { //! Make a clip to go over the strip to be incorporated into a bracket
     linear_extrude(light_strip_clip_depth(light), convexity = 2)

vitamins/light_strips.scad

@@ -26,7 +26,7 @@
 //                                                                                         e     s    c
 //                                                                                               s    k
 Rigid5050 = ["Rigid5050", "rigid SMD5050 low profile",              500, 36, 3, 14.4,   7, 10.4, 0.9, 1.2];
-RIGID5050 = ["RIGID5050", "rigid SMD5050"            ,              500, 36, 3, 14.4, 8.6, 10.4, 0.9, 1.6];
+RIGID5050 = ["RIGID5050", "rigid SMD5050"            ,              500, 36, 3, 14.4, 8.6,  9.8, 0.8, 1.6];
 
 light_strips = [Rigid5050,  RIGID5050,];
 

vitamins/pcb.scad

@@ -642,50 +642,47 @@ module flex(cutout = false) { //! Draw flexistrip connector
     }
 }
 
-module flat_flex(cutout = false) { //! Draw flat flexistrip connector as used on RPI0
-    l1 = 17;
-    w1 = 1.4;
-    h1 = 1.2;
+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]];
 
-    l2 = 15.4;
-    w2 = 1.6;
-    h2 = 1.0;
+function ff_slot(type)  = type[0]; //! Flat flex slot size
+function ff_latch(type) = type[1]; //! Flat flex latch size
+function ff_mid(type)   = type[2]; //! Flat flex middle section size
+function ff_back(type)  = type[3]; //! Flat flex back section size
 
-    l3 = 16;
-    w3 = 1.1;
-    h3 = 1.2;
+module flat_flex(type, cutout = false) { //! Draw flat flexistrip connector as used on RPI0
+    slot = ff_slot(type);
+    latch = ff_latch(type);
+    mid =   ff_mid(type);
+    back =  ff_back(type);
 
-    l4 = 12;
-
-    slot_l = 11.8;
-    slot_h = 0.9;
-
-    w = w1 + w2 + w3;
+    w = latch.y + mid.y + back.y;
     if(cutout)
         ;
     else {
-        color(grey(30)) {
-            translate([w / 2 - w1, 0, h1 / 2])
-                rotate([90, 0, 90])
-                    linear_extrude(w1)
+        color(grey(30))
+            translate([0, w / 2 - latch.y])
+                rotate([90, 0, 180])
+                    linear_extrude(latch.y)
                         difference() {
-                            square([l1, h1], center = true);
+                            translate([-latch.x / 2, 0])
+                                square([latch.x, latch.z]);
 
-                            translate([0, -h1 / 2])
-                                square([slot_l, slot_h * 2], center = true);
+                            square([slot.x, slot.y * 2], center = true);
                         }
 
-        }
-        color(grey(90)) {
-            translate([-w / 2 + w3 / 2, 0, h3 / 2])
-                cube([w3, l3, h3], center = true);
+        color("ivory") {
+            translate([-back.x / 2, -w / 2])
+                if(back.y)
+                    cube(back);
 
-            translate([-w / 2 + w3 + w2 / 2, 0, h2 / 2])
-                cube([w2, l2, h2], center = true);
-
-             translate([-w / 2 + w3 + w2 / 2, 0, h3 / 2])
-                cube([w2, l4, h3], center = true);
+            translate([-mid.x / 2,  -w / 2 + back.y])
+                cube(mid);
        }
+
+       color(grey(80))
+            translate([-back.x / 2, -w / 2 + back.y])
+                cube([back.x, mid.y, mid.z - eps]);
     }
 }
 
@@ -897,7 +894,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
         if(show(comp, "hdmi"))          hdmi(hdmi_full, cutouts);
         if(show(comp, "mini_hdmi"))     hdmi(hdmi_mini, cutouts);
         if(show(comp, "flex"))          flex(cutouts);
-        if(show(comp, "flat_flex"))     flat_flex(cutouts);
+        if(show(comp, "flat_flex"))     flat_flex(param(4, false) ? large_ff : small_ff, cutouts);
         if(show(comp, "uSD"))           uSD(comp[4], cutouts);
         if(show(comp, "trimpot10"))     trimpot10(param(4, false), cutouts);
         if(show(comp, "molex_usb_Ax2")) molex_usb_Ax2(cutouts);
@@ -924,6 +921,7 @@ module pcb_component(comp, cutouts = false, angle = undef) { //! Draw pcb compon
             if(show(comp, "jst_xh"))        jst_xh_header(jst_xh_header, comp[4], param(5, false), param(6, "white"), param(7, undef));
             if(show(comp, "potentiometer")) potentiometer(param(4, 5), param(5, 9));
             if(show(comp, "buzzer"))        buzzer(param(4, 9), param(5, 12), param(6, grey(20)));
+            if(show(comp, "smd_res"))       smd_resistor(comp[4], comp[5]);
         }
     }
 }

vitamins/pcbs.scad

@@ -224,7 +224,7 @@ RPI0 =  ["RPI0", "Raspberry Pi Zero",     65,    30,    1.4, 3,    2.75, 6, "gre
      [54,    2,     -90, "usb_uA"],
      [41.4,  2,     -90, "usb_uA"],
      [7.25,  16.7,  180, "uSD", [12, 11.5, 1.4]],
-     [-1.3,    15,    0, "flat_flex"],
+     [-1.3,    15,  -90, "flat_flex"],
     ],
     [": Micro SD card"],
     [32.5 - 9.5 * 2.54, 26.5 - 1.27, 20, 2]];

vitamins/rails.scad

@@ -25,6 +25,7 @@ MGN5_carriage  = [ 16,   9.6,  12, 6,  1.5, 0,  8 , M2_cap_screw ];
 MGN7_carriage  = [ 23,   14.3, 17, 8,  1.5, 8,  12, M2_cap_screw ];
 MGN9_carriage  = [ 29.7, 20.8, 20, 10, 2,   10, 15, M3_cap_screw ];
 MGN12_carriage = [ 34.7, 21.7, 27, 13, 3,   15, 20, M3_cap_screw ];
+MGN12H_carriage= [ 45.4, 32.4, 27, 13, 3,   20, 20, M3_cap_screw ];
 MGN15_carriage = [ 43.3, 27.7, 32, 16, 4,   20, 25, M3_cap_screw ];
 SSR15_carriage = [ 40.3, 23.3, 34, 24, 4.5, 0,  26, M4_cap_screw ];
 //
@@ -36,9 +37,10 @@ MGN5 = [ "MGN5",  5,  3.6, 5,   15, 3.5, 2.4, 0.8, M2_cs_cap_screw, MGN5_carriag
 MGN7 = [ "MGN7",  7,  5,   5,   15, 4.3, 2.4, 2.6, M2_cap_screw,    MGN7_carriage, M2_cs_cap_screw ];
 MGN9 = [ "MGN9",  9,  6,   7.5, 20, 6.0, 3.5, 3.5, M3_cap_screw,    MGN9_carriage, M3_cs_cap_screw ];
 MGN12= [ "MGN12", 12, 8,   10,  25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12_carriage, M3_cs_cap_screw ];
+MGN12H=[ "MGN12H",12, 8,    10, 25, 6.0, 3.5, 4.5, M3_cap_screw,   MGN12H_carriage,M3_cs_cap_screw ];
 MGN15= [ "MGN15", 15, 10,  10,  40, 6.0, 3.5, 5.0, M3_cap_screw,   MGN15_carriage, M3_cs_cap_screw ];
 SSR15= [ "SSR15", 15, 12.5,10,  60, 7.5, 4.5, 5.3, M4_cap_screw,   SSR15_carriage, M4_cs_cap_screw ];
 
-rails = [MGN5, MGN7, MGN9, MGN15, SSR15];
+rails = [MGN5, MGN7, MGN9, MGN12, MGN12H, MGN15, SSR15];
 
 use <rail.scad>

vitamins/smd.scad

@@ -29,7 +29,7 @@ function smd_led_lens(type) = type[2]; //! Lens length width and height
 function smd_led_height(type) =        //! Total height
     smd_led_size(type).z + smd_led_lens(type).z;
 
-function smd_100th(x) = //! Convert dimesion to 1/100" notation
+function smd_100th(x) = //! Convert dimension to 1/100" notation
     let(s = str(round(x / inch(0.01))))
         len(s) < 2 ? str("0", s) : s;
 
@@ -78,3 +78,33 @@ module smd_led(type, colour, cutout) { //! Draw an SMD LED with specified ```col
                 }
     }
 }
+
+function smd_res_size(type)    = type[1]; //! Body length, width and height
+function smd_res_end_cap(type) = type[2]; //! End cap width
+function smd_res_power(type)   = type[3]; //! Power rating in Watts
+
+module smd_resistor(type, value) { //! Draw an SMD resistor with specified value
+    size = smd_res_size(type);
+    vitamin(str("smd_resistor(", type[0], ", ", value, "): SMD resistor ", smd_size(size), " ", value, " ", smd_res_power(type), "W"));
+
+    t = 0.04;
+    cap = smd_res_end_cap(type);
+    color("white")
+        translate_z(size.z / 2)
+            cube([size.x - 2 * t, size.y, size.z - 2 * t], center = true);
+
+    color(grey(20))
+        translate_z(size.z - t)
+            cube([size.x - 2 * cap, size.y, eps], center = true);
+
+    color(silver)
+        for(end = [-1, 1])
+            translate([end * (size.x / 2 - cap / 2), 0, size.z / 2])
+                cube([cap, size.y - 2 * eps, size.z], center = true);
+
+    color("white")
+        translate([0, 0, size.z])
+            linear_extrude(eps)
+                resize([(size.x - 2 * cap) * 0.75, size.y / 2])
+                    text(value, halign = "center", valign = "center");
+}

vitamins/smds.scad

@@ -18,11 +18,18 @@
 //
 
 //
-//! Axial components
+//! SMD components
 //
 
-LED0805 = ["LED0805", [2, 1.25, 0.46], [1.4, 1.25, 0.54]];
+LED0603 = ["LED0603", [1.6, 0.8,  0.18], [1.0, 0.8,  0.42]];
+LED0805 = ["LED0805", [2.0, 1.25, 0.46], [1.4, 1.25, 0.54]];
 
-smd_leds = [LED0805];
+smd_leds = [LED0603, LED0805];
+
+RES0603 = ["RES0603", [1.6, 0.8, 0.45], 0.3, 1/10];
+RES0805 = ["RES0805", [2.0, 1.2, 0.45], 0.4, 1/8];
+RES1206 = ["RES1206", [3.1, 1.6, 0.6],  0.5, 1/4];
+
+smd_resistors = [RES0603, RES0805, RES1206];
 
 use <smd.scad>