Skip to content
Permalink
Browse files

final review of the original Metamaquina2 files

  • Loading branch information
sara-rodriguez committed Dec 22, 2013
1 parent 80f4559 commit 7661948f7e02bf8e7102829764f8881f861681e3
Showing with 26 additions and 30 deletions.
  1. +19 −19 Metamaquina2.scad
  2. +3 −6 jhead.scad
  3. +4 −5 lasercut_extruder.scad
@@ -780,7 +780,7 @@ module MachineTopPanel_face(){
translate([machine_x_dim/2 - sidewidth,-30])
rounded_square([sidewidth, 60], corners=[2, 30, 0, 0]);

//%translate([-5,112]) square([10.20,15.20]);
//translate([-5,112]) square([10.20,15.20]);

translate([0,60]){
translate([-machine_x_dim/2,-30])
@@ -1504,7 +1504,7 @@ module MachineRightPanel_sheet(){
rotate([90,0,0]){
material("lasercut")
linear_extrude(height=thickness)
%MachineRightPanel_face();
MachineRightPanel_face();

translate([0,0,thickness])
mirror([0,0,1])
@@ -1535,7 +1535,7 @@ module MachineLeftPanel_sheet(){
rotate([90,0,0]){
material("lasercut")
linear_extrude(height=thickness)
%MachineLeftPanel_face();
MachineLeftPanel_face();

tslot_parts_from_list(SidePanel_TSLOTS);

@@ -1580,7 +1580,7 @@ module MachineTopPanel_sheet(){
translate([0,-XZStage_offset,machine_height]){
material("lasercut")
linear_extrude(height=thickness)
%MachineTopPanel_face();
MachineTopPanel_face();

tslot_parts_from_list(TopPanel_TSLOTS);

@@ -1964,7 +1964,7 @@ module XCarriage(){

//lasercut parts:
translate([XCarPosition, 0, XCarriage_height]){
%XCarriage_bottom_sheet();
XCarriage_bottom_sheet();
translate([0,0,-bearing_sandwich_spacing]){

for (i=[-1,1]){
@@ -1981,9 +1981,9 @@ module XCarriage(){
XCarriage_sandwich_sheet();
}

//if (render_extruder)
//translate([0,0,thickness])
//lasercut_extruder();
if (render_extruder)
translate([0,0,thickness])
lasercut_extruder();
}

{
@@ -2007,8 +2007,8 @@ module XCarriage(){

module XPlatform(){
//submodules:
%XEndMotor();
%XEndIdler();
XEndMotor();
XEndIdler();
XCarriage();
XBelt();

@@ -2409,7 +2409,7 @@ module heated_bed_wire_passthru_hole(){
module BuildVolumePreview(){
if (render_build_volume){
translate([-BuildVolume_X/2, -BuildVolume_Y/2, BuildPlatform_height])
%cube([BuildVolume_X, BuildVolume_Y, BuildVolume_Z]);
cube([BuildVolume_X, BuildVolume_Y, BuildVolume_Z]);
}
}

@@ -2747,7 +2747,7 @@ module XMotor(){
module YMotor(){
rotate([0,0,-90-45])
rotate([180,0,0])
%NEMA17_subassembly();
NEMA17_subassembly();
}

module ZMotors(){
@@ -2791,8 +2791,8 @@ module plate_border(w=500, h=500, border=2){
//!LaserCutPanels();
module Metamaquina2(){
LaserCutPanels();
%FrontAssembly();
%RearAssembly() ;
FrontAssembly();
RearAssembly() ;

if (render_xplatform){
translate([0,
@@ -2805,7 +2805,7 @@ module Metamaquina2(){
}

YPlatform();
%ZAxis();
ZAxis();
}

//rotate([0,0,cos(360*time)*60])
@@ -2852,14 +2852,14 @@ if (render_calibration_guide){
}


use <FilamentSpoolHolder.scad>;
//use <FilamentSpoolHolder.scad>;


translate([400,0,0])
rotate([0,0,90]){
//translate([400,0,0])
//rotate([0,0,90]){
//FilamentSpoolHolder();
//FilamentSpool();
}
//}



@@ -24,16 +24,11 @@ use <nozzle.scad>;

module J_head_assembly(){

extruders_distance=9;

J_head_body();

translate([-0.15625*25.4,-0.250*25.4,-50])
//translate([1*extruders_distance,0,0])
v4nozzle();


// #v4nozzle();
}

module J_head_body(){
@@ -102,7 +97,7 @@ r9=(5/8)*inch/2;
cylinder(h=h9,r=r9);
}
}

/*
union()
<<<<<<< .merge_file_K4LOfE
translate([13+10/2,0,-50+4.76+4.64-10/2+6])
@@ -117,8 +112,10 @@ r9=(5/8)*inch/2;
translate([-13/2-10/2,0,-50+4.76+4.64-10/2+6])
cube(size=[10,10,10], center=true );
>>>>>>> .merge_file_sSWurE
*/
}
}
}

J_head_assembly();

@@ -12,11 +12,11 @@
//
// This program 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
// 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 this program. If not, see <http://www.gnu.org/licenses/>.
// along with this program. If not, see <http://www.gnu.org/licenses/>.

use <NEMA.scad>;
use <608zz_bearing.scad>;
@@ -133,7 +133,7 @@ module idler_back_face(){
translate([i*HandleWidth/6,R])
hull(){
M4_hole();
translate([0,-5]) M4_hole();
translate([0,-5]) M4_hole();
}

for (i=[-1,1])
@@ -643,7 +643,7 @@ module lasercut_extruder(){
rotate([-90,0])
rotate(motor_angle)
{
%NEMA17_subassembly();
NEMA17_subassembly();

translate([0,0,-2*thickness - 2*washer_thickness])
rotate([180,0])
@@ -654,4 +654,3 @@ module lasercut_extruder(){

lasercut_extruder();
%translate([0,0,-thickness]) XCarriage_bottom_sheet();

0 comments on commit 7661948

Please sign in to comment.
You can’t perform that action at this time.