diff --git a/0001-Changes-for-5x6.patch b/0001-Changes-for-5x6.patch deleted file mode 100644 index 760c0d6..0000000 --- a/0001-Changes-for-5x6.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cf28ce0da510b4342d2e6602ee422c13a41a46e1 Mon Sep 17 00:00:00 2001 -From: Tom Short -Date: Sun, 2 Apr 2017 14:06:18 -0400 -Subject: [PATCH] Changes for 5x6 - ---- - src/dactyl_keyboard/dactyl.clj | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj -index 816bff8..0e5bd10 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 5) -+(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 15 for centercol=2 -+(def keyboard-z-offset 16) ; controls overall height; original=9 with centercol=3; use 15 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 --- -2.10.2.windows.1 - diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index d8861fb..885552e 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 5) +(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