From d80fc5709e4dd448353e0770f1ed28b9cf338dfe Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sat, 6 Mar 2021 16:32:36 +0000 Subject: [PATCH 1/2] Left pulleys on BOM when show_pulleys true. --- tests/core_xy.scad | 2 +- utils/core_xy.scad | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/core_xy.scad b/tests/core_xy.scad index 8fdd5ff..ca549e0 100644 --- a/tests/core_xy.scad +++ b/tests/core_xy.scad @@ -23,7 +23,7 @@ include <../vitamins/screws.scad> include <../vitamins/stepper_motors.scad> include <../vitamins/washers.scad> -include <../utils/core_xy_belts.scad> +include <../utils/core_xy.scad> module coreXY_belts_test() { diff --git a/utils/core_xy.scad b/utils/core_xy.scad index 656e207..ff4a96e 100644 --- a/utils/core_xy.scad +++ b/utils/core_xy.scad @@ -109,12 +109,11 @@ module coreXY_half(type, size, pos, separation_y = 0, x_gap = 0, plain_idler_off p6 = [ pos.x - size.x / 2, -size.y / 2 + pos.y - separation_y / 2 ]; module show_pulleys(show_pulleys) {// Allows the pulley colour to be set for debugging - not_on_bom() - if (is_list(show_pulleys)) - color(show_pulleys) - children(); - else if (show_pulleys) + if (is_list(show_pulleys)) + color(show_pulleys) children(); + else if (show_pulleys) + children(); } show_pulleys(show_pulleys) { From 7c1c8e92f2bb6687e17772ca61c9ee50639bd877 Mon Sep 17 00:00:00 2001 From: Martin Budden Date: Sat, 6 Mar 2021 16:35:46 +0000 Subject: [PATCH 2/2] Removed green code. --- utils/core_xy.scad | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/core_xy.scad b/utils/core_xy.scad index ff4a96e..e9efb72 100644 --- a/utils/core_xy.scad +++ b/utils/core_xy.scad @@ -97,7 +97,6 @@ module coreXY_half(type, size, pos, separation_y = 0, x_gap = 0, plain_idler_off // plain idler for offset stepper motor drive pulley p3p_type = p4_type; - //p3p = [ p4.x, size.y / 2 - pulley_od(p3p_type) / 2 - pulley_od(p3d_type) / 2 + drive_pulley_offset.y ]; p3p = [ drive_pulley_offset.x > 0 ? p4.x : -p0.x - pulley_od(p0_type), size.y / 2 - pulley_od(p3p_type) / 2 - pulley_od(p3d_type) / 2 + drive_pulley_offset.y ];