diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | common/config.h | 5 | ||||
| -rw-r--r-- | common/keymap.h | 22 | ||||
| -rw-r--r-- | ferris/config.h | 20 | ||||
| -rw-r--r-- | ferris/keymap.c | 26 | ||||
| -rw-r--r-- | ferris/rules.mk | 6 | ||||
| -rw-r--r-- | planck/keymap.c | 6 |
7 files changed, 5 insertions, 82 deletions
@@ -1,6 +1,6 @@ # Christoph Cullmann's Layout -Layout with 34 keys, using Dhorf as base layer: +Layout with 42 keys, using Dhorf as base layer: dhorf (Oxey) v l h k q j f o u , diff --git a/common/config.h b/common/config.h index e209be4..84cc6de 100644 --- a/common/config.h +++ b/common/config.h @@ -37,11 +37,6 @@ // settings for home row modifiers // details see https://precondition.github.io/home-row-mods -// the default is 200 -#define TAPPING_TERM 170 -#define TAPPING_TERM_SLOW 220 -#define TAPPING_TERM_PER_KEY - // detect typing streaks #define ACHORDION_STREAK diff --git a/common/keymap.h b/common/keymap.h index b283a8a..b44cdf1 100644 --- a/common/keymap.h +++ b/common/keymap.h @@ -65,22 +65,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #include "achordion.h" -uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) { - switch (keycode) { - // Increase the tapping term a little for alt/algr/win. - case RALT_T(KC_C): - case LALT_T(KC_R): - case LGUI_T(KC_D): - case RGUI_T(KC_H): - case LALT_T(KC_I): - case RALT_T(KC_A): - return TAPPING_TERM_SLOW; - - default: - return TAPPING_TERM; - } -} - bool process_record_user(uint16_t keycode, keyrecord_t* record) { if (!process_achordion(keycode, record)) { return false; } return true; @@ -94,11 +78,7 @@ bool achordion_chord(uint16_t tap_hold_keycode, keyrecord_t* tap_hold_record, uint16_t other_keycode, keyrecord_t* other_record) { - // allow that bottom row has no delay - if (tap_hold_record->event.key.row % (MATRIX_ROWS / 2) >= 3) { return true; } - if (other_record->event.key.row % (MATRIX_ROWS / 2) >= 3) { return true; } - - // Otherwise, follow the opposite hands rule. + // follow the opposite hands rule. return on_left_hand(tap_hold_record->event.key) != on_left_hand(other_record->event.key); } diff --git a/ferris/config.h b/ferris/config.h deleted file mode 100644 index e234df0..0000000 --- a/ferris/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 Christoph Cullmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -// our shared config parts -#include "/home/cullmann/data/qmk/christoph-cullmann/common/config.h" diff --git a/ferris/keymap.c b/ferris/keymap.c deleted file mode 100644 index 0dd36fb..0000000 --- a/ferris/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Christoph Cullmann - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include QMK_KEYBOARD_H - -// Returns true if `pos` on the left hand of the keyboard, false if right. -static bool on_left_hand(keypos_t pos) { - // works not really on planck for bottom row, but we handle that differently - return pos.row < MATRIX_ROWS / 2; -} - -// our shared 34 keys keymap -#include "../common/keymap.h" diff --git a/ferris/rules.mk b/ferris/rules.mk deleted file mode 100644 index 97e98eb..0000000 --- a/ferris/rules.mk +++ /dev/null @@ -1,6 +0,0 @@ -# include common settings -include /home/cullmann/data/qmk/christoph-cullmann/common/rules.mk - -# build -# qmk compile -kb ferris/sweep -km christoph-cullmann -# qmk flash -kb ferris/sweep -km christoph-cullmann diff --git a/planck/keymap.c b/planck/keymap.c index f5bdcdd..b0c2794 100644 --- a/planck/keymap.c +++ b/planck/keymap.c @@ -17,9 +17,9 @@ #include QMK_KEYBOARD_H // Returns true if `pos` on the left hand of the keyboard, false if right. -static bool on_left_hand(keypos_t pos) { - // works not really on planck for bottom row, but we handle that differently - return pos.row < MATRIX_ROWS / 2; +static bool on_left_hand(keypos_t pos) +{ + return (pos.row < 3) || (pos.row == 3 && pos.col < 3) || (pos.row == 7 && pos.col > 2); } // layout helper macro, we just use 42 keys |