From 9993631353bd127913d991fd803871006d52eeeb Mon Sep 17 00:00:00 2001
From: mmcw-dev <hi@mmcwilliams.com>
Date: Tue, 16 Jan 2018 09:54:23 -0500
Subject: [PATCH] Add light module for 35mm fan

---
 scad/light.scad | 27 +++++++++++++++++++++++----
 scad/mcopy.scad |  8 ++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/scad/light.scad b/scad/light.scad
index 77ee8bf..ca7d6bb 100644
--- a/scad/light.scad
+++ b/scad/light.scad
@@ -173,8 +173,27 @@ module light_body () {
     
 }
 
+module light_body35 () {
+    $fn = 60;
+
+    W = 0.8 * 25.4;
+    L = 0.78 * 25.4;
+    Z = 12;
+    FAN_W = 35;
+    FAN_Z = 10;
+    translate([0, 0, 5]) difference () {
+        rounded_cube([W + 20 + 6, 40 + 6, 13], d = 6, center = true);
+        rounded_cube([W + 20, 40, 13 + 1], d = 6, center = true);
+       translate([0, -15, 20 - 1.5]) rotate([90, 0, 0]) cylinder(r = 31 / 2, h = 30, center = true);
+    }
+    translate([0, 0, 0]) difference() {
+        rounded_cube([W + 20 + 6, 40 + 6, FAN_Z], d = 6, center = true);
+        rounded_cube([FAN_W + 0.2, FAN_W + 0.2, FAN_Z + 1], d = 4, center = true);
+    }
+}
+
 module light_vent_top () {
-       $fn = 60;
+    $fn = 60;
     W = 0.8 * 25.4;
     L = 0.78 * 25.4;
     Z = 12;
@@ -194,9 +213,9 @@ module light_vent_top () {
     
 }
 
-module fan () {
+module fan (SIZE = 50) {
     $fn = 60;
-    FAN_W = 50;
+    FAN_W = SIZE;
     FAN_Z = 10;
     SCREW_D = 4;
     SCREW_INNER = 6;
@@ -280,7 +299,7 @@ module impromptu_mount () {
     }
 }
 
-module fresnel_laser(outer = 13, h = 3, spacing = 0.2) {
+module fresnel_laser(outer = 14, h = 3, spacing = 0.2) {
     $fn = 120;
     count = ceil(outer / spacing);
     for(i = [0 : count]) {
diff --git a/scad/mcopy.scad b/scad/mcopy.scad
index 332c7e5..1f4288f 100644
--- a/scad/mcopy.scad
+++ b/scad/mcopy.scad
@@ -5,9 +5,9 @@ include <./motor.scad>;
 
 //translate([0, 2.5, 0]) rotate([90, 0, 0]) color("red") adafruit_pixie();
 //translate([0, 6, 0]) color("blue") pixie_mount();
-//translate([0, 0, -50]) color("red") fan();
+translate([0, 0, -50]) color("red") fan(35);
 //color("green") diffuser_mount();
-//translate([0, 0, -51.2]) light_body();
+translate([0, 0, -51.2]) light_body35();
 //translate([0, 0, 20]) light_vent_top();
 //translate ([0, -20, 0]) rotate([90, 90, 0]) color("red") diffuser_insert();
 //translate ([0, -20, 0]) rotate([90, 90, 0]) color("red") diffuser_spacer();
@@ -15,5 +15,5 @@ include <./motor.scad>;
 //translate([0, -8.5, 0]) rotate([0, 0, 90]) impromptu_mount();
 //translate([30, -8.5, 0]) rotate([0, 0, 90]) flashlight_mount_cap();
 
-projection() fresnel_laser(spacing = 1);
-projection() fresnel_laser_outer();
\ No newline at end of file
+//projection() fresnel_laser(spacing = 1);
+//projection() fresnel_laser_outer();
\ No newline at end of file