Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 78f7ac0e68 - Show all commits

View File

@ -5,7 +5,7 @@ include <common.scad>;
// https://www.thingiverse.com/thing:83806 - Lego mount (has dimensions of servo body) // https://www.thingiverse.com/thing:83806 - Lego mount (has dimensions of servo body)
// https://www.thingiverse.com/thing:5241574 - Robot arm (just cool) // https://www.thingiverse.com/thing:5241574 - Robot arm (just cool)
currentAngle=-60; currentAngle=0;
LensVoidDiameter = 40; //mm LensVoidDiameter = 40; //mm
LensZ = 80; LensZ = 80;
@ -61,7 +61,7 @@ module Mount () {
translate([50, 0, -6-3.01]) cube([2, 56, 2], center=true); translate([50, 0, -6-3.01]) cube([2, 56, 2], center=true);
} }
} }
translate([0,R(LensVoidDiameter),1+7.5]) cube([LensVoidDiameter*2, LensVoidDiameter, 7], center=true); translate([0,R(LensVoidDiameter),1+4.5]) cube([LensVoidDiameter*2, LensVoidDiameter, 7], center=true);
// //
translate([80, R(MountBoltSpacingY), 0]) RailSlots(); translate([80, R(MountBoltSpacingY), 0]) RailSlots();
translate([80, -R(MountBoltSpacingY), 0]) RailSlots(); translate([80, -R(MountBoltSpacingY), 0]) RailSlots();
@ -174,13 +174,13 @@ module OptoEndstopMount () {
module Debug () { module Debug () {
Mount(); Mount();
translate([-CapOffsetX,-CapOffsetY,6.11 + 1.9]) rotate([0,0,currentAngle]) Cap(); translate([-CapOffsetX,-CapOffsetY,5.71]) rotate([0,0,currentAngle]) Cap();
//color("green") RailMount(); //color("green") RailMount();
translate([5, -38, -11.8+OptoEndstopAdjustZ]) rotate([0, -90, 0]) opto_endstop(); translate([5, -38, -11.8+OptoEndstopAdjustZ]) rotate([0, -90, 0]) opto_endstop();
translate([5, -38, -11.8]) OptoEndstopMount(); //translate([5, -38, -11.8]) OptoEndstopMount();
} }
Render="OptoEndstopMount"; Render="MountFront";
if (Render=="Debug") { if (Render=="Debug") {
Debug(); Debug();

Binary file not shown.

Binary file not shown.