浏览代码

add new windscreen rendering code to TinySpHEAR_EM200, remove old bottom capsule render line

Fernando Pablo Lopez-Lezcano 9 年之前
父节点
当前提交
dab0d59629
共有 1 个文件被更改,包括 12 次插入 和 11 次删除
  1. 12 11
      TinySpHEAR_EM200.scad

+ 12 - 11
TinySpHEAR_EM200.scad

@@ -4,7 +4,7 @@
 // TinySpHEAR, First Order (B-format) Ambisonics Microphone
 // Microphone optimized for EM200 capsules and Zapnspark interface
 // 
-// Copyright 2015-2016, Fernando Lopez-Lezcano, All Rights Reserved
+// Copyright 2015-2017, Fernando Lopez-Lezcano, All Rights Reserved
 // nando@ccrma.stanford.edu
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 // http://creativecommons.org/licenses/by-nc-sa/4.0/
 
 include <SpHEAR_common.scad>;
+include <SpHEAR_windscreen.scad>;
 include <TinySpHEAR_common.scad>;
 include <TinySpHEAR_mount_pcb.scad>;
 
@@ -38,7 +39,11 @@ connect = 1;
 leg_thick = capsule_height;
 
 // adjust the depth of slots in mount
-mic_to_mount_fit = -0.4;
+mic_to_mount_fit = -0.7;
+
+// parameters for windscreen rendering
+windscreen_height = 66;
+windscreen_radius = box_corner_radius + 6.0;
 
 ////
 //// render the different assemblies
@@ -68,13 +73,11 @@ facets = 128;
 
 //// windscreen
 
-*translate([0, 0, tetra_pcb_mount_height - windscreen_thread_height]) {
-    render_tetra_windscreen_bottom(windscreen_thread_height);
-    render_tetra_windscreen_mount(0);
-    render_tetra_windscreen_top(windscreen_height * 2 + windscreen_thread_height + 5);
-    // sleeves that connect the top and bottom frames
-    render_tetra_windscreen_connectors(windscreen_height + windscreen_thread_height);
-}
+*render_sphear_upper_windscreen(tetra_pcb_mount_height - 10 + windscreen_height);
+
+*render_sphear_lower_windscreen(tetra_pcb_mount_height - 10);
+
+*render_sphear_windscreen_thread_cover(tetra_pcb_mount_height - 10);
 
 //// microphone shock mount
 
@@ -95,5 +98,3 @@ facets = 128;
 
 *render_tetra_capsule_top(0);
 
-*render_tetra_capsule_bot(0);
-