openscad/NopSCADlib
1
0
Fork 0
mirror of https://github.com/nophead/NopSCADlib.git synced 2025-08-08 00:16:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'magnet_name' of https://github.com/martinbudden/NopSCADlib into martinbudden-magnet_name

Browse Source
This commit is contained in:
Chris Palmer
2021-10-24 13:36:33 +01:00
parent 5ddd9f6324 427ef610de
commit f727e1d27d
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vitamins/magnet.scad
View File

@@ -22,10 +22,11 @@
// //
include <../utils/core/core.scad> include <../utils/core/core.scad>
function magnet_od(type) = type[1]; //! Outer diameter function magnet_name(type) = type[1]; //! Name
function magnet_id(type) = type[2]; //! Inside diameter if a ring function magnet_od(type) = type[2]; //! Outer diameter
function magnet_h(type) = type[3]; //! Height function magnet_id(type) = type[3]; //! Inside diameter if a ring
function magnet_r(type) = type[4]; //! Corner radius function magnet_h(type) = type[4]; //! Height
function magnet_r(type) = type[5]; //! Corner radius
module magnet(type) { //! Draw specified magnet module magnet(type) { //! Draw specified magnet
od = magnet_od(type); od = magnet_od(type);
@@ -33,7 +34,7 @@ module magnet(type) { //! Draw specified magnet
h = magnet_h(type); h = magnet_h(type);
r = magnet_r(type); r = magnet_r(type);
vitamin(str("magnet(", type[0], "): Magnet ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" )); vitamin(str("magnet(", type[0], "): ", magnet_name(type), ", ", od, "mm diameter, ", h, "mm high", id ? str(", ", id, "mm bore") : "" ));
or = od / 2; or = od / 2;
ir = id / 2; ir = id / 2;

11
vitamins/magnets.scad
View File

@@ -20,11 +20,12 @@
//! Cylindrical and ring magnets. //! Cylindrical and ring magnets.
// //
// od, id, h, r // name, od, id, h, r
MAG8x4x4p2 = ["MAG8x4x4p2", 8, 4.2, 4, 0.5]; MAG8x4x4p2 = ["MAG8x4x4p2", "Magnet", 8, 4.2, 4, 0.5];
MAG484 = ["MAG484", inch(1/4), inch(1/8), inch(1/4), 0.5]; MAG484 = ["MAG484", "Magnet", inch(1/4), inch(1/8), inch(1/4), 0.5];
MAG5x8 = ["MAG5x8", 8, 0, 5, 0.5]; MAG5x8 = ["MAG5x8", "Magnet", 8, 0, 5, 0.5];
MAGRE6x2p5 = ["MAGRE6x2p5", "Radial encoder magnet", 6, 0, 2.5, 0.5];
magnets = [MAG8x4x4p2, MAG484, MAG5x8]; magnets = [MAG8x4x4p2, MAG484, MAG5x8, MAGRE6x2p5];
use <magnet.scad> use <magnet.scad>