Skip to content

Commit

Permalink
More model sizes
Browse files Browse the repository at this point in the history
  • Loading branch information
tshort committed Apr 2, 2017
1 parent b24fa4d commit e37076c
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 0 deletions.
30 changes: 30 additions & 0 deletions 4x6.patch
@@ -0,0 +1,30 @@
diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj
index d8861fb..e58302f 100644
--- a/src/dactyl_keyboard/dactyl.clj
+++ b/src/dactyl_keyboard/dactyl.clj
@@ -13,13 +13,13 @@
;; Shape parameters ;;
;;;;;;;;;;;;;;;;;;;;;;

-(def nrows 4)
-(def ncols 5)
+(def nrows 4)
+(def ncols 6)

(def α (/ π 12)) ; curvature of the columns
(def β (/ π 36)) ; curvature of the rows
(def centerrow (- nrows 3)) ; controls front-back tilt
-(def centercol 3) ; controls left-right tilt / tenting (higher number is more tenting)
+(def centercol 2) ; controls left-right tilt / tenting (higher number is more tenting)
(def tenting-angle (/ π 12)) ; or, change this for more precise tenting control
(def column-style
(if (> nrows 5) :orthographic :standard)) ; options include :standard, :orthographic, and :fixed
@@ -32,7 +32,7 @@

(def thumb-offsets [6 -3 7])

-(def keyboard-z-offset 9) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2
+(def keyboard-z-offset 16) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2

(def extra-width 2.5) ; extra space between the base of keys; original= 2
(def extra-height 1.0) ; original= 0.5
30 changes: 30 additions & 0 deletions 6x6.patch
@@ -0,0 +1,30 @@
diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj
index d8861fb..e58302f 100644
--- a/src/dactyl_keyboard/dactyl.clj
+++ b/src/dactyl_keyboard/dactyl.clj
@@ -13,13 +13,13 @@
;; Shape parameters ;;
;;;;;;;;;;;;;;;;;;;;;;

-(def nrows 4)
-(def ncols 5)
+(def nrows 6)
+(def ncols 6)

(def α (/ π 12)) ; curvature of the columns
(def β (/ π 36)) ; curvature of the rows
(def centerrow (- nrows 3)) ; controls front-back tilt
-(def centercol 3) ; controls left-right tilt / tenting (higher number is more tenting)
+(def centercol 2) ; controls left-right tilt / tenting (higher number is more tenting)
(def tenting-angle (/ π 12)) ; or, change this for more precise tenting control
(def column-style
(if (> nrows 5) :orthographic :standard)) ; options include :standard, :orthographic, and :fixed
@@ -32,7 +32,7 @@

(def thumb-offsets [6 -3 7])

-(def keyboard-z-offset 9) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2
+(def keyboard-z-offset 16) ; controls overall height; original=9 with centercol=3; use 16 for centercol=2

(def extra-width 2.5) ; extra space between the base of keys; original= 2
(def extra-height 1.0) ; original= 0.5
20 changes: 20 additions & 0 deletions create-models.sh
Expand Up @@ -6,6 +6,16 @@ openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad >/dev/null 2>
openscad -o things/right-4x5.stl things/right-4x5.scad >/dev/null 2>&1 &
openscad -o things/left-4x5.stl things/left-4x5.scad >/dev/null 2>&1 &

patch -p1 < 4x6.patch
lein run src/dactyl_keyboard/dactyl.clj
cp things/right.scad things/right-4x6.scad
cp things/left.scad things/left-4x6.scad
cp things/right-plate.scad things/right-4x6-plate.scad
openscad -o things/right-4x6-plate.dxf things/right-4x6-plate.scad >/dev/null 2>&1 &
openscad -o things/right-4x6.stl things/right-4x6.scad >/dev/null 2>&1 &
openscad -o things/left-4x6.stl things/left-4x6.scad >/dev/null 2>&1 &
git checkout src/dactyl_keyboard/dactyl.clj

patch -p1 < 5x6.patch
lein run src/dactyl_keyboard/dactyl.clj
cp things/right.scad things/right-5x6.scad
Expand All @@ -16,6 +26,16 @@ openscad -o things/right-5x6.stl things/right-5x6.scad >/dev/null 2>&1 &
openscad -o things/left-5x6.stl things/left-5x6.scad >/dev/null 2>&1 &
git checkout src/dactyl_keyboard/dactyl.clj

patch -p1 < 6x6.patch
lein run src/dactyl_keyboard/dactyl.clj
cp things/right.scad things/right-6x6.scad
cp things/left.scad things/left-6x6.scad
cp things/right-plate.scad things/right-6x6-plate.scad
openscad -o things/right-6x6-plate.dxf things/right-6x6-plate.scad >/dev/null 2>&1 &
openscad -o things/right-6x6.stl things/right-6x6.scad >/dev/null 2>&1 &
openscad -o things/left-6x6.stl things/left-6x6.scad >/dev/null 2>&1 &
git checkout src/dactyl_keyboard/dactyl.clj


# git add things/*-4x5.stl
# git add things/right-4x5-plate.dxf
Expand Down

0 comments on commit e37076c

Please sign in to comment.