Commit cd3b502e authored by Richard Bowman's avatar Richard Bowman 🔬

fixes for the makefile

corrected the hole patterns on the stages


Former-commit-id: 929ca30a8af1ddbc763656ebf70663ffbb92a853
Former-commit-id: f3879ccbe408ee4b854004d7106ee2ad322dad0b
parent 6142c162
......@@ -8,7 +8,7 @@ OUTPUT = builds
BODIES := main_body_micromanipulator_2mm main_body_fibre_stage_1mm
BASES := base_micromanipulator_2mm base_fibre_stage_1mm
TOOLS := actuator_assembly_tools
ACCESSORIES := accessories/LED_to_top_plate accessories/rms_to_platform accessories/CPS532_to_top_plate accessories/microscope_module
ACCESSORIES := accessories/LED_to_top_plate accessories/rms_to_top_plate accessories/CPS532_to_top_plate accessories/microscope_module
COMMONPARTS := gears small_gears moving_platform
ALLPARTS := $(COMMONPARTS) $(TOOLS) $(BODIES) $(BASES) $(ACCESSORIES)
ALLSTLFILES := $(ALLPARTS:%=$(OUTPUT)/%.stl)
......@@ -46,7 +46,7 @@ $(OUTPUT)/base_fibre_stage_1mm.stl: $(SOURCE)/base.scad $(main_body_deps)
$(OUTPUT)/accessories/LED_to_top_plate.stl: $(SOURCE)/accessories/LED_to_top_plate.scad
openscad -o [email protected] $<
$(OUTPUT)/accessories/rms_to_platform.stl: $(SOURCE)/accessories/rms_to_platform.scad
$(OUTPUT)/accessories/rms_to_top_plate.stl: $(SOURCE)/accessories/rms_to_top_plate.scad
openscad -o [email protected] $<
$(OUTPUT)/accessories/CPS532_to_top_plate.stl: $(SOURCE)/accessories/CPS532_to_top_plate.scad
......
......@@ -47,7 +47,7 @@ body_versions = {
"beam_height":85,
"xy_lever":20,
"z_lever":20,
"breadboard_lugs":"diagonal",
"breadboard_lugs":"atsides",
"fixed_stage":False,
},
}
......@@ -55,7 +55,7 @@ body_versions = {
accessory_versions = {
"CPS532_to_top_plate":{},
"LED_to_top_plate":{},
"rms_to_platform":{},
"rms_to_top_plate":{},
"microscope_module":{},
}
......@@ -100,8 +100,8 @@ if __name__ == "__main__":
M("$(OUTPUT)/base_" + version + ".stl: $(SOURCE)/base.scad $(main_body_deps)")
M(openscad_recipe(**parameters))
M("")
#M("$(OUTPUT)/actuator_assembly_tools.stl: $(SOURCE)/actuator_assembly_tools.scad")
#M(openscad_recipe(foot_height=26))
M("$(OUTPUT)/actuator_assembly_tools.stl: $(SOURCE)/actuator_assembly_tools.scad")
M(openscad_recipe(foot_height=26))
M("")
for version, parameters in accessory_versions.items():
M("$(OUTPUT)/accessories/" + version + ".stl: $(SOURCE)/accessories/" + version + ".scad")
......
......@@ -39,8 +39,8 @@ rms_mount_hole_spacing = 18;
module each_rms_mounting_hole(){
for(a=[0,90,180,270]) rotate(a) translate([1,1,0]*rms_mount_hole_spacing/2) children();
}
rms_mount_l = 25;
module rms_to_platform(mounting_holes=false, l=rms_mount_l){
module rms_to_platform(mounting_holes=true, l=15){
// A mount for an RMS objective that screws to the fixed/moving plate.
// l is the length of the mount
rms_r = 25.4*0.8/2-0.25; //see the openflexure microscope module
......@@ -79,7 +79,7 @@ module microscope_to_rms_mount_holes(top_z){
}
}
module openflexure_microscope_module(rms_mount_l=rms_mount_l){
module openflexure_microscope_module(rms_mount_l=15){
// a cut down optics module that bolts to the RMS mount above
// this is useful for observing the motion of the stage.
top_z = 65-35-rms_mount_l;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment