From 42a7d031ba69b63bbe7edb8c8a57c0cadd22dfa1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 23 Jan 2021 11:52:02 +0000
Subject: [PATCH] Revert "scaffold-clamp-cleat: try making version for horiz
 print, for revert"

This reverts commit c21cbd2d563dce68b2f1e71f68ecbc993cf2333b.
---
 scaffold-clamp-cleat.scad  |  6 ++----
 scaffold-clamp-common.scad | 24 +++++++-----------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/scaffold-clamp-cleat.scad b/scaffold-clamp-cleat.scad
index 4360ae8..69e8538 100644
--- a/scaffold-clamp-cleat.scad
+++ b/scaffold-clamp-cleat.scad
@@ -1,8 +1,8 @@
 // -*- C -*-
 
 // Per cleat print
-//     VCleatAPrint   OR    VCleatAPrint
-//     GeneralB             VCleatAPrint
+//     VCleatA        OR    VCleatA
+//     GeneralB             VCleatA
 //     Pin                  Pin
 //
 // These bits are compatible with scaffold-clamp-tensioner
@@ -10,6 +10,4 @@
 //// toplevels-from:
 include <scaffold-clamp-common.scad>
 
-$print_horiz = true;
-
 module DemoA(){ VCleatARaw(); }
diff --git a/scaffold-clamp-common.scad b/scaffold-clamp-common.scad
index 251bbb4..4e9f367 100644
--- a/scaffold-clamp-common.scad
+++ b/scaffold-clamp-common.scad
@@ -53,8 +53,6 @@ pin_dia = th;
 pin_hole_dia = pin_dia/2;
 pin_tail = pin_hole_dia + pin_head_th + hinge_z_gap*3;
 
-$print_horiz = false;
-
 // ========== calculated ==========
 
 TAU = PI*2;
@@ -99,13 +97,12 @@ vhook_outer_dia = vhook_inside + vhook_th*2;
 
 cleat_horn_tl = cleat_horn_l + cleat_stem_l/2;
 
-vcleat_dz =
-  $print_horiz ? 0 : max(0,
-			 cleat_horn_tl
-			 + cleat_horn_d_min[0]/2
-			 - cleat_horn_d_min[0]/2 * cleat_overlap
-			 - total_z/2
-			 );
+vcleat_dz = max(0,
+		cleat_horn_tl
+		+ cleat_horn_d_min[0]/2
+		- cleat_horn_d_min[0]/2 * cleat_overlap
+		- total_z/2
+		);
 
 // calculated - hhook
 
@@ -332,7 +329,6 @@ module VCleat(){
 	  circle(r = tube_dia/2 + 0.1);
       }
     }
-    if (!$print_horiz)
       translate([0,0, total_z * 0.5])
 	cube(center=true,
 	     (main_r + cleat_stem_l)*4 * [1,1,0] +
@@ -340,17 +336,11 @@ module VCleat(){
   }
 }
 
-module VCleatA(){
+module VCleatA(){ ////toplevel
   DummyA();
   VCleat();
 }
 
-module VCleatAPrint(){ ////toplevel
-  rotate($print_horiz ? [90,0,0] : [0,0,0]) {
-    VCleatA();
-  }
-}
-
 // ---------- hhook ----------
 
 module HHookHookPlan(){
-- 
2.30.2