Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions models/core/lib/connector.scad
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ module connectorArmOuter(is_foot=false) {
difference() {
color(HR_YELLOW) cuboid(arm_dimensions_outer, chamfer=BASE_CHAMFER,except=BOTTOM);
if(!is_foot){
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
}
}
}
Expand All @@ -200,7 +200,7 @@ module connectorArmOuter(is_foot=false) {
*/
module connectorArmInner() {

arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT];
arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT + EPSILON];
color(HR_GREEN)
cuboid(arm_dimensions_inner, chamfer=BASE_CHAMFER,edges=BOTTOM);
}
Expand Down
3 changes: 3 additions & 0 deletions models/core/lib/constants.scad
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.

// Prevent OpenSCAD Z-fighting in peview
EPSILON = $preview ? 0.01 : 0.00001;

// Fitting tolerance between mating parts
TOLERANCE = 0.2; // in mm

Expand Down
2 changes: 1 addition & 1 deletion models/core/lib/lockpin.scad
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,6 @@ module tension_hole_half(){
lockpin_tension_angle = 86.5; // in degrees
lockpin_tension_hole_width_inner = PRINTING_LAYER_WIDTH * 4; // widest/middle point of the tension hole
lockpin_tension_hole_height = BASE_UNIT / 2;
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height]; // planar
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height + EPSILON ]; // planar
prismoid(size1=lockpin_tension_hole_inner_dimension, height=lockpin_tension_hole_height, xang=lockpin_tension_angle, yang=90);
}
2 changes: 1 addition & 1 deletion models/core/lib/support.scad
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ module lock_pin_hole() {
union() {
prismoid(size1=lock_pin_center_dimension, size2=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, h=lock_pin_prismoid_inner_length);
translate([0, 0, lock_pin_prismoid_inner_length]) {
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length);
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length + EPSILON);
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions models/core/makerworld/connector.scad
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ is_foot = false; // [true,false]
optimal_orientation = true; // [true,false]

/* [Hidden] */
EPSILON = $preview ? 0.01 : 0.00001;
TOLERANCE = 0.2;
PRINTING_LAYER_WIDTH = 0.4;
PRINTING_LAYER_HEIGHT = 0.2;
Expand Down Expand Up @@ -85,7 +86,7 @@ module lock_pin_hole() {
union() {
prismoid(size1=lock_pin_center_dimension, size2=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, h=lock_pin_prismoid_inner_length);
translate([0, 0, lock_pin_prismoid_inner_length]) {
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length);
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length + EPSILON);
}
}
}
Expand Down Expand Up @@ -203,15 +204,15 @@ module connectorArmOuter(is_foot=false) {
difference() {
color(HR_YELLOW) cuboid(arm_dimensions_outer, chamfer=BASE_CHAMFER,except=BOTTOM);
if(!is_foot){
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
}
}
}

module connectorArmInner() {

arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT];
arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT + EPSILON];
color(HR_GREEN)
cuboid(arm_dimensions_inner, chamfer=BASE_CHAMFER,edges=BOTTOM);
}
Expand Down Expand Up @@ -373,7 +374,7 @@ module tension_hole_half(){
lockpin_tension_angle = 86.5;
lockpin_tension_hole_width_inner = PRINTING_LAYER_WIDTH * 4;
lockpin_tension_hole_height = BASE_UNIT / 2;
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height];
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height + EPSILON ];
prismoid(size1=lockpin_tension_hole_inner_dimension, height=lockpin_tension_hole_height, xang=lockpin_tension_angle, yang=90);
}

Expand Down
11 changes: 6 additions & 5 deletions models/core/makerworld/lockpin.scad
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ color(HR_YELLOW)
lockpin(grip_type=grip_type);

/* [Hidden] */
EPSILON = $preview ? 0.01 : 0.00001;
TOLERANCE = 0.2;
PRINTING_LAYER_WIDTH = 0.4;
PRINTING_LAYER_HEIGHT = 0.2;
Expand Down Expand Up @@ -85,7 +86,7 @@ module lock_pin_hole() {
union() {
prismoid(size1=lock_pin_center_dimension, size2=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, h=lock_pin_prismoid_inner_length);
translate([0, 0, lock_pin_prismoid_inner_length]) {
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length);
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length + EPSILON);
}
}
}
Expand Down Expand Up @@ -203,15 +204,15 @@ module connectorArmOuter(is_foot=false) {
difference() {
color(HR_YELLOW) cuboid(arm_dimensions_outer, chamfer=BASE_CHAMFER,except=BOTTOM);
if(!is_foot){
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
}
}
}

module connectorArmInner() {

arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT];
arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT + EPSILON];
color(HR_GREEN)
cuboid(arm_dimensions_inner, chamfer=BASE_CHAMFER,edges=BOTTOM);
}
Expand Down Expand Up @@ -373,7 +374,7 @@ module tension_hole_half(){
lockpin_tension_angle = 86.5;
lockpin_tension_hole_width_inner = PRINTING_LAYER_WIDTH * 4;
lockpin_tension_hole_height = BASE_UNIT / 2;
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height];
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height + EPSILON ];
prismoid(size1=lockpin_tension_hole_inner_dimension, height=lockpin_tension_hole_height, xang=lockpin_tension_angle, yang=90);
}

Expand Down
11 changes: 6 additions & 5 deletions models/core/makerworld/support.scad
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ x_holes = false;
support(units=units, x_holes=x_holes);

/* [Hidden] */
EPSILON = $preview ? 0.01 : 0.00001;
TOLERANCE = 0.2;
PRINTING_LAYER_WIDTH = 0.4;
PRINTING_LAYER_HEIGHT = 0.2;
Expand Down Expand Up @@ -87,7 +88,7 @@ module lock_pin_hole() {
union() {
prismoid(size1=lock_pin_center_dimension, size2=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, h=lock_pin_prismoid_inner_length);
translate([0, 0, lock_pin_prismoid_inner_length]) {
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length);
prismoid(size1=LOCKPIN_HOLE_SIDE_LENGTH_DIMENSION, size2=lock_pin_outer_dimension, h=lock_pin_prismoid_outer_length + EPSILON);
}
}
}
Expand Down Expand Up @@ -205,15 +206,15 @@ module connectorArmOuter(is_foot=false) {
difference() {
color(HR_YELLOW) cuboid(arm_dimensions_outer, chamfer=BASE_CHAMFER,except=BOTTOM);
if(!is_foot){
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 0]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
color(HR_RED) rotate([90, 0, 90]) cuboid([LOCKPIN_HOLE_SIDE_LENGTH, LOCKPIN_HOLE_SIDE_LENGTH, connector_outer_side_length + EPSILON], chamfer=-LOCKPIN_HOLE_CHAMFER);
}
}
}

module connectorArmInner() {

arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT];
arm_dimensions_inner = [arm_side_length_inner, arm_side_length_inner, BASE_UNIT + EPSILON];
color(HR_GREEN)
cuboid(arm_dimensions_inner, chamfer=BASE_CHAMFER,edges=BOTTOM);
}
Expand Down Expand Up @@ -375,7 +376,7 @@ module tension_hole_half(){
lockpin_tension_angle = 86.5;
lockpin_tension_hole_width_inner = PRINTING_LAYER_WIDTH * 4;
lockpin_tension_hole_height = BASE_UNIT / 2;
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height];
lockpin_tension_hole_inner_dimension = [lockpin_tension_hole_width_inner, lockpin_height + EPSILON ];
prismoid(size1=lockpin_tension_hole_inner_dimension, height=lockpin_tension_hole_height, xang=lockpin_tension_angle, yang=90);
}

Expand Down