From dd5fa90d84035767bd22035995442d078305f38f Mon Sep 17 00:00:00 2001 From: Clinton Ebadi Date: Wed, 3 Apr 2019 22:57:38 -0400 Subject: [PATCH] misc uncomitted changes random mish mash of inconsequential changes. --- calibration/walls.scad | 12 +-- cura/dual_temp_lower.py | 2 +- etc/belt-clip.scad | 10 ++- etc/canister.scad | 183 +++++++++++++++++----------------------- 4 files changed, 90 insertions(+), 117 deletions(-) rewrite etc/canister.scad (62%) diff --git a/calibration/walls.scad b/calibration/walls.scad index 04078f9..9f07734 100644 --- a/calibration/walls.scad +++ b/calibration/walls.scad @@ -1,13 +1,15 @@ // empty cube to test ninjaflex inner/outer wall adhesion nozzle_diameter = 0.5; -d = 30; -h = 20; -wall = nozzle_diameter*4; +d = 20; +h = 10; + +wall = nozzle_diameter*2; +base = 1; + difference () { cube ([d, d, h], center=true); - // intentionally thin floor - translate ([0, 0, wall/2]) #cube ([d-wall, d-wall, h+0.01], center=true); + translate ([0, 0, base]) #cube ([d-wall*2, d-wall*2, h+0.01], center=true); } diff --git a/cura/dual_temp_lower.py b/cura/dual_temp_lower.py index ed6715f..5294c75 100644 --- a/cura/dual_temp_lower.py +++ b/cura/dual_temp_lower.py @@ -95,7 +95,7 @@ with open(filename, "w") as f: heatupTime = printTime - heatupTimeDelay if heatupTime < 0.0: - heatupTime = None + heatupTime = printTime / 2.0 #None heatupBlocked = not firstLayer # do not reheat until active extruder is heated x = sx y = sy diff --git a/etc/belt-clip.scad b/etc/belt-clip.scad index d029e7c..fa80bd5 100644 --- a/etc/belt-clip.scad +++ b/etc/belt-clip.scad @@ -1,3 +1,5 @@ +// basic belt piece, intended for game of thrones costume originally + use // https://github.com/JustinSDK/dotSCAD $fs = 0.1; @@ -38,15 +40,15 @@ module buckle_base (buckle_thickness=buckle_thickness) { } +// non-free dep: https://www.myminifactory.com/object/3d-print-game-of-thrones-house-targaryen-1285 module dragon (d=10) { -/* translate ([-d/2, -d/2, 0]) { + translate ([-d/2, -d/2, 0]) { resize ([d, 0, 0], auto=true ) import ("./house-targaryen-game-of-thrones-2_fixed.stl"); } -*/ + cylinder (d=d, h=buckle_thickness); } - translate ([0, -buckle_height/2, 0]) buckle_base (); -//translate ([0, 0, 0]) dragon (d=dragon_d); +//translate ([0, 0, 0]) dragon (d=dragon_d); // or whatever other geometry you want to integrate with belt diff --git a/etc/canister.scad b/etc/canister.scad dissimilarity index 62% index 7578dbc..23ac922 100644 --- a/etc/canister.scad +++ b/etc/canister.scad @@ -1,107 +1,76 @@ -// super simple canister -// 2018 Clinton Ebadi - -inner_d = 20; -inner_h = 20; -cap_inner_h = 12; -cap_overlap = 10; -cap_tolerance = 0.5; - -wall = 2; -base = 1; -sides = 6; - - -// calculated -outer_d = inner_d + wall*2; -outer_h = inner_h + wall - cap_inner_h + cap_overlap; - -cap_outer_d = outer_d + wall*2; -cap_outer_h = cap_inner_h + base; - -cap_bump_size = wall/2; -cap_bump_h = cap_bump_size * 2; -cap_bump_offset = cap_bump_h + 2; - -echo (cap_bump_offset); - - -// other asserts, if I care enough... -assert (cap_inner_h > cap_overlap); -assert (cap_outer_h - cap_bump_offset > base); - - -//$fa = 0.1; -//$fs = 0.1; - -canister_base (); -translate ([cap_outer_d + 1, 0, 0,]) canister_cap (); - -//cap_bump (); - -// inner -/* module cap_bump () { */ -/* $fn = sides; */ -/* cap_bump_d = outer_d+cap_bump_size*2; */ - -/* difference () { */ -/* circle (d=cap_bump_d); */ -/* circle (d=outer_d); */ -/* } */ - -/* /\* difference () { *\/ */ -/* /\* cylinder (h=cap_bump_h, d=cap_bump_d, center=true); *\/ */ -/* /\* cylinder (h=cap_bump_h+1, d=outer_d, center=true); *\/ */ -/* /\* } *\/ */ - -/* /\* rotate_extrude () *\/ */ -/* /\* union () { *\/ */ -/* /\* translate ([cap_bump_d/2, 0, 0]) *\/ */ -/* /\* rotate ([0, 180, 0]) circle (cap_bump_size, $fn=3); *\/ */ -/* /\* } *\/ */ -/* } */ - -module cap_bump () { - cap_bump_d = outer_d+cap_bump_size/2; - hull () { - translate ([0, 0, 0]) - cylinder (d = cap_bump_d, h = cap_bump_h/3, $fn = sides); - translate ([0, 0, cap_bump_h/3]) - cylinder (d = cap_bump_d + cap_bump_size, h = cap_bump_h/3, $fn = sides); - translate ([0, 0, cap_bump_h/3*2]) - cylinder (d = cap_bump_d, h = cap_bump_h/3, $fn = sides); - } - /* cylinder (d = cap_bump_d + cap_bump_size, h = cap_bump_h, $fn = sides); */ - /* translate ([0, 0, -cap_bump_h]) cylinder (d = inner_d, h = cap_bump_h*2+0.1, $fn = sides); */ - /* } */ - /* sphere_d = (cap_bump_h+0.1); */ - /* translate ([cap_bump_d/2-cap_bump_size, 0, cap_bump_h/2]) sphere (d = sphere_d); */ - /* } */ - - /* minkowski () { */ - /* cylinder (d = outer_d, h = cap_bump_size*2, $fn = sides); */ - /* sphere (d = cap_bump_size); */ - /* } */ - /* rotate_extrude () { */ - /* translate ([inner_d/2, 0, 0]) circle (cap_bump_size); */ - /* } */ -} - -module canister_base () { - difference () { - union () { - cylinder (d = outer_d, h = outer_h, $fn = sides); - translate ([0, 0, outer_h - cap_overlap + cap_bump_offset]) cap_bump (); - } - translate ([0, 0, base]) cylinder (d = inner_d, h = outer_h + 1, $fn = sides); - } -} - -module canister_cap () { - tolerance_pct = 1.05; - difference () { - cylinder (d = cap_outer_d, h = cap_outer_h, $fn = sides); - translate ([0, 0, base]) cylinder (d = outer_d + cap_tolerance, h = cap_outer_h+1, $fn = sides); - translate ([0, 0, cap_outer_h - cap_bump_offset]) scale ([tolerance_pct, tolerance_pct, tolerance_pct]) cap_bump (); - } -} +// super simple canister +// 2018 Clinton Ebadi + +// incense sticks are ~22cm +// add a few cm in cap for packaging + +inner_d = 25; +inner_h = 215; +cap_inner_h = 35; // height inside of cap, above rim of the canister +cap_overlap = 10; +cap_tolerance = 0.3; + +wall = 2; +base = 2; +sides = 7; + + +// calculated +outer_d = inner_d + wall*2; +outer_h = inner_h + base; + +cap_outer_d = outer_d + wall*2 + cap_tolerance; +cap_outer_h = cap_inner_h + cap_overlap + base; + +cap_bump_size = 0.75; +cap_bump_h = 3; +cap_bump_offset = 3; + +echo (cap_bump_offset); + + +// other asserts, if I care enough... +//assert (cap_inner_h > cap_overlap); +//assert (cap_outer_h - cap_bump_offset > base); + + +//$fa = 0.1; +//$fs = 0.1; + +canister_base (); +translate ([cap_outer_d + 1, 0, 0]) canister_cap (); +//#translate ([0, 0, outer_h + cap_inner_h + base]) rotate ([0, 180, 180]) canister_cap (); + +//cap_bump (); + +module cap_bump (cap_bump_size=cap_bump_size, cap_bump_h=cap_bump_h) { + cap_bump_d = outer_d+cap_bump_size/2; + hull () { + translate ([0, 0, 0]) + cylinder (d = cap_bump_d, h = cap_bump_h/3, $fn = sides); + translate ([0, 0, cap_bump_h/3]) + cylinder (d = cap_bump_d + cap_bump_size, h = cap_bump_h/3, $fn = sides); + translate ([0, 0, cap_bump_h/3*2]) + cylinder (d = cap_bump_d, h = cap_bump_h/3, $fn = sides); + } +} + +module canister_base () { + difference () { + union () { + cylinder (d = outer_d, h = outer_h, $fn = sides); + translate ([0, 0, outer_h - cap_overlap + cap_bump_offset]) cap_bump (); + translate ([0, 0, outer_h - cap_overlap - cap_bump_h - 0.2]) cap_bump (cap_bump_size = wall); + } + translate ([0, 0, base]) cylinder (d = inner_d, h = outer_h + 1, $fn = sides); + } +} + +module canister_cap () { + tolerance_pct = 1.00; + difference () { + cylinder (d = cap_outer_d, h = cap_outer_h, $fn = sides); + translate ([0, 0, base]) cylinder (d = outer_d + cap_tolerance, h = cap_outer_h+1, $fn = sides); + translate ([0, 0, cap_outer_h - cap_bump_offset - cap_bump_h]) scale ([tolerance_pct, tolerance_pct, tolerance_pct]) rotate ([0, 0, 0]) cap_bump (); + } +} -- 2.20.1