16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

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
Conversation 0 Commits 95 Files Changed 120 +7 -5
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99794d04c2 - Show all commits

6
scad/arri_s.scad
View File

@ -16,7 +16,7 @@ CapThickness = 3;
CapCatchDiameter = 38; CapCatchDiameter = 38;
CapCatchLength = 2; CapCatchLength = 2;
CapCatchOffset = 15; CapCatchOffset = 15 + 1;
CapRimDiameter = 46.5; CapRimDiameter = 46.5;
CapRimThickness = 3; CapRimThickness = 3;
@ -465,7 +465,7 @@ module driveCouplingDCConnector () {
PART2 = "bellows_camera_board"; PART2 = "bellows_camera_board_adapter";
if (PART2 == "drive_coupling_DC_connector") { if (PART2 == "drive_coupling_DC_connector") {
driveCouplingDCConnector(); driveCouplingDCConnector();
@ -481,7 +481,7 @@ if (PART2 == "drive_coupling_DC_connector") {
rotate([180, 0, 0]) animationMotorCap(); rotate([180, 0, 0]) animationMotorCap();
} else if (PART2 == "drive_coupling") { } else if (PART2 == "drive_coupling") {
driveCoupling(); driveCoupling();
} else if (PART2 == "bellows_camera_board") { } else if (PART2 == "bellows_camera_board_adapter") {
bodyCapBellowsAdapter(); bodyCapBellowsAdapter();
} else if (PART2 == "bellows_camera_board") { } else if (PART2 == "bellows_camera_board") {
bellows_camera_board(); bellows_camera_board();

6
scad/jk_lens_assembly.scad
View File

@ -298,9 +298,11 @@ module debug () {
translate([0, BackOffset, -70]) lensAssemblyBaseZ(); translate([0, BackOffset, -70]) lensAssemblyBaseZ();
} }
PART = "lens_assembly_threaded_z"; PART = "lens_assembly_camera_bellows_board";
if (PART == "lens_assembly_bellows_board") { if (PART == "lens_assembly_camera_bellows_board") {
bellows_camera_board();
} else if (PART == "lens_assembly_bellows_board") {
lensAssemblyBellowsBoard(); lensAssemblyBellowsBoard();
} else if (PART == "lens_assembly_threaded_z") { } else if (PART == "lens_assembly_threaded_z") {
lensAssemblyThreadedZ(); lensAssemblyThreadedZ();

BIN
stl/jk_lens_assembly_bellows_board.stl
View File

Binary file not shown.

BIN
stl/jk_lens_assembly_camera_bellows_board.stl Normal file
View File

Binary file not shown.