Merge branch 'martinbudden-pulley_colour'

readme.md

@@ -1750,7 +1750,11 @@ UK 13A sockets at the moment.
 ---
 <a name="Microswitches"></a>
 ## Microswitches
-Used for limit switches.
+Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+
+The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+
+When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 
 [vitamins/microswitches.scad](vitamins/microswitches.scad) Object definitions.
 
@@ -1763,14 +1767,16 @@ Used for limit switches.
 |:--- |:--- |
 | `microswitch_body_clr(type)` | Body colour |
 | `microswitch_button_clr(type)` | Button colour |
-| `microswitch_button_pos(type)` | Button position |
+| `microswitch_button_pos(type)` | Button position at operating point |
 | `microswitch_button_t(type)` | Button thickness |
 | `microswitch_button_w(type)` | Button width |
+| `microswitch_fp_max(type)` | Free position maximum |
 | `microswitch_hole_d(type)` | Screw hole diameter |
 | `microswitch_holes(type)` | Hole positions |
 | `microswitch_leg(type)` | Leg types |
 | `microswitch_legs(type)` | Leg positions |
 | `microswitch_length(type)` | Body length |
+| `microswitch_op_tol(type)` | Operating position +/- tolerance |
 | `microswitch_radius(type)` | Body corner radius |
 | `microswitch_thickness(type)` | Body thickness |
 | `microswitch_width(type)` | Body width |
@@ -2305,6 +2311,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 | ---:|:--- |:---|
 |   1 | `pcb(ArduinoLeonardo)` |  Arduino Leonardo |
 |   1 | `pcb(ArduinoUno3)` |  Arduino Uno R3 |
+|   1 | `pcb(BTT_SKR_MINI_E3_V2_0)` |  BigTreeTech SKR Mini E3 v2.0 |
 |   1 | `pcb(BTT_SKR_V1_4_TURBO)` |  BigTreeTech SKR v1.4 Turbo |
 |   1 |  |  Cat 5 patch cable 300mm |
 |   1 | `d_plug(DCONN15, pcb = true)` |  D-type 15 way PCB mount plug |
@@ -2324,10 +2331,10 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `molex_254(3)` |  Molex KK header 3 way |
 |  16 | `nut(M2_nut, nyloc = true)` |  Nut M2 x 1.6mm nyloc |
 |  34 | `nut(M2p5_nut, nyloc = true)` |  Nut M2.5 x 2.2mm nyloc |
-|  16 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
+|  17 | `nut(M3_nut, nyloc = true)` |  Nut M3 x 2.4mm nyloc |
 |   8 | `nut(M4_nut, nyloc = true)` |  Nut M4 x 3.2mm nyloc |
 |   1 | `pcb(PI_IO)` |  PI_IO V2 |
-|   1 | `pcb(PSU12V1A)` |  PSU 12V 1A |
+|   1 | `pcb(PSU12V1A)` |  PSU 12V 1A - not shown |
 |   1 | `pcb(PERF60x40)` |  Perfboard 60 x 40mm |
 |   1 | `pcb(PERF70x30)` |  Perfboard 70 x 30mm |
 |   1 | `pcb(PERF70x50)` |  Perfboard 70 x 50mm |
@@ -2346,8 +2353,8 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |  12 | `screw(M2p5_pan_screw, 25)` |  Screw M2.5 pan x 25mm |
 |   4 | `screw(M2p5_pan_screw, 30)` |  Screw M2.5 pan x 30mm |
 |   4 | `screw(M3_cap_screw, 16)` |  Screw M3 cap x 16mm |
-|   8 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
-|   4 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
+|   4 | `screw(M3_cap_screw, 30)` |  Screw M3 cap x 30mm |
+|   9 | `screw(M3_cap_screw, 35)` |  Screw M3 cap x 35mm |
 |   8 | `screw(M4_cap_screw, 35)` |  Screw M4 cap x 35mm |
 |   1 | `pcb(TP4056)` |  TP4056 Li-lon Battery charger module |
 |   3 | `terminal_35(2)` |  Terminal block 2 way 3.5mm |
@@ -2356,7 +2363,7 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   1 | `pcb(WD2002SJ)` |  WD2002SJ Buck Boost DC-DC converter |
 |  16 | `washer(M2_washer)` |  Washer  M2 x 5mm x 0.3mm |
 |  34 | `washer(M2p5_washer)` |  Washer  M2.5 x 5.9mm x 0.5mm |
-|  16 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
+|  17 | `washer(M3_washer)` |  Washer  M3 x 7mm x 0.5mm |
 |   8 | `washer(M4_washer)` |  Washer  M4 x 9mm x 0.8mm |
 |   1 | `pcb(ZC_A0591)` |  ZC-A0591 ULN2003 driver PCB |
 
@@ -2373,11 +2380,11 @@ PCBs and perfboard with optional components. The shape can be a rectangle with o
 |   4 | pcb_spacer25150_2.stl |
 |   4 | pcb_spacer25160_2.stl |
 |   4 | pcb_spacer25170_2.stl |
+|   4 | pcb_spacer25190.stl |
 |   4 | pcb_spacer25200.stl |
-|   4 | pcb_spacer25210.stl |
 |   2 | pcb_spacer2580.stl |
 |   4 | pcb_spacer30180.stl |
-|   4 | pcb_spacer30190.stl |
+|   5 | pcb_spacer30210.stl |
 |   4 | pcb_spacer30220.stl |
 |   4 | pcb_spacer3050.stl |
 |   4 | pcb_spacer40230.stl |
@@ -2611,8 +2618,8 @@ Timing belt pulleys, both toothed and plain with internal bearings for idlers.
 ### Modules
 | Module | Description |
 |:--- |:--- |
-| `pulley(type)` | Draw a pulley |
-| `pulley_assembly(type)` | Draw a pulley with its grub screws in place |
+| `pulley(type, colour = silver)` | Draw a pulley |
+| `pulley_assembly(type, colour = silver)` | Draw a pulley with its grub screws in place |
 
 ![pulleys](tests/png/pulleys.png)
 
@@ -2947,6 +2954,7 @@ For an explanation of `screw_polysink()` see <https://hydraraptor.blogspot.com/2
 |   1 | `screw(M4_pan_screw, 30)` |  Screw M4 pan x 30mm |
 |   1 | `screw(M5_cap_screw, 30)` |  Screw M5 cap x 30mm |
 |   1 | `screw(M5_cs_cap_screw, 30)` |  Screw M5 cs cap x 30mm |
+|   1 | `screw(M5_dome_screw, 30)` |  Screw M5 dome x 30mm |
 |   1 | `screw(M5_hex_screw, 30)` |  Screw M5 hex x 30mm |
 |   1 | `screw(M5_pan_screw, 30)` |  Screw M5 pan x 30mm |
 |   1 | `screw(M6_cap_screw, 30)` |  Screw M6 cap x 30mm |

vitamins/microswitch.scad

@@ -18,7 +18,11 @@
 //
 
 //
-//! Used for limit switches.
+//! Used for limit switches. Currently only the button type is supported as the lever and roller types are less accurate.
+//!
+//! The switch is drawn with the button at the nominal operation point. This can be plus or minus `microswitch_op_tol(type)`.
+//!
+//! When the button is released it comes out by a maximum of `microswitch_fp_max(type)` from the nominal operating point.
 //
 include <../utils/core/core.scad>
 
@@ -32,11 +36,13 @@ function microswitch_hole_d(type)    = type[6];     //! Screw hole diameter
 function microswitch_holes(type)     = type[7];     //! Hole positions
 function microswitch_button_w(type)  = type[8];     //! Button width
 function microswitch_button_t(type)  = type[9];     //! Button thickness
-function microswitch_button_pos(type)= type[10];    //! Button position
-function microswitch_legs(type)      = type[11];    //! Leg positions
-function microswitch_leg(type)       = type[12];    //! Leg types
-function microswitch_body_clr(type)  = type[13];    //! Body colour
-function microswitch_button_clr(type)= type[14];    //! Button colour
+function microswitch_button_pos(type)= type[10];    //! Button position at operating point
+function microswitch_op_tol(type)    = type[11];    //! Operating position +/- tolerance
+function microswitch_fp_max(type)    = type[12];    //! Free position maximum
+function microswitch_legs(type)      = type[13];    //! Leg positions
+function microswitch_leg(type)       = type[14];    //! Leg types
+function microswitch_body_clr(type)  = type[15];    //! Body colour
+function microswitch_button_clr(type)= type[16];    //! Button colour
 
 function microswitch_lower_extent(type) = let(leg = microswitch_leg(type)) min([for(pos = microswitch_legs(type)) pos.y - leg.y / 2]); //! How far legs extend downwards
 function microswitch_right_extent(type) = let(leg = microswitch_leg(type)) max([microswitch_length(type) / 2, for(pos = microswitch_legs(type)) pos.x + leg.x / 2]); //! How far legs extend right

vitamins/microswitches.scad

@@ -23,10 +23,19 @@
 small_leg  = [0.9,  3.3, 0.4, 0];
 medium_leg = [0.5,  3.9, 3.2, 1.6, [0, -0.5]];
 large_leg  = [11.4, 0.8, 6.3, 1.8, [1.7, 0]];
-
-small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
-medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
-large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], [[19.7,   2.19], [19.7, -3.45],  [8.3, -10.45] ], large_leg,  "ivory", "white" ];
+//                                                               t    w     l     r  h     h                               b     b    b             o     f     l                                                l           b         b
+//                                                               h    i     e     a  o     o                               u     u    u             p     p     e                                                e           o         u
+//                                                               i    d     n     d  l     l                               t     t    t                         g                                                g           d         t
+//                                                               c    t     g     i  e     e                               t     t    t             t     m                                                                  y         t
+//                                                               k    h     t     u                                        o     o    o             o     a     p                                                t                     o
+//                                                               n          h     s  d     p                               n     n    n             l     x     o                                                y           c         n
+//                                                               e                   i     o                                                                    s                                                p           l
+//                                                               s                   a     s                               w     t    p                         n                                                e           r         c
+//                                                               n                         n                                          o                         s                                                                      l
+//                                                                                         s                                          s                                                                                                r
+small_microswitch  = ["small_microswitch", "DM1-00P-110-3",      5.8, 6.5,  12.8, 0, 2,    [[-3.25, -1.65], [3.25, -1.65]], 2.9, 1.2, [-1.95, 3.75], 0.2, 0.55, [[-5.08, -4.95], [0,    -4.9],  [5.08, -4.9]  ], small_leg,  grey(20), "white"  ];
+medium_microswitch = ["medium_microswitch","SS-01 or SS-5GL",    6.4, 10.2, 19.8, 1, 2.35, [[-4.8,  -2.6 ], [4.7,  -2.6 ]], 3.2, 2,   [-2.8,  5.8 ], 0.5, 1.00, [[-8.05, -7.05], [0.75, -7.05], [8.05, -7.05] ], medium_leg, grey(20), "burlywood" ];
+large_microswitch  = ["large_microswitch", "Saia G3 low force", 10.4, 15.9, 28.0, 2, 3.1,  [[-11.1, -5.15], [11.2,  5.15]], 4,   2.75,[-9.1,  9.55], 0.3, 1.2,  [[19.7,   2.19], [19.7, -3.45], [8.3, -10.45] ], large_leg,  "ivory",  "white" ]; //G3M1T1PUL
 
 microswitches = [small_microswitch, medium_microswitch, large_microswitch];
 

vitamins/pcbs.scad

@@ -196,6 +196,105 @@ Duex5 = ["Duex5", "Duex5 expansion board",
                                                                     ]),
                                                                     []];
 
+BTT_SKR_MINI_E3_V2_0 = [
+    "BTT_SKR_MINI_E3_V2_0", "BigTreeTech SKR Mini E3 v2.0",
+    100.75, 70.25, 1.6, // size
+    1, // corner radius
+    3, // mounting hole diameter
+    5, // pad around mounting hole
+    grey(30), // color
+    false, // true if parts should be separate BOM items
+    [ // hole positions
+        [ 19.3,              -2.89 ],
+        [ 19.3   + 62.15,    -2.89 ],
+        [  2.535,            -2.89 - 34.98 ],
+        [  2.535 + 31.80,    -2.89 - 37.63 ],
+        [  2.535 + 95.68,    -2.89 - 64.47 ]
+    ],
+    [ // components
+        // cpu
+        [ 55,   33,     0, "chip", 10, 10,   1,   grey(15) ],
+        // hotend and heated bed
+        [ 26,   16,     0, "chip", 9.5, 8.5, 4,   grey(15) ],
+        [ 37,   14,     0, "chip", 6,   6,   2.5, grey(15) ],
+        // driver chips
+        [ 10.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 30.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 50.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        [ 70.5,-17.5,   0, "chip",  5,  5, 1, grey(15) ],
+        // heat dissipation under board
+        [ 43,  -17.5,   0, "-block", 85, 8, 0.1, gold ],
+        [ 40,   16,     0, "-block", 10, 8, 0.1, gold ],
+        [ 27,   19,     0, "-block", 13,14, 0.1, gold ],
+        [ 12,   28.5,   0, "-block", 11, 7, 0.1, gold ],
+        // mock up heat sinks over the chips
+        [  10.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [10.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  30.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [30.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  50.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [50.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+        [  70.5,  -17.5,  0, "chip",  9, 8.5,  2, "DeepSkyBlue" ],
+        for(x = [70.5], y = [-4,-2,0,2,4]) [ x, -17.5 + y,  0, "chip",  9, 0.75, 11, "DeepSkyBlue" ],
+
+        // terminals
+        [  5.25, 5.3, 180, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 18.1,  5.1, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 29.3,  5.1, -90, "gterm", gt_5x17, 2, undef, grey(20) ],
+        [ 40.5,  5.1, -90, "gterm", gt_5x11, 2, undef, grey(20) ],
+        // SD and USB
+        [  -3, -(22.27 + 29.92)/2, 0, "usb_uA" ],
+        [  -8, -( 2.13 + 17.17)/2, 0, "uSD", [17.17 - 2.13, 16, 2] ],
+        // EXP
+        [  -4.5, 17,   -90, "2p54boxhdr", 5, 2 ],
+        // TFT
+        [  66.1,  21.7,  0, "2p54header", 5, 1 ],
+        // FAN0
+        [  50.25,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // FAN1
+        [  49.9,  16.1,  0, "jst_xh", 2, false, grey(20) ],
+        // PS-ON
+        [  58.1,  16.1,  0, "jst_xh", 2, false, grey(20) ],
+        // PWR-DET
+        [  67.5,  16.0,  0, "jst_xh", 3, false, grey(20) ],
+        // E0-STOP
+        [  78.2,  16.0,  0, "jst_xh", 3, false, grey(20) ],
+        // Z-PROBE
+        [  87.2,  20.5, -90,"jst_xh", 5, false, grey(20) ],
+        // NEO Pixel
+        [  78.2,  27.1,  0, "jst_xh", 3, false, grey(20) ],
+        // end stops
+        [  58.60,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  66.70,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  74.90,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // thermistors
+        [  83.00,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        [  91.10,  3.8,  0, "jst_xh", 2, false, grey(20) ],
+        // motor connections
+        [  10.15, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  30.35, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  43.90, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  57.25, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        [  70.75, -4.2,  0, "jst_xh", 4, false, grey(20) ],
+        // motor jumpers
+        [  20.6,  44.1,  0, "2p54header", 2, 1 ],
+        [  39.6,  44.2,  0, "2p54header", 2, 1 ],
+        [  60.1,  44.1,  0, "2p54header", 2, 1 ],
+        [  80.3,  44.1,  0, "2p54header", 2, 1 ],
+        // SWD
+        [  43.9,  39.2,  0, "2p54header", 1, 5 ],
+        // SPI
+        [  -3.1,  31.9,  0, "2p54header", 2, 3 ],
+        // PWR-1
+        [  -12.8, 30.3,  0, "2p54header", 3, 1 ],
+        // VOUT
+        [  -14.0, 34.4,  0, "2p54header", 2, 2 ],
+        // VIN
+        [  17.3,  19.6,  0, "2p54header", 2, 2 ],
+    ],
+    [] // accessories
+];
+
 TMC2130 = [
     "TMC2130", "TMC2130",
     20, 14, 1.6, // size
@@ -558,9 +657,9 @@ ESP_01 = [
     [] // accessories
 ];
 
-pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, PSU12V1A, WD2002SJ, RPI3, RPI4, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
+pcbs = [MP1584EN, TP4056, ESP_01, RAMPSEndstop, MT3608, PI_IO, ExtruderPCB, ZC_A0591, RPI0, EnviroPlus, ArduinoUno3, ArduinoLeonardo, Keyes5p1, WD2002SJ, RPI3, RPI4, BTT_SKR_MINI_E3_V2_0, BTT_SKR_V1_4_TURBO, DuetE, Duex5];
 
-pcbs_not_shown = [Melzi, Duex2];
+pcbs_not_shown = [Melzi, Duex2, PSU12V1A];
 
 perfboards = [PERF74x51, PERF70x50, PERF60x40, PERF70x30, PERF80x20];
 

vitamins/pulley.scad

@@ -53,7 +53,7 @@ function pulley_extent(type) = max(pulley_flange_dia(type), pulley_hub_dia(type)
 T_angle = 40;
 GT_r = 0.555;
 
-module pulley(type) { //! Draw a pulley
+module pulley(type, colour = silver) { //! Draw a pulley
     teeth = pulley_teeth(type);
     od = pulley_od(type);
 
@@ -117,7 +117,7 @@ module pulley(type) { //! Draw a pulley
                 rotate([-90, 0, i * -90])
                     cylinder(r = screw_radius(pulley_screw(type)), h = 100);
 
-    color(silver) {
+    color(colour) {
         if(screw_z && screw_z < hl)
             render()
                 difference() {
@@ -140,9 +140,9 @@ module pulley(type) { //! Draw a pulley
     }
 }
 
-module pulley_assembly(type) { //! Draw a pulley with its grub screws in place
+module pulley_assembly(type, colour = silver) { //! Draw a pulley with its grub screws in place
     translate_z(pulley_offset(type)) {
-        pulley(type);
+        pulley(type, colour);
 
         if(pulley_screws(type))
             translate_z(pulley_screw_z(type))

vitamins/screws.scad

@@ -83,6 +83,7 @@ M5_cs_cap_screw  = ["M5_cs_cap","M5 cs cap",    hs_cs_cap,5,10.0, 0,    3.00,3.0
 M2_dome_screw    = ["M2_dome", "M2 dome",       hs_dome,  2, 3.5, 1.3,  0.6, 1.3, 16,  M2_washer, M2_nut,   M2_tap_radius,    M2_clearance_radius];
 M3_dome_screw    = ["M3_dome", "M3 dome",       hs_dome,  3, 5.7, 1.65, 1.04,2.0, 18,  M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
 M4_dome_screw    = ["M4_dome", "M4 dome",       hs_dome,  4, 7.6, 2.2,  1.3, 2.5, 20,  M4_washer, M4_nut,   M4_tap_radius,    M4_clearance_radius];
+M5_dome_screw    = ["M5_dome", "M5 dome",       hs_dome,  5, 9.5, 2.75, 1.56,3.0, 22,  M5_washer, M5_nut,   M5_tap_radius,    M5_clearance_radius];
 
 M2p5_pan_screw   = ["M2p5_pan", "M2.5 pan",     hs_pan, 2.5, 4.7, 1.7,    0,   0, 0, M2p5_washer, M2p5_nut, M2p5_tap_radius,  M2p5_clearance_radius];
 M3_pan_screw     = ["M3_pan", "M3 pan",         hs_pan,   3, 5.4, 2.0,    0,   0, 0,   M3_washer, M3_nut,   M3_tap_radius,    M3_clearance_radius];
@@ -111,7 +112,7 @@ screw_lists = [
 [ M2_cap_screw,    M2p5_cap_screw, M3_cap_screw,    M4_cap_screw,    M5_cap_screw, M6_cap_screw, M8_cap_screw],
 [ 0,               0,              M3_low_cap_screw],
 [ M2_cs_cap_screw, 0,              M3_cs_cap_screw, M4_cs_cap_screw, M5_cs_cap_screw],
-[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw],
+[ M2_dome_screw,   0,              M3_dome_screw,   M4_dome_screw,   M5_dome_screw],
 [ 0,               0,              M3_hex_screw,    M4_hex_screw,    M5_hex_screw, M6_hex_screw, M8_hex_screw],
 [ 0,               M2p5_pan_screw, M3_pan_screw,    M4_pan_screw,    M5_pan_screw, M6_pan_screw, No632_pan_screw],
 [ No2_screw,       0,              No4_screw,       No6_screw,       No6_cs_screw],