From ab592e049c26d87cf0e1a9f6c3f2d689dd7910a9 Mon Sep 17 00:00:00 2001 From: Chris Palmer Date: Sat, 29 Feb 2020 17:52:36 +0000 Subject: [PATCH] Screws.scad is now included in core.scad, so doesn't need to be included anywhere else. utils/core/core.scad is the old version without fasteners to be used internally in the library. --- core.scad | 20 +++--------- docs/usage.md | 4 +-- lib.scad | 55 +++++++++++++++----------------- printed/box.scad | 2 +- printed/cable_grommets.scad | 2 +- printed/carriers.scad | 2 +- printed/corner_block.scad | 1 - printed/door_hinge.scad | 1 - printed/door_latch.scad | 1 - printed/fixing_block.scad | 1 - printed/flat_hinge.scad | 1 - printed/foot.scad | 1 - printed/handle.scad | 1 - printed/pcb_mount.scad | 1 - printed/printed_box.scad | 1 - printed/psu_shroud.scad | 1 - printed/ribbon_clamp.scad | 1 - printed/screw_knob.scad | 1 - printed/socket_box.scad | 3 +- printed/ssr_shroud.scad | 3 +- printed/strap_handle.scad | 1 - readme.md | 2 +- tests/annotation.scad | 2 +- tests/batteries.scad | 3 +- tests/belts.scad | 2 -- tests/bezier.scad | 2 +- tests/blowers.scad | 1 - tests/bom.scad | 1 - tests/box.scad | 1 - tests/bulldogs.scad | 2 +- tests/butt_box.scad | 1 - tests/buttons.scad | 2 +- tests/cable_grommets.scad | 2 +- tests/cable_strips.scad | 2 +- tests/carriers.scad | 2 +- tests/clip.scad | 2 +- tests/components.scad | 1 - tests/corner_block.scad | 2 -- tests/d_connectors.scad | 2 +- tests/door_hinge.scad | 2 +- tests/door_latch.scad | 2 +- tests/extrusion_brackets.scad | 2 +- tests/extrusions.scad | 3 +- tests/fan_guard.scad | 4 +-- tests/fans.scad | 6 ++-- tests/fixing_block.scad | 2 -- tests/flat_hinge.scad | 1 - tests/foot.scad | 2 +- tests/fuseholder.scad | 2 +- tests/global.scad | 2 +- tests/handle.scad | 2 +- tests/hot_ends.scad | 2 +- tests/iecs.scad | 4 +-- tests/inserts.scad | 2 +- tests/jack.scad | 2 +- tests/kp_pillow_blocks.scad | 5 ++- tests/leadnuts.scad | 1 - tests/leds.scad | 2 +- tests/light_strips.scad | 2 +- tests/linear_bearings.scad | 2 +- tests/mains_sockets.scad | 2 +- tests/maths.scad | 2 +- tests/meter.scad | 2 +- tests/microswitches.scad | 2 +- tests/modules.scad | 3 +- tests/nuts.scad | 2 -- tests/offset.scad | 2 +- tests/opengrab.scad | 2 +- tests/pcb.scad | 4 +-- tests/pcb_mount.scad | 2 +- tests/pcbs.scad | 5 ++- tests/pillars.scad | 2 +- tests/pin_headers.scad | 2 +- tests/polyholes.scad | 2 +- tests/printed_box.scad | 1 - tests/psu_shroud.scad | 5 ++- tests/psus.scad | 5 ++- tests/pulleys.scad | 2 -- tests/rails.scad | 5 ++- tests/ribbon_clamp.scad | 2 +- tests/ring_terminals.scad | 5 ++- tests/rockers.scad | 2 +- tests/rod.scad | 2 +- tests/round.scad | 2 +- tests/rounded_rectangle.scad | 2 +- tests/screw_knob.scad | 3 +- tests/screws.scad | 2 -- tests/scs_bearing_blocks.scad | 4 +-- tests/sealing_strip.scad | 2 +- tests/sheets.scad | 2 +- tests/sk_brackets.scad | 4 +-- tests/socket_box.scad | 2 +- tests/spades.scad | 2 +- tests/sphere.scad | 2 +- tests/spools.scad | 2 +- tests/springs.scad | 2 +- tests/ssr_shroud.scad | 5 ++- tests/ssrs.scad | 5 ++- tests/stepper_motors.scad | 5 ++- tests/strap_handle.scad | 2 +- tests/sweep.scad | 2 +- tests/teardrops.scad | 2 +- tests/thread.scad | 2 +- tests/toggles.scad | 5 ++- tests/transformers.scad | 5 ++- tests/tubings.scad | 2 +- tests/variacs.scad | 5 ++- tests/veroboard.scad | 3 +- tests/washers.scad | 2 +- tests/wire.scad | 2 +- tests/zipties.scad | 2 +- utils/annotation.scad | 2 +- utils/core/core.scad | 39 ++++++++++++++++++++++ utils/dogbones.scad | 2 +- utils/fillet.scad | 2 +- utils/hanging_hole.scad | 2 +- utils/offset.scad | 2 +- utils/quadrant.scad | 2 +- utils/round.scad | 2 +- utils/rounded_cylinder.scad | 2 +- utils/rounded_polygon.scad | 2 +- utils/sector.scad | 2 +- utils/sweep.scad | 2 +- utils/thread.scad | 2 +- utils/tube.scad | 2 +- vitamins/ball_bearing.scad | 2 +- vitamins/batteries.scad | 2 +- vitamins/battery.scad | 2 +- vitamins/belt.scad | 2 +- vitamins/blower.scad | 2 +- vitamins/bulldog.scad | 2 +- vitamins/button.scad | 2 +- vitamins/cable_strip.scad | 2 +- vitamins/component.scad | 1 - vitamins/d_connector.scad | 2 +- vitamins/display.scad | 2 +- vitamins/extrusion.scad | 2 +- vitamins/extrusion_bracket.scad | 4 +-- vitamins/fan.scad | 2 +- vitamins/fans.scad | 2 -- vitamins/fuseholder.scad | 2 +- vitamins/geared_stepper.scad | 2 +- vitamins/green_terminal.scad | 2 +- vitamins/hygrometer.scad | 2 +- vitamins/iecs.scad | 1 - vitamins/insert.scad | 2 +- vitamins/jack.scad | 1 - vitamins/jhead.scad | 2 +- vitamins/kp_pillow_block.scad | 3 +- vitamins/kp_pillow_blocks.scad | 1 - vitamins/ldr.scad | 2 +- vitamins/leadnut.scad | 2 +- vitamins/led.scad | 2 +- vitamins/light_strip.scad | 2 +- vitamins/linear_bearing.scad | 2 +- vitamins/mains_socket.scad | 1 - vitamins/meter.scad | 2 +- vitamins/microswitch.scad | 2 +- vitamins/microview.scad | 2 +- vitamins/module.scad | 1 - vitamins/nut.scad | 2 +- vitamins/o_ring.scad | 2 +- vitamins/opengrab.scad | 2 +- vitamins/pcb.scad | 1 - vitamins/pcbs.scad | 2 +- vitamins/pillar.scad | 2 +- vitamins/pin_header.scad | 3 +- vitamins/psu.scad | 3 +- vitamins/pulley.scad | 2 +- vitamins/pulleys.scad | 2 +- vitamins/rail.scad | 2 +- vitamins/ring_terminal.scad | 2 +- vitamins/rocker.scad | 2 +- vitamins/rod.scad | 2 +- vitamins/screw.scad | 2 +- vitamins/scs_bearing_block.scad | 2 +- vitamins/scs_bearing_blocks.scad | 1 - vitamins/sealing_strip.scad | 2 +- vitamins/sheet.scad | 2 +- vitamins/sk_bracket.scad | 1 - vitamins/sk_brackets.scad | 2 -- vitamins/spade.scad | 2 +- vitamins/spool.scad | 2 +- vitamins/spring.scad | 2 +- vitamins/ssr.scad | 2 +- vitamins/stepper_motor.scad | 5 ++- vitamins/toggle.scad | 2 +- vitamins/transformer.scad | 2 +- vitamins/tubing.scad | 2 +- vitamins/variac.scad | 2 +- vitamins/veroboard.scad | 1 - vitamins/washer.scad | 2 +- vitamins/wire.scad | 2 +- vitamins/ziptie.scad | 2 +- 194 files changed, 242 insertions(+), 290 deletions(-) create mode 100644 utils/core/core.scad diff --git a/core.scad b/core.scad index c97ae0c..4fa3b3c 100644 --- a/core.scad +++ b/core.scad @@ -18,22 +18,10 @@ // // -// Include this file to use the miniumum library +// Include this file to use the miniumum library plus screws, nuts and washers // -include +include // -// Global functions and modules +// Fasteners used by a lot of other vitamins // -use - -module use_stl(name) { //! Import an STL to make a build platter - stl(name); - - import(str("../stls/", name, ".stl")); -} - -module use_dxf(name) { //! Import a DXF to make a build panel - dxf(name); - - import(str("../dxfs/", name, ".dxf")); -} +include diff --git a/docs/usage.md b/docs/usage.md index d267c14..6e24e97 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -116,8 +116,8 @@ get shared if other files in the project include ```lib.scad``` as well, or if y One downside is that any change to the library will mean all the project files need regenerating. A more optimised approach for large projects is to include [NopSCADlib/core.scad](../core.scad) instead. -That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad). Any vitamins used need to be included explicitly. -One can copy the include or use line from [NopSCADlib/lib.scad](../lib.scad). +That only has the a small set of utilities and the global settings in [global_defs.scad](../global_defs.scad) plus screws, nuts and washers that are required by a lot of other vitamins. +Any other vitamins used need to be included explicitly. One can copy the includes or use a line from [NopSCADlib/lib.scad](../lib.scad). ### Parametric parts. diff --git a/lib.scad b/lib.scad index e5750af..60e1868 100644 --- a/lib.scad +++ b/lib.scad @@ -23,43 +23,40 @@ include include +include + +include +include +include +include +include +include +include +include +include include +include +include +include +include +include +include +include +include include include -include -include -include -include -include -include -include -include -include include -include -include -include +include +include +include +include include -include -include -include -include -include -include -include +include include include +include include -include -include -include -include -include -include -include -include -include -include +include use use diff --git a/printed/box.scad b/printed/box.scad index 46f28a5..5b999ab 100644 --- a/printed/box.scad +++ b/printed/box.scad @@ -31,7 +31,7 @@ //! //! Normally the side sheets are the same type but they can be overridden individually as long as the substitute has the same thickness. // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/sheet.scad> use <../vitamins/screw.scad> use <../vitamins/washer.scad> diff --git a/printed/cable_grommets.scad b/printed/cable_grommets.scad index b1ec9ef..aa1fbdc 100644 --- a/printed/cable_grommets.scad +++ b/printed/cable_grommets.scad @@ -21,7 +21,7 @@ //! Printed cable grommets for passing cables through panels avoiding sharp edges and in the case //! of conductive panels, an extra layer of insulation. // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/cable_strip.scad> base = 1.25; diff --git a/printed/carriers.scad b/printed/carriers.scad index 6a390bb..58970f6 100644 --- a/printed/carriers.scad +++ b/printed/carriers.scad @@ -22,7 +22,7 @@ // $extrusion_width = 0.5; -include <../core.scad> +include <../utils/core/core.scad> module ESP12F_carrier_stl() { //! Generate the STL for an ESP12 carrier stl("ESP12F_carrier"); diff --git a/printed/corner_block.scad b/printed/corner_block.scad index 8d04216..46d71c5 100644 --- a/printed/corner_block.scad +++ b/printed/corner_block.scad @@ -31,7 +31,6 @@ //! Star washers can be omitted by setting ```star_washers``` to false. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use <../utils/rounded_cylinder.scad> use <../utils/maths.scad> diff --git a/printed/door_hinge.scad b/printed/door_hinge.scad index ddfc75b..7f4d351 100644 --- a/printed/door_hinge.scad +++ b/printed/door_hinge.scad @@ -24,7 +24,6 @@ //! Rubber door [sealing strip](#sealing_strip) is used to make it airtight and a [door_latch](#door_latch) holds it closed. // include <../core.scad> -include <../vitamins/screws.scad> width = 18; thickness = 4; diff --git a/printed/door_latch.scad b/printed/door_latch.scad index fab8ff3..1590ebb 100644 --- a/printed/door_latch.scad +++ b/printed/door_latch.scad @@ -22,7 +22,6 @@ // include <../core.scad> use <../utils/hanging_hole.scad> -include <../vitamins/screws.scad> length = 35; width = 12; diff --git a/printed/fixing_block.scad b/printed/fixing_block.scad index 64e9619..b58b28c 100644 --- a/printed/fixing_block.scad +++ b/printed/fixing_block.scad @@ -31,7 +31,6 @@ //! Star washers can be omitted by setting ```star_washers``` to false. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use <../utils/maths.scad> diff --git a/printed/flat_hinge.scad b/printed/flat_hinge.scad index 191fc1f..7c79ab2 100644 --- a/printed/flat_hinge.scad +++ b/printed/flat_hinge.scad @@ -30,7 +30,6 @@ //! This allows the hinges and one set of screws to belong to one assembly and the other set of screws to another assembly. // include <../core.scad> -include <../vitamins/screws.scad> function hinge_width(type) = type[1]; //! Width function hinge_depth(type) = type[2]; //! Depth of each leaf diff --git a/printed/foot.scad b/printed/foot.scad index 855f617..433e78a 100644 --- a/printed/foot.scad +++ b/printed/foot.scad @@ -22,7 +22,6 @@ //! inserts don't grip well in rubber. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> foot = [25, 12, 3, 2, M4_cap_screw, 10]; diff --git a/printed/handle.scad b/printed/handle.scad index 048f68d..5077329 100644 --- a/printed/handle.scad +++ b/printed/handle.scad @@ -21,7 +21,6 @@ //! Printed handle that can be printed without needing support material due to its truncated teardrop profile. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> dia = 18; diff --git a/printed/pcb_mount.scad b/printed/pcb_mount.scad index edfe6a5..a5062b3 100644 --- a/printed/pcb_mount.scad +++ b/printed/pcb_mount.scad @@ -22,7 +22,6 @@ //! The stl must be given a parameterless wrapper in the project that uses it. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/pcb.scad> clearance = 0.2; diff --git a/printed/printed_box.scad b/printed/printed_box.scad index 016b383..c52f20e 100644 --- a/printed/printed_box.scad +++ b/printed/printed_box.scad @@ -27,7 +27,6 @@ //! It can also have printed feet on the base with the screws doubling up to hold the base on. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use diff --git a/printed/psu_shroud.scad b/printed/psu_shroud.scad index 05de99f..53d02f9 100644 --- a/printed/psu_shroud.scad +++ b/printed/psu_shroud.scad @@ -22,7 +22,6 @@ //! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use <../vitamins/wire.scad> diff --git a/printed/ribbon_clamp.scad b/printed/ribbon_clamp.scad index 344281f..eea8b92 100644 --- a/printed/ribbon_clamp.scad +++ b/printed/ribbon_clamp.scad @@ -21,7 +21,6 @@ //! Clamp for ribbon cable and polypropylene strip. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use <../vitamins/cable_strip.scad> diff --git a/printed/screw_knob.scad b/printed/screw_knob.scad index 450d628..b7f5cca 100644 --- a/printed/screw_knob.scad +++ b/printed/screw_knob.scad @@ -21,7 +21,6 @@ //! Knob with embedded hex head screw. // include <../core.scad> -include <../vitamins/screws.scad> use <../utils/hanging_hole.scad> knob_wall = 2; diff --git a/printed/socket_box.scad b/printed/socket_box.scad index 2053783..c3c4704 100644 --- a/printed/socket_box.scad +++ b/printed/socket_box.scad @@ -22,9 +22,8 @@ // include <../core.scad> include <../vitamins/mains_sockets.scad> -include <../vitamins/screws.scad> -use <../vitamins/insert.scad> include <../vitamins/ring_terminals.scad> +use <../vitamins/insert.scad> box_height = 19; base_thickness = 2; diff --git a/printed/ssr_shroud.scad b/printed/ssr_shroud.scad index 1df31b8..156f9a7 100644 --- a/printed/ssr_shroud.scad +++ b/printed/ssr_shroud.scad @@ -19,10 +19,9 @@ // //! A cover to go over the mains end of an SSR to make it safe to be touched. -//! The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project. +//! The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> use <../vitamins/wire.scad> diff --git a/printed/strap_handle.scad b/printed/strap_handle.scad index 47e675f..096f886 100644 --- a/printed/strap_handle.scad +++ b/printed/strap_handle.scad @@ -22,7 +22,6 @@ //! be fully customised by passing a list of properties. // include <../core.scad> -include <../vitamins/screws.scad> use <../vitamins/insert.scad> strap = [18, 2, M3_pan_screw, 3, 25]; diff --git a/readme.md b/readme.md index 429b892..074efd3 100644 --- a/readme.md +++ b/readme.md @@ -4585,7 +4585,7 @@ UK 13A socket and printed backbox with earth terminal for the panel it is mounte ## Ssr_shroud A cover to go over the mains end of an SSR to make it safe to be touched. -The stl and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project. +The STL and assembly must be given a name and parameterless wrappers for the stl and assembly added to the project. [printed/ssr_shroud.scad](printed/ssr_shroud.scad) Implementation. diff --git a/tests/annotation.scad b/tests/annotation.scad index 37d3c1b..756b479 100644 --- a/tests/annotation.scad +++ b/tests/annotation.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/annotation.scad> module annotations() { diff --git a/tests/batteries.scad b/tests/batteries.scad index a7d2b5f..4091c6c 100644 --- a/tests/batteries.scad +++ b/tests/batteries.scad @@ -16,10 +16,9 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> -include <../vitamins/springs.scad> include <../vitamins/batteries.scad> module batteries() diff --git a/tests/belts.scad b/tests/belts.scad index a8556a5..d6e253f 100644 --- a/tests/belts.scad +++ b/tests/belts.scad @@ -18,8 +18,6 @@ // include <../core.scad> -include <../vitamins/belts.scad> -include <../vitamins/screws.scad> include <../vitamins/pulleys.scad> use <../vitamins/insert.scad> use <../utils/layout.scad> diff --git a/tests/bezier.scad b/tests/bezier.scad index 7a7cd69..99a3e21 100644 --- a/tests/bezier.scad +++ b/tests/bezier.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/bezier.scad> use <../utils/sweep.scad> use <../utils/annotation.scad> diff --git a/tests/blowers.scad b/tests/blowers.scad index 7e28072..1dcb243 100644 --- a/tests/blowers.scad +++ b/tests/blowers.scad @@ -19,7 +19,6 @@ include <../core.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> include <../vitamins/blowers.scad> module blowers() diff --git a/tests/bom.scad b/tests/bom.scad index 2deab95..19568c3 100644 --- a/tests/bom.scad +++ b/tests/bom.scad @@ -21,7 +21,6 @@ //! BOM and assembly demonstration // include <../core.scad> -include <../vitamins/screws.scad> include <../vitamins/sheets.scad> use <../vitamins/insert.scad> $explode = 1; // Normally set on the command line when generating assembly views with views.py diff --git a/tests/box.scad b/tests/box.scad index 3ffeb5c..6ec18ff 100644 --- a/tests/box.scad +++ b/tests/box.scad @@ -18,7 +18,6 @@ // include <../core.scad> -include <../vitamins/screws.scad> include <../vitamins/sheets.scad> use <../vitamins/insert.scad> diff --git a/tests/bulldogs.scad b/tests/bulldogs.scad index 13b2d18..765ea9c 100644 --- a/tests/bulldogs.scad +++ b/tests/bulldogs.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/bulldogs.scad> diff --git a/tests/butt_box.scad b/tests/butt_box.scad index 9fdcc24..6df0020 100644 --- a/tests/butt_box.scad +++ b/tests/butt_box.scad @@ -18,7 +18,6 @@ // include <../core.scad> -include <../vitamins/screws.scad> include <../vitamins/sheets.scad> use <../vitamins/insert.scad> diff --git a/tests/buttons.scad b/tests/buttons.scad index 8445e43..0e015e3 100644 --- a/tests/buttons.scad +++ b/tests/buttons.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/buttons.scad> diff --git a/tests/cable_grommets.scad b/tests/cable_grommets.scad index 6c0aa05..6c45d58 100644 --- a/tests/cable_grommets.scad +++ b/tests/cable_grommets.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/cable_grommets.scad> diff --git a/tests/cable_strips.scad b/tests/cable_strips.scad index e8ce04c..7dce32d 100644 --- a/tests/cable_strips.scad +++ b/tests/cable_strips.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/cable_strip.scad> diff --git a/tests/carriers.scad b/tests/carriers.scad index e09937d..d188938 100644 --- a/tests/carriers.scad +++ b/tests/carriers.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/carriers.scad> module carriers() diff --git a/tests/clip.scad b/tests/clip.scad index 28f62a1..36d4761 100644 --- a/tests/clip.scad +++ b/tests/clip.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> module clips() { clip(xmin = 0, ymin = 0, zmin = 0, zmax = 40) sphere(50); diff --git a/tests/components.scad b/tests/components.scad index 054cf0d..a074148 100644 --- a/tests/components.scad +++ b/tests/components.scad @@ -19,7 +19,6 @@ include <../core.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> include <../vitamins/components.scad> module resistors() diff --git a/tests/corner_block.scad b/tests/corner_block.scad index cf40758..4a1dbd7 100644 --- a/tests/corner_block.scad +++ b/tests/corner_block.scad @@ -19,8 +19,6 @@ include <../core.scad> use <../printed/corner_block.scad> -include <../vitamins/screws.scad> - screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw]; module do_corner_block(screw) diff --git a/tests/d_connectors.scad b/tests/d_connectors.scad index f2d0016..bd87601 100644 --- a/tests/d_connectors.scad +++ b/tests/d_connectors.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/d_connectors.scad> diff --git a/tests/door_hinge.scad b/tests/door_hinge.scad index 137b4e6..073bfe6 100644 --- a/tests/door_hinge.scad +++ b/tests/door_hinge.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/door_hinge.scad> include <../vitamins/sheets.scad> diff --git a/tests/door_latch.scad b/tests/door_latch.scad index 0cdeebf..83772ea 100644 --- a/tests/door_latch.scad +++ b/tests/door_latch.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/door_latch.scad> module door_latches() diff --git a/tests/extrusion_brackets.scad b/tests/extrusion_brackets.scad index 4432067..a16da34 100644 --- a/tests/extrusion_brackets.scad +++ b/tests/extrusion_brackets.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> include <../vitamins/extrusion_brackets.scad> include <../vitamins/extrusions.scad> diff --git a/tests/extrusions.scad b/tests/extrusions.scad index e88b09d..dd9a5ba 100644 --- a/tests/extrusions.scad +++ b/tests/extrusions.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/extrusions.scad> @@ -27,4 +27,3 @@ module extrusions() if ($preview) extrusions(); - diff --git a/tests/fan_guard.scad b/tests/fan_guard.scad index c36c429..d9bd342 100644 --- a/tests/fan_guard.scad +++ b/tests/fan_guard.scad @@ -17,11 +17,11 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - include <../printed/fan_guard.scad> include <../vitamins/fans.scad> +use <../utils/layout.scad> + module fan_guards() layout([for(f = fans) fan_width(f)], 10) color(pp1_colour) fan_guard(fans[$i], spokes = fan_width(fans[$i]) > 60 ? 8 : 4); diff --git a/tests/fans.scad b/tests/fans.scad index 524d1b6..185327f 100644 --- a/tests/fans.scad +++ b/tests/fans.scad @@ -17,11 +17,11 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - +include <../vitamins/fans.scad> include <../printed/fan_guard.scad> -include <../vitamins/fans.scad> +use <../utils/layout.scad> + module fans() layout([for(f = fans) fan_width(f)], 10) diff --git a/tests/fixing_block.scad b/tests/fixing_block.scad index 1b67469..4e81387 100644 --- a/tests/fixing_block.scad +++ b/tests/fixing_block.scad @@ -20,8 +20,6 @@ include <../core.scad> use <../printed/fixing_block.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> - screws = [M2_cap_screw, M2p5_pan_screw, M3_dome_screw, M4_dome_screw]; module fixing_block_test(screw) diff --git a/tests/flat_hinge.scad b/tests/flat_hinge.scad index 1af6dad..9622282 100644 --- a/tests/flat_hinge.scad +++ b/tests/flat_hinge.scad @@ -17,7 +17,6 @@ // If not, see . // include <../core.scad> -include <../vitamins/screws.scad> use <../utils/layout.scad> use <../printed/flat_hinge.scad> diff --git a/tests/foot.scad b/tests/foot.scad index c0a19c1..ce28053 100644 --- a/tests/foot.scad +++ b/tests/foot.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/foot.scad> module feet() diff --git a/tests/fuseholder.scad b/tests/fuseholder.scad index 313b852..835b9ca 100644 --- a/tests/fuseholder.scad +++ b/tests/fuseholder.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/fuseholder.scad> diff --git a/tests/global.scad b/tests/global.scad index b3ba956..f5a8480 100644 --- a/tests/global.scad +++ b/tests/global.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> module globals() { linear_extrude(height = eps) { diff --git a/tests/handle.scad b/tests/handle.scad index 2237fc4..3e76b32 100644 --- a/tests/handle.scad +++ b/tests/handle.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/handle.scad> module handle() diff --git a/tests/hot_ends.scad b/tests/hot_ends.scad index d1d7b33..cf6a5ca 100644 --- a/tests/hot_ends.scad +++ b/tests/hot_ends.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/hot_ends.scad> diff --git a/tests/iecs.scad b/tests/iecs.scad index 971bf0a..77245ee 100644 --- a/tests/iecs.scad +++ b/tests/iecs.scad @@ -17,10 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - include <../vitamins/iecs.scad> +use <../utils/layout.scad> + module iecs() layout([for(i = iecs) iec_flange_h(i)], 10) rotate(90) diff --git a/tests/inserts.scad b/tests/inserts.scad index 0813c90..f2fdc34 100644 --- a/tests/inserts.scad +++ b/tests/inserts.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/inserts.scad> diff --git a/tests/jack.scad b/tests/jack.scad index f5bfcc5..0cdd5e8 100644 --- a/tests/jack.scad +++ b/tests/jack.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/jack.scad> diff --git a/tests/kp_pillow_blocks.scad b/tests/kp_pillow_blocks.scad index 39f14d8..fc4eb7c 100644 --- a/tests/kp_pillow_blocks.scad +++ b/tests/kp_pillow_blocks.scad @@ -17,10 +17,9 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - include <../vitamins/kp_pillow_blocks.scad> -include <../vitamins/nuts.scad> + +use <../utils/layout.scad> module kp_pillow_blocks() { screws = [M4_cap_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw]; diff --git a/tests/leadnuts.scad b/tests/leadnuts.scad index d337bf0..a9a67a6 100644 --- a/tests/leadnuts.scad +++ b/tests/leadnuts.scad @@ -19,7 +19,6 @@ include <../core.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> include <../vitamins/leadnuts.scad> module leadnuts() diff --git a/tests/leds.scad b/tests/leds.scad index 53f0842..98e4ca1 100644 --- a/tests/leds.scad +++ b/tests/leds.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/leds.scad> diff --git a/tests/light_strips.scad b/tests/light_strips.scad index d95599e..58d4e3c 100644 --- a/tests/light_strips.scad +++ b/tests/light_strips.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/light_strips.scad> diff --git a/tests/linear_bearings.scad b/tests/linear_bearings.scad index 6d54a03..0b20fa8 100644 --- a/tests/linear_bearings.scad +++ b/tests/linear_bearings.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/linear_bearings.scad> diff --git a/tests/mains_sockets.scad b/tests/mains_sockets.scad index b9d7832..365a23b 100644 --- a/tests/mains_sockets.scad +++ b/tests/mains_sockets.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/mains_sockets.scad> diff --git a/tests/maths.scad b/tests/maths.scad index 4d732fc..d721fda 100644 --- a/tests/maths.scad +++ b/tests/maths.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/maths.scad> use <../utils/annotation.scad> diff --git a/tests/meter.scad b/tests/meter.scad index a010603..4944ecc 100644 --- a/tests/meter.scad +++ b/tests/meter.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/meter.scad> diff --git a/tests/microswitches.scad b/tests/microswitches.scad index 95ad753..73ebfa2 100644 --- a/tests/microswitches.scad +++ b/tests/microswitches.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/microswitches.scad> diff --git a/tests/modules.scad b/tests/modules.scad index 5bfd1d3..fa986af 100644 --- a/tests/modules.scad +++ b/tests/modules.scad @@ -17,10 +17,9 @@ // If not, see . // include <../core.scad> +include <../vitamins/modules.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> -include <../vitamins/modules.scad> module modules() layout([for(m = modules) mod_length(m)], 5) diff --git a/tests/nuts.scad b/tests/nuts.scad index 1fe8504..e76bc21 100644 --- a/tests/nuts.scad +++ b/tests/nuts.scad @@ -19,8 +19,6 @@ include <../core.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> - module nuts() { layout([for(n = nuts) 2 * nut_radius(n)], 5) let(n = nuts[$i]) { for(nyloc = [false, true]) diff --git a/tests/offset.scad b/tests/offset.scad index bd81d11..31a2ef9 100644 --- a/tests/offset.scad +++ b/tests/offset.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/offset.scad> module shape() diff --git a/tests/opengrab.scad b/tests/opengrab.scad index 0fd59dc..431c1d5 100644 --- a/tests/opengrab.scad +++ b/tests/opengrab.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/opengrab.scad> diff --git a/tests/pcb.scad b/tests/pcb.scad index db51d89..d0c1014 100644 --- a/tests/pcb.scad +++ b/tests/pcb.scad @@ -17,11 +17,11 @@ // If not, see . // include <../core.scad> - -use <../vitamins/pcb.scad> include <../vitamins/microswitches.scad> include <../vitamins/d_connectors.scad> +use <../vitamins/pcb.scad> + gt_5x17 = ["gt_5x17", 5, 10, 17, 5, 11, 0.4, 9, 2,1.5, 1, 3, 6, 0, 0, 0]; gt_5x11 = ["gt_5x11", 5, 8, 11, 5, 7, 0.4, 7, 1.5,1.5, 1,2.5, 6, 0, 0, 0]; diff --git a/tests/pcb_mount.scad b/tests/pcb_mount.scad index 99e88e1..e1fe8a3 100644 --- a/tests/pcb_mount.scad +++ b/tests/pcb_mount.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/pcb_mount.scad> PI_IO = ["PI_IO", "PI_IO V2", 35.56, 25.4, 1.6, 0, 0, 0, "green", true, [], diff --git a/tests/pcbs.scad b/tests/pcbs.scad index 72c2ccc..7493ad9 100644 --- a/tests/pcbs.scad +++ b/tests/pcbs.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/d_connectors.scad> include <../vitamins/pcbs.scad> +use <../utils/layout.scad> + module pcbs() layout([for(p = pcbs) pcb_width(p)], 10) translate([0, pcb_length(pcbs[$i]) / 2]) diff --git a/tests/pillars.scad b/tests/pillars.scad index d3c51a9..6c892d7 100644 --- a/tests/pillars.scad +++ b/tests/pillars.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/pillars.scad> diff --git a/tests/pin_headers.scad b/tests/pin_headers.scad index 08905c3..51a3c78 100644 --- a/tests/pin_headers.scad +++ b/tests/pin_headers.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/pin_headers.scad> diff --git a/tests/polyholes.scad b/tests/polyholes.scad index e58d6e4..9555478 100644 --- a/tests/polyholes.scad +++ b/tests/polyholes.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/rod.scad> include <../vitamins/sheets.scad> diff --git a/tests/printed_box.scad b/tests/printed_box.scad index db0b12e..a0f63d3 100644 --- a/tests/printed_box.scad +++ b/tests/printed_box.scad @@ -18,7 +18,6 @@ // include <../core.scad> -include <../vitamins/screws.scad> use <../printed/foot.scad> use <../printed/printed_box.scad> diff --git a/tests/psu_shroud.scad b/tests/psu_shroud.scad index 1c801c8..c2ceb4e 100644 --- a/tests/psu_shroud.scad +++ b/tests/psu_shroud.scad @@ -17,10 +17,9 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/psus.scad> + +use <../utils/layout.scad> use <../printed/psu_shroud.scad> thickness = 3; diff --git a/tests/psus.scad b/tests/psus.scad index 9c934e7..c964e4a 100644 --- a/tests/psus.scad +++ b/tests/psus.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/psus.scad> +use <../utils/layout.scad> + module psus() layout([for(p = psus) psu_width(p)], 10) let(p = psus[$i]) rotate(atx_psu(p) ? 0 : 90) { diff --git a/tests/pulleys.scad b/tests/pulleys.scad index 79212d6..a28a21b 100644 --- a/tests/pulleys.scad +++ b/tests/pulleys.scad @@ -19,8 +19,6 @@ include <../core.scad> use <../utils/layout.scad> -include <../vitamins/screws.scad> -include <../vitamins/belts.scad> include <../vitamins/pulleys.scad> module pulleys() diff --git a/tests/rails.scad b/tests/rails.scad index 2a72118..0716547 100644 --- a/tests/rails.scad +++ b/tests/rails.scad @@ -17,10 +17,9 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/rails.scad> + +use <../utils/layout.scad> use <../vitamins/nut.scad> sheet = 3; diff --git a/tests/ribbon_clamp.scad b/tests/ribbon_clamp.scad index 90b7443..dfaf218 100644 --- a/tests/ribbon_clamp.scad +++ b/tests/ribbon_clamp.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/ribbon_clamp.scad> use <../vitamins/wire.scad> diff --git a/tests/ring_terminals.scad b/tests/ring_terminals.scad index c67e786..8d695a5 100644 --- a/tests/ring_terminals.scad +++ b/tests/ring_terminals.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/ring_terminals.scad> +use <../utils/layout.scad> + module ring_terminals() layout([for(t = ring_terminals) ringterm_od(t)], 5) rotate(180) diff --git a/tests/rockers.scad b/tests/rockers.scad index 6501747..2f0251b 100644 --- a/tests/rockers.scad +++ b/tests/rockers.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/rockers.scad> diff --git a/tests/rod.scad b/tests/rod.scad index 97f4693..40aee6e 100644 --- a/tests/rod.scad +++ b/tests/rod.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/linear_bearings.scad> diff --git a/tests/round.scad b/tests/round.scad index dc552b0..25931fb 100644 --- a/tests/round.scad +++ b/tests/round.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/round.scad> module shape() diff --git a/tests/rounded_rectangle.scad b/tests/rounded_rectangle.scad index 8d903cd..37482bf 100644 --- a/tests/rounded_rectangle.scad +++ b/tests/rounded_rectangle.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> module rounded_rectangles() { linear_extrude(height = eps) diff --git a/tests/screw_knob.scad b/tests/screw_knob.scad index 8b2e308..0eeb83d 100644 --- a/tests/screw_knob.scad +++ b/tests/screw_knob.scad @@ -17,9 +17,8 @@ // If not, see . // include <../core.scad> -use <../printed/screw_knob.scad> -include <../vitamins/screws.scad> +use <../printed/screw_knob.scad> screws = [M3_hex_screw, M4_hex_screw]; diff --git a/tests/screws.scad b/tests/screws.scad index d826c83..f2f2120 100644 --- a/tests/screws.scad +++ b/tests/screws.scad @@ -18,8 +18,6 @@ // include <../core.scad> -include <../vitamins/screws.scad> - module screws() for(y = [0 : len(screw_lists) -1]) for(x = [0 : len(screw_lists[y]) -1]) { diff --git a/tests/scs_bearing_blocks.scad b/tests/scs_bearing_blocks.scad index 2c798db..d927ca1 100644 --- a/tests/scs_bearing_blocks.scad +++ b/tests/scs_bearing_blocks.scad @@ -17,10 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - include <../vitamins/scs_bearing_blocks.scad> +use <../utils/layout.scad> + module scs_bearing_blocks() layout([for(s = scs_bearing_blocks) scs_size(s).x], 10) { part_thickness = 5; diff --git a/tests/sealing_strip.scad b/tests/sealing_strip.scad index 215f43b..213bd66 100644 --- a/tests/sealing_strip.scad +++ b/tests/sealing_strip.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../vitamins/sealing_strip.scad> module sealing_strip_test() diff --git a/tests/sheets.scad b/tests/sheets.scad index c7fcdbb..97f871a 100644 --- a/tests/sheets.scad +++ b/tests/sheets.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/sheets.scad> diff --git a/tests/sk_brackets.scad b/tests/sk_brackets.scad index 0ca77cb..f2d34f8 100644 --- a/tests/sk_brackets.scad +++ b/tests/sk_brackets.scad @@ -17,11 +17,11 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - include <../vitamins/sk_brackets.scad> include <../vitamins/extrusions.scad> +use <../utils/layout.scad> + module sk_brackets() { screws = [M4_dome_screw, M4_cap_screw, M5_cap_screw, M5_cap_screw]; nuts = [M4_hammer_nut, M4_sliding_t_nut, M5_sliding_t_nut, undef]; diff --git a/tests/socket_box.scad b/tests/socket_box.scad index 19dd756..706862b 100644 --- a/tests/socket_box.scad +++ b/tests/socket_box.scad @@ -18,7 +18,7 @@ // $explode = 1; -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/mains_sockets.scad> use <../printed/socket_box.scad> diff --git a/tests/spades.scad b/tests/spades.scad index b76c8a6..313f935 100644 --- a/tests/spades.scad +++ b/tests/spades.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/spades.scad> diff --git a/tests/sphere.scad b/tests/sphere.scad index d4b531f..088689a 100644 --- a/tests/sphere.scad +++ b/tests/sphere.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> r = 20; diff --git a/tests/spools.scad b/tests/spools.scad index 7d6ff13..ce6bbf7 100644 --- a/tests/spools.scad +++ b/tests/spools.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/spools.scad> diff --git a/tests/springs.scad b/tests/springs.scad index 8d9c8ee..d92a638 100644 --- a/tests/springs.scad +++ b/tests/springs.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/springs.scad> diff --git a/tests/ssr_shroud.scad b/tests/ssr_shroud.scad index 8f50628..2745c0a 100644 --- a/tests/ssr_shroud.scad +++ b/tests/ssr_shroud.scad @@ -17,10 +17,9 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/ssrs.scad> + +use <../utils/layout.scad> use <../printed/ssr_shroud.scad> thickness = 3; diff --git a/tests/ssrs.scad b/tests/ssrs.scad index 95d90bb..b55a51b 100644 --- a/tests/ssrs.scad +++ b/tests/ssrs.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/ssrs.scad> +use <../utils/layout.scad> + module ssrs() layout([for(s = ssrs) ssr_width(s)], 15) rotate(90) diff --git a/tests/stepper_motors.scad b/tests/stepper_motors.scad index eca6d00..68cc665 100644 --- a/tests/stepper_motors.scad +++ b/tests/stepper_motors.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/stepper_motors.scad> +use <../utils/layout.scad> + module stepper_motors() layout([for(s = stepper_motors) NEMA_width(s)], 5) { rotate(180) diff --git a/tests/strap_handle.scad b/tests/strap_handle.scad index 50879e9..96a0e94 100644 --- a/tests/strap_handle.scad +++ b/tests/strap_handle.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../printed/strap_handle.scad> length = 150; diff --git a/tests/sweep.scad b/tests/sweep.scad index 6c36ec7..1881884 100644 --- a/tests/sweep.scad +++ b/tests/sweep.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/sweep.scad> use <../utils/maths.scad> use <../utils/bezier.scad> diff --git a/tests/teardrops.scad b/tests/teardrops.scad index 8303dea..12ffc1c 100644 --- a/tests/teardrops.scad +++ b/tests/teardrops.scad @@ -17,7 +17,7 @@ // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> module teardrops() { color(pp1_colour) diff --git a/tests/thread.scad b/tests/thread.scad index 97d4f70..6cceecc 100644 --- a/tests/thread.scad +++ b/tests/thread.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/thread.scad> pitch = 2; diff --git a/tests/toggles.scad b/tests/toggles.scad index 3bc7cdb..fcbc596 100644 --- a/tests/toggles.scad +++ b/tests/toggles.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/toggles.scad> +use <../utils/layout.scad> + module toggles() layout([for(t = toggles) toggle_width(t)], 16) toggle(toggles[$i], 3); diff --git a/tests/transformers.scad b/tests/transformers.scad index 19db222..9b7b842 100644 --- a/tests/transformers.scad +++ b/tests/transformers.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/transformers.scad> +use <../utils/layout.scad> + module transformers() layout([for(t = transformers) tx_depth(t)], 10) rotate(90) diff --git a/tests/tubings.scad b/tests/tubings.scad index 77e6513..faeec0b 100644 --- a/tests/tubings.scad +++ b/tests/tubings.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/tubings.scad> diff --git a/tests/variacs.scad b/tests/variacs.scad index 65c7cf6..bd84c91 100644 --- a/tests/variacs.scad +++ b/tests/variacs.scad @@ -17,11 +17,10 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> - -include <../vitamins/screws.scad> include <../vitamins/variacs.scad> +use <../utils/layout.scad> + module variacs() layout([for(v = variacs) 2 * (variac_bulge_dia(v) - variac_diameter(v) / 2)], 25) rotate(-90) diff --git a/tests/veroboard.scad b/tests/veroboard.scad index 9deee5b..71a91c0 100644 --- a/tests/veroboard.scad +++ b/tests/veroboard.scad @@ -17,9 +17,8 @@ // If not, see . // include <../core.scad> -use <../utils/layout.scad> -include <../vitamins/screws.scad> +use <../utils/layout.scad> use <../vitamins/veroboard.scad> z_cable_ways = 20; diff --git a/tests/washers.scad b/tests/washers.scad index a18ecb4..ec7ce4d 100644 --- a/tests/washers.scad +++ b/tests/washers.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/washers.scad> diff --git a/tests/wire.scad b/tests/wire.scad index 9af46d5..5dacce1 100644 --- a/tests/wire.scad +++ b/tests/wire.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> include <../vitamins/wire.scad> diff --git a/tests/zipties.scad b/tests/zipties.scad index cafb5cd..fdf8c2b 100644 --- a/tests/zipties.scad +++ b/tests/zipties.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/layout.scad> include <../vitamins/zipties.scad> diff --git a/utils/annotation.scad b/utils/annotation.scad index 6d28e8d..9cdf299 100644 --- a/utils/annotation.scad +++ b/utils/annotation.scad @@ -21,7 +21,7 @@ //! Annotation used in this documentation // -include <../core.scad> +include <../utils/core/core.scad> module label(str, scale = 0.25, valign = "baseline", halign = "left") //! Draw text that always faces the camera color("black") diff --git a/utils/core/core.scad b/utils/core/core.scad new file mode 100644 index 0000000..0db5a30 --- /dev/null +++ b/utils/core/core.scad @@ -0,0 +1,39 @@ +// +// 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 . +// + +// +// Include this file to use the miniumum library +// +include <../../global_defs.scad> +// +// Global functions and modules +// +use + +module use_stl(name) { //! Import an STL to make a build platter + stl(name); + + import(str("../stls/", name, ".stl")); +} + +module use_dxf(name) { //! Import a DXF to make a build panel + dxf(name); + + import(str("../dxfs/", name, ".dxf")); +} diff --git a/utils/dogbones.scad b/utils/dogbones.scad index 3231fe4..f5c3a04 100644 --- a/utils/dogbones.scad +++ b/utils/dogbones.scad @@ -21,7 +21,7 @@ //! When square holes are cut with a CNC bit they get rounded corners. If it is important that //! a square cornered part fits in the hole then circles are placed in the corners making a bone shape. // -include <../core.scad> +include <../utils/core/core.scad> module dogbone_square(size, r = cnc_bit_r, center = true) //! Square with circles at the corners { diff --git a/utils/fillet.scad b/utils/fillet.scad index 66120e8..2a0667e 100644 --- a/utils/fillet.scad +++ b/utils/fillet.scad @@ -20,7 +20,7 @@ // //! Rounded fillet for adding to corners. // -include <../core.scad> +include <../utils/core/core.scad> module fillet(r, h, center = false) //! Fillet with specified radius and height extrude_if(h, center = center) diff --git a/utils/hanging_hole.scad b/utils/hanging_hole.scad index cb456be..5d21061 100644 --- a/utils/hanging_hole.scad +++ b/utils/hanging_hole.scad @@ -20,7 +20,7 @@ // //! Method to print holes in mid air. See // -include <../core.scad> +include <../utils/core/core.scad> module hanging_hole(z, ir, h = 100, h2 = 100) { //! Hole radius ```ir``` hanging at the specified ```z``` value above a void who's shape is given by a 2D child module polyhole(r, h, n = 8) { diff --git a/utils/offset.scad b/utils/offset.scad index 452cf7b..755f11c 100644 --- a/utils/offset.scad +++ b/utils/offset.scad @@ -22,7 +22,7 @@ //! Can be used to round corners. Positive offsets will round convex corners, negative offsets round concave corners. To round both use [`round_3D()`](#round). //! //! If `chamfer_base` is true then the bottom edge is made suitable for 3D printing by chamfering when the angle gets shallower than 45 degrees. -include <../core.scad> +include <../utils/core/core.scad> module offset_3D(r, chamfer_base = false) { //! Offset 3D shape by specified radius ```r```, positive or negative. module ball(r) diff --git a/utils/quadrant.scad b/utils/quadrant.scad index 7fe2da7..6725d1f 100644 --- a/utils/quadrant.scad +++ b/utils/quadrant.scad @@ -20,7 +20,7 @@ // //! Square with one rounded corner. // -include <../core.scad> +include <../utils/core/core.scad> module quadrant(w, r, center = false) { //! Draw a square with one rounded corner, can be centered on the arc centre, when ```center``` is ```true```. offset = center ? r - w : 0; diff --git a/utils/round.scad b/utils/round.scad index a4c0b73..e95e783 100644 --- a/utils/round.scad +++ b/utils/round.scad @@ -22,7 +22,7 @@ //! A single radius can be specified or separate internal and external radii. //! If `chamfer_base` is `true` for `round_3D()` then the bottom edge is made suitable for 3D printing by chamfering once the //! the angle gets shallower than 45 degrees. -include <../core.scad> +include <../utils/core/core.scad> use module round(r, ir = undef, or = undef) { //! Round a 2D child, single radius or separate inside and outside radii diff --git a/utils/rounded_cylinder.scad b/utils/rounded_cylinder.scad index caccf55..680f47e 100644 --- a/utils/rounded_cylinder.scad +++ b/utils/rounded_cylinder.scad @@ -20,7 +20,7 @@ // //! Cylinder with a rounded end. // -include <../core.scad> +include <../utils/core/core.scad> module rounded_corner(r, h, r2, ir = 0) { //! 2D version assert(ir <= r - r2); diff --git a/utils/rounded_polygon.scad b/utils/rounded_polygon.scad index 11a7354..54a2962 100644 --- a/utils/rounded_polygon.scad +++ b/utils/rounded_polygon.scad @@ -22,7 +22,7 @@ //! //! Because the tangents need to be calculated to find the length these can be calculated separately and re-used when drawing to save calculating them twice. // -include <../core.scad> +include <../utils/core/core.scad> function circle_tangent(p1, p2) = let( diff --git a/utils/sector.scad b/utils/sector.scad index 09fc237..3c9b88a 100644 --- a/utils/sector.scad +++ b/utils/sector.scad @@ -20,7 +20,7 @@ // //! A sector of a circle between two angles. // -include <../core.scad> +include <../utils/core/core.scad> module sector(r, start_angle, end_angle) { //! Create specified sector given radius ```r```, ```start_angle``` and ```end_angle``` R = r * sqrt(2) + 1; diff --git a/utils/sweep.scad b/utils/sweep.scad index ea30fcd..9c493ed 100644 --- a/utils/sweep.scad +++ b/utils/sweep.scad @@ -26,7 +26,7 @@ //! The path can be open or closed. If closed sweep ensures that the start and end have the same rotation to line up. //! An additional twist around the path can be specified. If the path is closed this should be a multiple of 360. // -include <../core.scad> +include <../utils/core/core.scad> use diff --git a/utils/thread.scad b/utils/thread.scad index ce26774..b464ae1 100644 --- a/utils/thread.scad +++ b/utils/thread.scad @@ -36,7 +36,7 @@ //! //! Threads obey the $fn, $fa, $fs variables. // -include <../core.scad> +include <../utils/core/core.scad> use use use diff --git a/utils/tube.scad b/utils/tube.scad index fcb497c..00405c9 100644 --- a/utils/tube.scad +++ b/utils/tube.scad @@ -20,7 +20,7 @@ // //! Simple tube or ring // -include <../core.scad> +include <../utils/core/core.scad> module ring(or, ir) //! Create a ring with specified external and internal radii difference() { diff --git a/vitamins/ball_bearing.scad b/vitamins/ball_bearing.scad index 318a17b..0266f57 100644 --- a/vitamins/ball_bearing.scad +++ b/vitamins/ball_bearing.scad @@ -25,7 +25,7 @@ //! //! Also single bearing balls are modelled as just a silver sphere and a BOM entry. // -include <../core.scad> +include <../utils/core/core.scad> function bb_name(type) = type[0]; //! Part code without shield type suffix function bb_bore(type) = type[1]; //! Internal diameter diff --git a/vitamins/batteries.scad b/vitamins/batteries.scad index 9429f42..2ea53a0 100644 --- a/vitamins/batteries.scad +++ b/vitamins/batteries.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // - +include // // w h t t t p n // i e h a a o e diff --git a/vitamins/battery.scad b/vitamins/battery.scad index 7fe609e..90686e6 100644 --- a/vitamins/battery.scad +++ b/vitamins/battery.scad @@ -25,7 +25,7 @@ //! The battery length includes its contacts and the origin is the centre of that length. As well as drawing the battery and contacts there are functions //! exposing enough information to make a battery box. // -include <../core.scad> +include <../utils/core/core.scad> use use <../utils/rounded_cylinder.scad> diff --git a/vitamins/belt.scad b/vitamins/belt.scad index 7c9d51f..08c0e03 100644 --- a/vitamins/belt.scad +++ b/vitamins/belt.scad @@ -27,7 +27,7 @@ //! //! Individual teeth are not drawn, instead they are represented by a lighter colour. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_polygon.scad> function belt_pitch(type) = type[1]; //! Pitch in mm diff --git a/vitamins/blower.scad b/vitamins/blower.scad index f2ea839..626cb61 100644 --- a/vitamins/blower.scad +++ b/vitamins/blower.scad @@ -20,7 +20,7 @@ // //! Models of radial blowers. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_cylinder.scad> function blower_length(type) = type[2]; //! Length of enclosing rectangle diff --git a/vitamins/bulldog.scad b/vitamins/bulldog.scad index 874e0b2..0ded476 100644 --- a/vitamins/bulldog.scad +++ b/vitamins/bulldog.scad @@ -22,7 +22,7 @@ //! accessed to allow clearance. Used for holding glass on 3D printer beds but Swiss picture clips can be //! better. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_polygon.scad> use <../utils/sector.scad> diff --git a/vitamins/button.scad b/vitamins/button.scad index aaa3f94..6d28b71 100644 --- a/vitamins/button.scad +++ b/vitamins/button.scad @@ -20,7 +20,7 @@ // //! PCB mounted buttons. Can optionally have a coloured cap // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_cylinder.scad> function square_button_width(type) = type[1]; //! Width and depth of the base diff --git a/vitamins/cable_strip.scad b/vitamins/cable_strip.scad index 6bc7a72..54efa7d 100644 --- a/vitamins/cable_strip.scad +++ b/vitamins/cable_strip.scad @@ -25,7 +25,7 @@ //! //! When the sides are constrained then a circular model is more accurate. // -include <../core.scad> +include <../utils/core/core.scad> cable_strip_thickness = 0.8; function ribbon_clamp_slot(ways) = ways * inch(0.05) + 1; function ribbon_clamp_slot_depth() = cable_strip_thickness + inch(0.05); diff --git a/vitamins/component.scad b/vitamins/component.scad index 346b1a9..75728f1 100644 --- a/vitamins/component.scad +++ b/vitamins/component.scad @@ -26,7 +26,6 @@ // include <../core.scad> include -include include use <../utils/rounded_cylinder.scad> diff --git a/vitamins/d_connector.scad b/vitamins/d_connector.scad index 37edb2e..2404c01 100644 --- a/vitamins/d_connector.scad +++ b/vitamins/d_connector.scad @@ -20,7 +20,7 @@ // //! D-connectors. Can be any number of ways, male or female, solder buckets, PCB mount or IDC, with or without pillars. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/thread.scad> d_pillar_color = grey90; diff --git a/vitamins/display.scad b/vitamins/display.scad index e4315a4..205c6cf 100644 --- a/vitamins/display.scad +++ b/vitamins/display.scad @@ -20,7 +20,7 @@ // //! LCD dispays. // -include <../core.scad> +include <../utils/core/core.scad> use use diff --git a/vitamins/extrusion.scad b/vitamins/extrusion.scad index 913e82b..40d9015 100644 --- a/vitamins/extrusion.scad +++ b/vitamins/extrusion.scad @@ -19,7 +19,7 @@ // //! Aluminium extrusion. // -include <../core.scad> +include <../utils/core/core.scad> function extrusion_width(type) = type[1]; //! Width of extrusion function extrusion_height(type) = type[2]; //! Height of extrusion diff --git a/vitamins/extrusion_bracket.scad b/vitamins/extrusion_bracket.scad index 22048d8..15b238e 100644 --- a/vitamins/extrusion_bracket.scad +++ b/vitamins/extrusion_bracket.scad @@ -19,9 +19,7 @@ //! Brackets for joining extrusions at a corner. -include -include -include +include <../core.scad> function extrusion_inner_corner_bracket_size(type) = type[1]; //! Size of inner bracket diff --git a/vitamins/fan.scad b/vitamins/fan.scad index 89de9c3..40ae6b0 100644 --- a/vitamins/fan.scad +++ b/vitamins/fan.scad @@ -22,7 +22,7 @@ //! //! Can draw three styles: solid, open frame and open frame with screw bosses. // -include <../core.scad> +include <../utils/core/core.scad> use use use diff --git a/vitamins/fans.scad b/vitamins/fans.scad index 1c6cea1..da8ccae 100644 --- a/vitamins/fans.scad +++ b/vitamins/fans.scad @@ -17,8 +17,6 @@ // If not, see . // -include - // w d b h s h t o b b a // i e o o c u h u l o p // d p r l r b i t a s p diff --git a/vitamins/fuseholder.scad b/vitamins/fuseholder.scad index 56e77f0..cf36ccc 100644 --- a/vitamins/fuseholder.scad +++ b/vitamins/fuseholder.scad @@ -20,7 +20,7 @@ // //! 20mm panel mount fuse holder. // -include <../core.scad> +include <../utils/core/core.scad> include use <../utils/tube.scad> diff --git a/vitamins/geared_stepper.scad b/vitamins/geared_stepper.scad index 30d2c4e..7da851a 100644 --- a/vitamins/geared_stepper.scad +++ b/vitamins/geared_stepper.scad @@ -20,7 +20,7 @@ // //! Geared tin can steppers // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_cylinder.scad> use <../utils/round.scad> diff --git a/vitamins/green_terminal.scad b/vitamins/green_terminal.scad index d77e8c1..fd0655c 100644 --- a/vitamins/green_terminal.scad +++ b/vitamins/green_terminal.scad @@ -20,7 +20,7 @@ // //! Parametric green terminal blocks // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/tube.scad> function gt_pitch(type) = type[1]; //! Pitch between terminals diff --git a/vitamins/hygrometer.scad b/vitamins/hygrometer.scad index 68f7123..ba8aac8 100644 --- a/vitamins/hygrometer.scad +++ b/vitamins/hygrometer.scad @@ -20,7 +20,7 @@ // //! Mini LCD Celsius Digital Thermometer Hygrometer Temperature Humidity Meter Gauge on eBay // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/round.scad> od = 40.9; diff --git a/vitamins/iecs.scad b/vitamins/iecs.scad index 98d9d3b..2dd7a19 100644 --- a/vitamins/iecs.scad +++ b/vitamins/iecs.scad @@ -16,7 +16,6 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include include fused_spades = [[spade4p8, 8.5, 7, 3, 90], diff --git a/vitamins/insert.scad b/vitamins/insert.scad index 0cceb63..dc4b2da 100644 --- a/vitamins/insert.scad +++ b/vitamins/insert.scad @@ -20,7 +20,7 @@ // //! Heatfit threaded inserts. Can be pushed into thermoplastics using a soldering iron with a conical bit set to 200°C. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/quadrant.scad> use <../utils/thread.scad> diff --git a/vitamins/jack.scad b/vitamins/jack.scad index 7e5b784..1be5934 100644 --- a/vitamins/jack.scad +++ b/vitamins/jack.scad @@ -23,7 +23,6 @@ // include <../core.scad> include -include use <../utils/tube.scad> use <../utils/rounded_cylinder.scad> use diff --git a/vitamins/jhead.scad b/vitamins/jhead.scad index 94fa817..5f9036f 100644 --- a/vitamins/jhead.scad +++ b/vitamins/jhead.scad @@ -20,7 +20,7 @@ // //! J-Head hot ends from Brian Reifsnider, hotends.com. // -include <../core.scad> +include <../utils/core/core.scad> include include include diff --git a/vitamins/kp_pillow_block.scad b/vitamins/kp_pillow_block.scad index b394c07..78a4bb1 100644 --- a/vitamins/kp_pillow_block.scad +++ b/vitamins/kp_pillow_block.scad @@ -20,9 +20,8 @@ //! KP pillow block bearings // include <../core.scad> -use <../utils/tube.scad> -include +use <../utils/tube.scad> use use diff --git a/vitamins/kp_pillow_blocks.scad b/vitamins/kp_pillow_blocks.scad index e27d852..6a7982a 100644 --- a/vitamins/kp_pillow_blocks.scad +++ b/vitamins/kp_pillow_blocks.scad @@ -21,7 +21,6 @@ //! KP pillow block bearings // -include include // d H L J A N H1 H0 K S b bolthole bearing diff --git a/vitamins/ldr.scad b/vitamins/ldr.scad index d3dd659..451e106 100644 --- a/vitamins/ldr.scad +++ b/vitamins/ldr.scad @@ -22,7 +22,7 @@ //! //! Larger ones seem to have both a higher dark resistance and a lower bright light resistance. // -include <../core.scad> +include <../utils/core/core.scad> function ldr_description(type) = type[1]; //! Description function ldr_diameter(type) = type[2]; //! The diameter of the round bit diff --git a/vitamins/leadnut.scad b/vitamins/leadnut.scad index 3804fd2..43badf3 100644 --- a/vitamins/leadnut.scad +++ b/vitamins/leadnut.scad @@ -20,7 +20,7 @@ // //! Nuts for leadscrews. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/tube.scad> use <../utils/thread.scad> diff --git a/vitamins/led.scad b/vitamins/led.scad index 59ed0c2..ff967e4 100644 --- a/vitamins/led.scad +++ b/vitamins/led.scad @@ -20,7 +20,7 @@ // //! Standard domed through hole LEDs. Can specify colour and lead length. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_cylinder.scad> function led_diameter(type) = type[1]; //! Body diameter diff --git a/vitamins/light_strip.scad b/vitamins/light_strip.scad index 9770bac..16a4f47 100644 --- a/vitamins/light_strip.scad +++ b/vitamins/light_strip.scad @@ -25,7 +25,7 @@ //! //! The `light_strip_clip()` module makes a clip to go around the light that can be incorporated into a printed bracket to hold it. // -include <../core.scad> +include <../utils/core/core.scad> function light_strip_length(type) = type[2]; //! Un-cut length function light_strip_leds(type) = type[3]; //! Total number of LEDs diff --git a/vitamins/linear_bearing.scad b/vitamins/linear_bearing.scad index 5510a2d..7fe1a4a 100644 --- a/vitamins/linear_bearing.scad +++ b/vitamins/linear_bearing.scad @@ -20,7 +20,7 @@ // //! LMnUU linear bearings. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/tube.scad> diff --git a/vitamins/mains_socket.scad b/vitamins/mains_socket.scad index 065cb27..65b2435 100644 --- a/vitamins/mains_socket.scad +++ b/vitamins/mains_socket.scad @@ -21,7 +21,6 @@ //! UK 13A sockets at the moment. // include <../core.scad> -include include use diff --git a/vitamins/meter.scad b/vitamins/meter.scad index 8fae355..49453ee 100644 --- a/vitamins/meter.scad +++ b/vitamins/meter.scad @@ -24,7 +24,7 @@ //! //! The 7 SEGMENT.TTF font from the [docs](docs) directory needs to be installed to get realistic digits. // -include <../core.scad> +include <../utils/core/core.scad> led_meter = ["led_meter", 22.72, 10.14, 6.3, 22.72, 11.04, 0.96, 30, 4.2, 26, 2.2 / 2]; diff --git a/vitamins/microswitch.scad b/vitamins/microswitch.scad index d5c4ca4..a216f40 100644 --- a/vitamins/microswitch.scad +++ b/vitamins/microswitch.scad @@ -20,7 +20,7 @@ // //! Used for limit switches. // -include <../core.scad> +include <../utils/core/core.scad> microswitch_contact_color = brass; diff --git a/vitamins/microview.scad b/vitamins/microview.scad index 04a5ed8..f77fe19 100644 --- a/vitamins/microview.scad +++ b/vitamins/microview.scad @@ -24,7 +24,7 @@ //! //! Uses STL files copyright geekammo and licenced with MIT license, see [microview/LICENSE.txt](vitamins/microview/LICENSE.txt). // -include <../core.scad> +include <../utils/core/core.scad> include panel_clearance = 0.2; diff --git a/vitamins/module.scad b/vitamins/module.scad index c3e4470..18218fa 100644 --- a/vitamins/module.scad +++ b/vitamins/module.scad @@ -21,7 +21,6 @@ //! Random screw down modules. Currently just DROK buck converters. // include <../core.scad> -include function mod_part(type) = type[1]; //! Description function mod_length(type) = type[2]; //! Body length diff --git a/vitamins/nut.scad b/vitamins/nut.scad index aad17b8..e16b962 100644 --- a/vitamins/nut.scad +++ b/vitamins/nut.scad @@ -22,7 +22,7 @@ //! //! If a nut is given a child then it gets placed on its top surface. // -include <../core.scad> +include <../utils/core/core.scad> use use use <../utils/fillet.scad> diff --git a/vitamins/o_ring.scad b/vitamins/o_ring.scad index 2f6c777..c02606a 100644 --- a/vitamins/o_ring.scad +++ b/vitamins/o_ring.scad @@ -23,7 +23,7 @@ //! Just a black torus specified by internal diameter, ```id``` and ```minor_d``` plus a BOM entry. //! Can be shown stretched by specifying the ```actual_id```. // -include <../core.scad> +include <../utils/core/core.scad> module O_ring(id, minor_d, actual_id = 0) { //! Draw O-ring with specified internal diameter and minor diameter. ```actual_id``` can be used to stretch it around something. vitamin(str("O_ring(", id, ", ", minor_d, "): O-ring nitrile ", id, "mm x ", minor_d, "mm")); diff --git a/vitamins/opengrab.scad b/vitamins/opengrab.scad index ce8b932..a670c55 100644 --- a/vitamins/opengrab.scad +++ b/vitamins/opengrab.scad @@ -22,7 +22,7 @@ //! //! A permanent magnet that can be magnatized and de-magnatized electronically. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/thread.scad> pitch = 33.8; diff --git a/vitamins/pcb.scad b/vitamins/pcb.scad index 8778a34..47e78c1 100644 --- a/vitamins/pcb.scad +++ b/vitamins/pcb.scad @@ -23,7 +23,6 @@ panel_clearance = 0.2; include <../core.scad> -include include include include diff --git a/vitamins/pcbs.scad b/vitamins/pcbs.scad index cd07f07..de42d19 100644 --- a/vitamins/pcbs.scad +++ b/vitamins/pcbs.scad @@ -16,8 +16,8 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // -include include +include // // l w t r h l c b h // e i h a o a o o o diff --git a/vitamins/pillar.scad b/vitamins/pillar.scad index d865ebc..882219a 100644 --- a/vitamins/pillar.scad +++ b/vitamins/pillar.scad @@ -20,7 +20,7 @@ // //! Threaded pillars. Each end can be male or female. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/thread.scad> function pillar_name(type) = type[1]; //! Name of part diff --git a/vitamins/pin_header.scad b/vitamins/pin_header.scad index c45a722..8b2afdd 100644 --- a/vitamins/pin_header.scad +++ b/vitamins/pin_header.scad @@ -17,7 +17,7 @@ // If not, see . // //! Pin headers and sockets, etc. -include <../core.scad> +include <../utils/core/core.scad> use <../utils/dogbones.scad> panel_clearance = 0.2; @@ -274,4 +274,3 @@ module jst_xh_header(type, pin_count, right_angle=false, colour, pin_colour) { / } } } - diff --git a/vitamins/psu.scad b/vitamins/psu.scad index e12eff2..18153ca 100644 --- a/vitamins/psu.scad +++ b/vitamins/psu.scad @@ -23,14 +23,13 @@ //! Face order is bottom, top, left, right, front, back. // include <../core.scad> +include <../printed/fan_guard.scad> use <../utils/maths.scad> use <../utils/sector.scad> use <../utils/round.scad> -include use use use -include <../printed/fan_guard.scad> function psu_face_holes(type) = type[0]; //! List of screw hole positions function psu_face_thickness(type) = type[1]; //! The thickness diff --git a/vitamins/pulley.scad b/vitamins/pulley.scad index d94cb32..f0f36b3 100644 --- a/vitamins/pulley.scad +++ b/vitamins/pulley.scad @@ -20,7 +20,7 @@ // //! Timing belt pulleys, both toothed and plain with internal bearings for idlers. // -include <../core.scad> +include <../utils/core/core.scad> use use diff --git a/vitamins/pulleys.scad b/vitamins/pulleys.scad index 74ff954..6ddc4db 100644 --- a/vitamins/pulleys.scad +++ b/vitamins/pulleys.scad @@ -16,7 +16,7 @@ // You should have received a copy of the GNU General Public License along with NopSCADlib. // If not, see . // - +include // // n t o b w h h b f f s s s s // a e d e i u u o l l c c c c diff --git a/vitamins/rail.scad b/vitamins/rail.scad index caa3885..13f18a4 100644 --- a/vitamins/rail.scad +++ b/vitamins/rail.scad @@ -19,7 +19,7 @@ // //! Linear rails with carriages. // -include <../core.scad> +include <../utils/core/core.scad> use diff --git a/vitamins/ring_terminal.scad b/vitamins/ring_terminal.scad index 397d1d6..c7e15a3 100644 --- a/vitamins/ring_terminal.scad +++ b/vitamins/ring_terminal.scad @@ -20,7 +20,7 @@ // //! Ring terminals and earth assemblies for DiBond panels. // -include <../core.scad> +include <../utils/core/core.scad> use use use diff --git a/vitamins/rocker.scad b/vitamins/rocker.scad index e0aabfa..c515baf 100644 --- a/vitamins/rocker.scad +++ b/vitamins/rocker.scad @@ -20,7 +20,7 @@ // //! Rocker switch. Also used for neon indicator in the same form factor. // -include <../core.scad> +include <../utils/core/core.scad> use function rocker_part(type) = type[1]; //! Part description diff --git a/vitamins/rod.scad b/vitamins/rod.scad index c195b12..642d19a 100644 --- a/vitamins/rod.scad +++ b/vitamins/rod.scad @@ -22,7 +22,7 @@ //! //! These items are sysmtrical, so by default the origin is in the centre but it can be changed to the bottom. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/thread.scad> rod_colour = grey80; diff --git a/vitamins/screw.scad b/vitamins/screw.scad index 9710baa..fab304e 100644 --- a/vitamins/screw.scad +++ b/vitamins/screw.scad @@ -20,7 +20,7 @@ // //! Machine screws and wood screws with various head styles. // -include <../core.scad> +include <../utils/core/core.scad> use use <../utils/rounded_cylinder.scad> diff --git a/vitamins/scs_bearing_block.scad b/vitamins/scs_bearing_block.scad index 90d997c..b6a87ae 100644 --- a/vitamins/scs_bearing_block.scad +++ b/vitamins/scs_bearing_block.scad @@ -22,7 +22,7 @@ // -include <../core.scad> +include <../utils/core/core.scad> use use use diff --git a/vitamins/scs_bearing_blocks.scad b/vitamins/scs_bearing_blocks.scad index 110e7bb..f284e1d 100644 --- a/vitamins/scs_bearing_blocks.scad +++ b/vitamins/scs_bearing_blocks.scad @@ -21,7 +21,6 @@ // SCS bearing blocks // -include include // T h E W L F G B C K S1 S2 L1 LB diff --git a/vitamins/sealing_strip.scad b/vitamins/sealing_strip.scad index f8fb077..55bb6de 100644 --- a/vitamins/sealing_strip.scad +++ b/vitamins/sealing_strip.scad @@ -20,7 +20,7 @@ // //! Sealing strip from B&Q used to seal around the door of 3D printers. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_polygon.scad> diff --git a/vitamins/sheet.scad b/vitamins/sheet.scad index a962de2..619ef1a 100644 --- a/vitamins/sheet.scad +++ b/vitamins/sheet.scad @@ -30,7 +30,7 @@ //! For speed sheets should be modelled in 2D by subtracting holes from 2D templates made by ```sheet_2D()``` and then extruded to 3D with ```render_2D_sheet()```. //! Note that modules that drill holes will return a 2D object if ```h``` is set to 0 to facilitate this. // -include <../core.scad> +include <../utils/core/core.scad> function sheet_thickness(type) = type[2]; //! Thickness function sheet_colour(type) = type[3]; //! Colour diff --git a/vitamins/sk_bracket.scad b/vitamins/sk_bracket.scad index cc084b5..fa3724a 100644 --- a/vitamins/sk_bracket.scad +++ b/vitamins/sk_bracket.scad @@ -22,7 +22,6 @@ include <../core.scad> include <../utils/fillet.scad> -include use sk_bracket_color = grey70; diff --git a/vitamins/sk_brackets.scad b/vitamins/sk_brackets.scad index 9bdd9f3..937a556 100644 --- a/vitamins/sk_brackets.scad +++ b/vitamins/sk_brackets.scad @@ -21,8 +21,6 @@ // SK shaft support brackets // -include - // d h E W L F G P B S bolthole SK8 = ["SK8", 8, 20, 21, 42, 14, 32.8, 6, 18, 32, 5.5, M5_clearance_radius]; SK10 = ["SK10", 10, 20, 21, 42, 14, 32.8, 6, 18, 32, 5.5, M5_clearance_radius]; diff --git a/vitamins/spade.scad b/vitamins/spade.scad index 9585195..64abcec 100644 --- a/vitamins/spade.scad +++ b/vitamins/spade.scad @@ -20,7 +20,7 @@ // //! Spade terminals used as parts of electrical components. // -include <../core.scad> +include <../utils/core/core.scad> function spade_l(type) = type[0]; //! Length of the narrow part function spade_w(type) = type[1]; //! Width diff --git a/vitamins/spool.scad b/vitamins/spool.scad index 19c4c16..d272de5 100644 --- a/vitamins/spool.scad +++ b/vitamins/spool.scad @@ -19,7 +19,7 @@ //! Filament spool models -include <../core.scad> +include <../utils/core/core.scad> include <../utils/tube.scad> function spool_diameter(type) = type[1]; //! Outside diameter diff --git a/vitamins/spring.scad b/vitamins/spring.scad index ee30ece..b278cf3 100644 --- a/vitamins/spring.scad +++ b/vitamins/spring.scad @@ -22,7 +22,7 @@ //! //! By default springs have their origin at the bottom but can be centered. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/sweep.scad> diff --git a/vitamins/ssr.scad b/vitamins/ssr.scad index 4d8d190..4a7c4a3 100644 --- a/vitamins/ssr.scad +++ b/vitamins/ssr.scad @@ -20,7 +20,7 @@ // //! Solid state relays. // -include <../core.scad> +include <../utils/core/core.scad> function ssr_part(type) = type[1]; //! Description function ssr_length(type) = type[2]; //! Length diff --git a/vitamins/stepper_motor.scad b/vitamins/stepper_motor.scad index c3701bf..8fdfd96 100644 --- a/vitamins/stepper_motor.scad +++ b/vitamins/stepper_motor.scad @@ -21,12 +21,11 @@ //! NEMA stepper motor model. // include <../core.scad> - -include -use include + use <../utils/tube.scad> use <../utils/thread.scad> +use use function NEMA_width(type) = type[1]; //! Width of the square face diff --git a/vitamins/toggle.scad b/vitamins/toggle.scad index f4aa6dd..21ae61e 100644 --- a/vitamins/toggle.scad +++ b/vitamins/toggle.scad @@ -20,7 +20,7 @@ // //! Toggle switches // -include <../core.scad> +include <../utils/core/core.scad> use use use <../utils/thread.scad> diff --git a/vitamins/transformer.scad b/vitamins/transformer.scad index b448577..4605a3e 100644 --- a/vitamins/transformer.scad +++ b/vitamins/transformer.scad @@ -20,7 +20,7 @@ // //!Iron core transformers. The grey shaded area is the keep out region where the terminals are. // -include <../core.scad> +include <../utils/core/core.scad> use function tx_part(type) = type[1]; //! Part description diff --git a/vitamins/tubing.scad b/vitamins/tubing.scad index 61b863a..ae8dddf 100644 --- a/vitamins/tubing.scad +++ b/vitamins/tubing.scad @@ -20,7 +20,7 @@ // //! Tubing and sleeving. The internal diameter can be forced to stretch it over something. // -include <../core.scad> +include <../utils/core/core.scad> function tubing_material(type) = type[1]; //! Material description function tubing_od(type) = type[2]; //! Outside diameter diff --git a/vitamins/variac.scad b/vitamins/variac.scad index af8632e..a71073a 100644 --- a/vitamins/variac.scad +++ b/vitamins/variac.scad @@ -20,7 +20,7 @@ // //! Variable auto transformers. // -include <../core.scad> +include <../utils/core/core.scad> use function variac_diameter(type) = type[2]; //! Body diameter diff --git a/vitamins/veroboard.scad b/vitamins/veroboard.scad index eeef3a3..c2a51f7 100644 --- a/vitamins/veroboard.scad +++ b/vitamins/veroboard.scad @@ -22,7 +22,6 @@ // include <../core.scad> use -include function vero_assembly(type) = type[1]; //! Name of the assembly function vero_holes(type) = type[2]; //! Number of holes in each strip diff --git a/vitamins/washer.scad b/vitamins/washer.scad index 733a5e3..7d61549 100644 --- a/vitamins/washer.scad +++ b/vitamins/washer.scad @@ -22,7 +22,7 @@ //! //! If a washer is given a child, usually a screw or a nut, then it is placed on its top surface. // -include <../core.scad> +include <../utils/core/core.scad> include <../utils/sweep.scad> soft_washer_colour = grey20; diff --git a/vitamins/wire.scad b/vitamins/wire.scad index ce88643..c2b4a41 100644 --- a/vitamins/wire.scad +++ b/vitamins/wire.scad @@ -20,7 +20,7 @@ // //! Just a BOM entry at the moment and cable bundle size functions for holes, plus cable ties. // -include <../core.scad> +include <../utils/core/core.scad> include module wire(color, strands, length, strand = 0.2) //! Add stranded wire to the BOM diff --git a/vitamins/ziptie.scad b/vitamins/ziptie.scad index 4b291cd..0b4d216 100644 --- a/vitamins/ziptie.scad +++ b/vitamins/ziptie.scad @@ -21,7 +21,7 @@ //! Cable zipties. // -include <../core.scad> +include <../utils/core/core.scad> use <../utils/rounded_polygon.scad> function ziptie_width(type) = type[1]; //! Width