topeak-mtx-tortec-expeditionrack-adapter: move difference

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/topeak-mtx-tortec-expeditionrack-adapter.scad b/topeak-mtx-tortec-expeditionrack-adapter.scad
index 16804dae599a4e254826295e367b97d4b39de293..ab8830c14d79fc24a43f59a74492a189be47c68e 100644 (file)
--- a/topeak-mtx-tortec-expeditionrack-adapter.scad
+++ b/topeak-mtx-tortec-expeditionrack-adapter.scad
@@ -222,16 +222,20 @@ module FamLinextr(){
 }
 
 module FamGraspElevation(){
-  hull(){
-    ybot = $rack_rail_y - rack_rail_dia/2 + grasp_large_r
-      - fit_slope_len * 0.5;
-    for (y = [
-             ybot,
-             adapt_main_top_y - grasp_large_r
-             ])
-      for (dx= [-1,+1] * rack_rail_dia/2)
-       translate([ -$foreaftmaint_rail_z + dx, y ])
-         circle(r= grasp_large_r);
+  difference(){
+    hull(){
+      ybot = $rack_rail_y - rack_rail_dia/2 + grasp_large_r
+       - fit_slope_len * 0.5;
+      for (y = [
+               ybot,
+               adapt_main_top_y - grasp_large_r
+               ])
+       for (dx= [-1,+1] * rack_rail_dia/2)
+         translate([ -$foreaftmaint_rail_z + dx, y ])
+           circle(r= grasp_large_r);
+    }
+    translate([0, adapt_main_top_y])
+      rectfromto([-500, 0], [500, 500]);
   }
 }
 
@@ -288,11 +292,7 @@ module Principal(){
        FamLinextr(){
          rectfromto([ -$foreaftmaint_rail_z, adapt_main_top_y ],
                     [ 0, block_y_min]);
-         difference(){
-           FamGraspElevation();
-           translate([0, adapt_main_top_y])
-             rectfromto([-500, 0], [500, 500]);
-         }
+         FamGraspElevation();
        }
       }
     }