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
1 changed files with 16 additions and 16 deletions
Showing only changes of commit 206c266b08 - Show all commits

View File

@ -1,30 +1,30 @@
// Arri-S Animation Motor // Arri-S Animation Motor
include <../common.scad>; include <./common.scad>;
BarrelDiameter = 40; BarrelDiameter = 45.1;
BarrelLength = 75; BarrelLength = 52;
SeatDiameter = 20; SeatDiameter = 20;
SeatLength = 3; SeatLength = 5.8;
CapLength = 30; CapLength = 19;
CapDiameter = 30; CapDiameter = 40;
CapThickness = 3; CapThickness = 3;
CapCatchDiameter = 28; CapCatchDiameter = 38;
CapCatchLength = 2; CapCatchLength = 2;
CapCatchOffset = 24; CapCatchOffset = 15;
CapRimDiameter = 37; CapRimDiameter = 46.5;
CapRimThickness = 3; CapRimThickness = 3;
NotchDiameter = 2; NotchDiameter = 2;
NotchOffset = 3; NotchOffset = 3;
DriveLength = 8; DriveLength = 7;
DriveDiameter1 = 14; DriveDiameter1 = 11;
DriveDiameter2 = 12; DriveDiameter2 = 9;
module motorBarrel () { module motorBarrel () {
$fn = 200; $fn = 200;
@ -36,7 +36,7 @@ module motorSeat () {
cylinder(r = SeatDiameter / 2, h = SeatLength, center = true); cylinder(r = SeatDiameter / 2, h = SeatLength, center = true);
} }
module motor () { module motorOriginal () {
motorBarrel(); motorBarrel();
translate([0, 0, (BarrelLength / 2) + (SeatLength / 2)]) motorSeat(); translate([0, 0, (BarrelLength / 2) + (SeatLength / 2)]) motorSeat();
//notch //notch
@ -63,10 +63,10 @@ module capBellowsAdapter () {
translate([0, 0, (CapLength / 2) + (CapRimThickness / 2)]) { translate([0, 0, (CapLength / 2) + (CapRimThickness / 2)]) {
difference () { difference () {
cylinder(r = CapRimDiameter / 2, h = CapRimThickness, center = true); cylinder(r = CapRimDiameter / 2, h = CapRimThickness, center = true);
cube([CapDiameter - CapThickness - 8, CapDiameter - CapThickness - 8, CapRimThickness + 1], center = true); cube([CapDiameter - CapThickness - 12, CapDiameter - CapThickness - 12, CapRimThickness + 1], center = true);
} }
} }
} }
motor(); //motorOriginal();
//capBellowsAdapter(); capBellowsAdapter();