From edc6269c93c174e7fe04582bfaef25d73a5640e4 Mon Sep 17 00:00:00 2001 From: carbonfet <59760875+carbonfet@users.noreply.github.com> Date: Sun, 11 Apr 2021 19:43:36 +0000 Subject: [PATCH] Update dactyl.clj Minor bugfix for bottom plate generation; should behave better with certain combinations now. --- src/dactyl_keyboard/dactyl.clj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj index e7c1f28..32ea758 100644 --- a/src/dactyl_keyboard/dactyl.clj +++ b/src/dactyl_keyboard/dactyl.clj @@ -285,9 +285,11 @@ (apply union (conj (for [column columns row rows - :when (or (and (= column 0) (< row 3)) - (and (.contains [1 2] column) (< row 4)) - (.contains [3 4 5 6] column))] + :when (or (.contains [(+ innercol-offset 2) (+ innercol-offset 3)] column) + (and (.contains [(+ innercol-offset 4) (+ innercol-offset 5)] column) extra-row (= ncols (+ innercol-offset 6))) + (and (.contains [(+ innercol-offset 4)] column) extra-row (= ncols (+ innercol-offset 5))) + (and inner-column (not= row cornerrow)(= column 0)) + (not= row lastrow))] (key-place column row keyhole-fill)) (list (key-place 0 0 keyhole-fill) (key-place 0 1 keyhole-fill)