diff --git a/libtest.png b/libtest.png index 66577e1..04b1238 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/libtest.scad b/libtest.scad index 1b134aa..9aa50dd 100644 --- a/libtest.scad +++ b/libtest.scad @@ -351,7 +351,7 @@ modules_y = iecs_y + 60; ssrs_y = modules_y + 80; blowers_y = ssrs_y + 60; batteries_y = blowers_y + 100; -steppers_y = batteries_y + 70; +steppers_y = batteries_y + 55; panel_meters_y = steppers_y + 70; extrusions_y = panel_meters_y + 80; diff --git a/readme.md b/readme.md index 7da7fe9..cdc3aaf 100644 --- a/readme.md +++ b/readme.md @@ -3461,15 +3461,16 @@ NEMA stepper motor model. | Qty | Module call | BOM entry | | ---:|:--- |:---| | 4 | `ring_terminal(M3_ringterm)` | Ring terminal 3mm | -| 15 | `screw(M3_pan_screw, 8)` | Screw M3 pan x 8mm | +| 20 | `screw(M3_pan_screw, 8)` | Screw M3 pan x 8mm | | 1 | `NEMA(NEMA14)` | Stepper motor NEMA14 x 36mm | | 1 | `NEMA(NEMA16)` | Stepper motor NEMA16 x 19.2mm | +| 1 | `NEMA(NEMA17P)` | Stepper motor NEMA17 x 26.5mm | | 1 | `NEMA(NEMA17S)` | Stepper motor NEMA17 x 34mm | | 1 | `NEMA(NEMA17M)` | Stepper motor NEMA17 x 40mm | | 1 | `NEMA(NEMA17)` | Stepper motor NEMA17 x 47mm | | 1 | `NEMA(NEMA23)` | Stepper motor NEMA22 x 51.2mm | -| 11 | `washer(M3_washer)` | Washer M3 x 7mm x 0.5mm | -| 15 | `star_washer(M3_washer)` | Washer star M3 x 0.5mm | +| 16 | `washer(M3_washer)` | Washer M3 x 7mm x 0.5mm | +| 20 | `star_washer(M3_washer)` | Washer star M3 x 0.5mm | Top diff --git a/tests/png/stepper_motors.png b/tests/png/stepper_motors.png index 2311a65..26c6be0 100644 Binary files a/tests/png/stepper_motors.png and b/tests/png/stepper_motors.png differ diff --git a/tests/stepper_motors.scad b/tests/stepper_motors.scad index d9706f9..e17ece1 100644 --- a/tests/stepper_motors.scad +++ b/tests/stepper_motors.scad @@ -22,9 +22,9 @@ include <../vitamins/stepper_motors.scad> use <../utils/layout.scad> module stepper_motors() - layout([for(s = stepper_motors) NEMA_width(s)], 5) let(m = stepper_motors[$i]) { + layout([for(s = stepper_motors) NEMA_width(s)], 5, no_offset = true) let(m = stepper_motors[$i]) { rotate(180) - NEMA(m, 0, m == NEMA17M || m == NEMA17M8); + NEMA(m, 0, m == NEMA17P || m == NEMA17M || m == NEMA17M8); translate_z(4) NEMA_screws(m, M3_pan_screw, n = $i, earth = $i > 4 ? undef : $i - 1); diff --git a/vitamins/stepper_motors.scad b/vitamins/stepper_motors.scad index 8f563d6..8ad742a 100644 --- a/vitamins/stepper_motors.scad +++ b/vitamins/stepper_motors.scad @@ -27,10 +27,11 @@ NEMA17 = ["NEMA17", 42.3, 47, 53.6/2, 25, 11, 2, 5, 24, NEMA17M = ["NEMA17M", 42.3, 40, 53.6/2, 25, 11, 2, 5, 20, 31, [12.5, 11]]; NEMA17M8= ["NEMA17M8", 42.3, 40, 53.6/2, 25, 11, 2, 8, [280, 8, 4], 31, [12.5, 11]]; NEMA17S = ["NEMA17S", 42.3, 34, 53.6/2, 25, 11, 2, 5, 24, 31, [8, 8]]; +NEMA17P = ["NEMA17P", 42.3, 26.5, 53.6/2, 25, 11, 2, 5, 26.5, 31, [10, 8]]; NEMA16 = ["NEMA16", 39.5, 19.2, 50.6/2, 50.6/2, 11, 2, 5, 12, 31, [8, 8]]; NEMA14 = ["NEMA14", 35.2, 36, 46.4/2, 21, 11, 2, 5, 21, 26, [8, 8]]; NEMA23 = ["NEMA23", 56.4, 51.2, 75.7/2, 35, 38.1/2, 1.6, 6.35, 24, 47.1, [8, 8]]; -stepper_motors = [NEMA14, NEMA16, NEMA17S, NEMA17M, NEMA17, NEMA23]; +stepper_motors = [NEMA14, NEMA16, NEMA17P, NEMA17S, NEMA17M, NEMA17, NEMA23]; use