Tweak hex-spacer

mattkim93 · Mar 11, 2017 · 89d5a74 · 89d5a74
1 parent 2e2d55f
commit 89d5a74
Show file tree

Hide file tree

Showing 14 changed files with 1,679,970 additions and 14 deletions.
diff --git a/fulmer.cjl.txt b/fulmer.cjl.txt
diff --git a/fulmer.clj b/fulmer.clj
diff --git a/repl.gcode b/repl.gcode
diff --git a/repl.makerbot b/repl.makerbot
diff --git a/repl.scad b/repl.scad
diff --git a/repl.stl b/repl.stl
diff --git a/repl.x3g b/repl.x3g
diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj
@@ -563,7 +563,7 @@
          (on-wall-place 0 20))))
 
 
-(defn hex-spacer [column row radius] 
+(defn hex-spacer [column row radius height] 
   (let [position (key-position column row [0 0 0])
         column-offset (/ mount-width 2)
         row-offset    (/ mount-height 2)
@@ -573,14 +573,10 @@
         shift-down    (and (not (or shift-right shift-left)) (= row lastrow))
         is-vertical   (or shift-left shift-right)
         col-angle     (+ (* β (- centercol column)) (/ π 12))
-        row-angle     (* α (- row centerrow))
-        height 10]
+        row-angle     (* α (- row centerrow))]
     (->> (cylinder radius height)
          (rotate (if is-vertical (/ π 6) 0) [0 0 1])
          (translate [(first position) (second position) (/ height 2)])
-      ;    (translate [(* (if shift-right 1 (if shift-left -1 0)) (- column-offset (* wall-offset (Math/abs (Math/sin col-angle)))))
-      ;                (* (if shift-up    1 (if shift-down -1 0)) (- row-offset    (* wall-offset (Math/abs (Math/sin row-angle)))))
-                  ;    0])
          (translate [(* (if shift-right 1 (if shift-left -1 0)) column-offset)
                      (* (if shift-up    1 (if shift-down -1 0)) row-offset)
                      0])
@@ -589,16 +585,17 @@
                      0])
          (with-fn 6))))
 
-(defn hex-spacer-shapes [radius]
-  (union (hex-spacer 0 0         radius)
-         (hex-spacer 0 cornerrow radius)
-         (hex-spacer 3 lastrow   radius)
-         (hex-spacer 2 0         radius)
-         (hex-spacer lastcol (dec cornerrow) radius)
+(defn hex-spacer-shapes [radius height]
+  (union (hex-spacer 0 0         radius height)
+         (hex-spacer 0 cornerrow radius height)
+         (hex-spacer 3 lastrow   radius height)
+         (hex-spacer 2 0         radius height)
+         (hex-spacer lastcol (dec cornerrow) radius height)
          ))
+(def hex-spacer-height 10)
 (def hex-spacer-radius (/ 5.42 2))
-(def hex-spacer-holes  (hex-spacer-shapes hex-spacer-radius))
-(def hex-spacer-outers (hex-spacer-shapes (+ hex-spacer-radius 1.6)))
+(def hex-spacer-holes  (hex-spacer-shapes hex-spacer-radius hex-spacer-height))
+(def hex-spacer-outers (hex-spacer-shapes (+ hex-spacer-radius 1.6) (+ hex-spacer-height 1.6)))
 
 
 ;; teensy info

diff --git a/t.scad b/t.scad
@@ -0,0 +1,13 @@
+minkowski()
+     {
+     circle(1);
+     for(i=[0:5])
+          {
+          rotate([0,0,360/5 * i])
+          hull()
+               {
+               translate([20,0,0]) square(10);
+               square(2);
+               }
+          }
+     }
diff --git a/tags b/tags
@@ -0,0 +1,6 @@
+!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR	Darren Hiebert	/[email protected]/
+!_TAG_PROGRAM_NAME	Exuberant Ctags	//
+!_TAG_PROGRAM_URL	http://ctags.sourceforge.net	/official site/
+!_TAG_PROGRAM_VERSION	5.8	//