From ee341d225b572d30a5405c4fed85dd0e7d845d61 Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Sun, 15 Sep 2024 16:41:39 +0200 Subject: Revert "try sm_td" This reverts commit 089ceae1f7c15d63efa29b78d58179e635990eca. doesn't work for me, random stuff happens, t not triggers at all --- common/keymap.h | 61 +++++++++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) (limited to 'common/keymap.h') diff --git a/common/keymap.h b/common/keymap.h index f09f0f5..b44cdf1 100644 --- a/common/keymap.h +++ b/common/keymap.h @@ -1,4 +1,4 @@ -/* Copyright 2024 Christoph Cullmann +/* 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 @@ -23,30 +23,14 @@ enum my_layers { _FN }; -// home row mods and Co. -enum custom_keycodes { - SMTD_KEYCODES_BEGIN = SAFE_RANGE, - CKC_S, - CKC_R, - CKC_N, - CKC_T, - CKC_D, - CKC_G, - CKC_C, - CKC_A, - CKC_E, - CKC_I, - SMTD_KEYCODES_END, -}; - // our keymap const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT( XXXXXXX, KC_V, KC_L, KC_H, KC_K, KC_Q, KC_J, KC_F, KC_O, KC_U, KC_COMM, XXXXXXX, - XXXXXXX, CKC_S, CKC_R, CKC_N, CKC_T, KC_W, KC_Y, CKC_C, CKC_A, CKC_E, CKC_I, XXXXXXX, - XXXXXXX, KC_Z, KC_X, KC_M, CKC_D, KC_B, KC_P, CKC_G, KC_QUOT, KC_SCLN, KC_DOT, XXXXXXX, - MO(_SYM), KC_SPC, MO(_NUM), MO(_NAV), KC_BSPC, MO(_FN) + XXXXXXX, RALT_T(KC_S), LALT_T(KC_R), LCTL_T(KC_N), LSFT_T(KC_T), KC_W, KC_Y, RSFT_T(KC_C), RCTL_T(KC_A), LALT_T(KC_E), RALT_T(KC_I), XXXXXXX, + XXXXXXX, KC_Z, KC_X, KC_M, LGUI_T(KC_D), KC_B, KC_P, RGUI_T(KC_G), KC_QUOT, KC_SCLN, KC_DOT, XXXXXXX, + MO(_SYM), KC_SPC, MO(_NUM), MO(_NAV), KC_BSPC, MO(_FN) ), [_NUM] = LAYOUT( @@ -79,28 +63,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -// home row mods and Co. -// include needs above custom_keycodes declared -#include "sm_td.h" +#include "achordion.h" -void on_smtd_action(uint16_t keycode, smtd_action action, uint8_t tap_count) { - switch (keycode) { - SMTD_MT(CKC_S, KC_S, KC_RIGHT_ALT) - SMTD_MT(CKC_R, KC_R, KC_LEFT_ALT) - SMTD_MT(CKC_N, KC_N, KC_LEFT_CTRL) - SMTD_MT(CKC_T, KC_T, KC_LSFT) - SMTD_MT(CKC_D, KC_D, KC_LEFT_GUI) - SMTD_MT(CKC_G, KC_G, KC_RIGHT_GUI) - SMTD_MT(CKC_C, KC_C, KC_RSFT) - SMTD_MT(CKC_A, KC_A, KC_RIGHT_CTRL) - SMTD_MT(CKC_E, KC_E, KC_LEFT_ALT) - SMTD_MT(CKC_I, KC_I, KC_RIGHT_ALT) - } +bool process_record_user(uint16_t keycode, keyrecord_t* record) { + if (!process_achordion(keycode, record)) { return false; } + return true; } -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - if (!process_smtd(keycode, record)) { - return false; - } - return true; +void matrix_scan_user(void) { + achordion_task(); } + +bool achordion_chord(uint16_t tap_hold_keycode, + keyrecord_t* tap_hold_record, + uint16_t other_keycode, + keyrecord_t* other_record) { + // follow the opposite hands rule. + return on_left_hand(tap_hold_record->event.key) != + on_left_hand(other_record->event.key); +} + -- cgit v1.2.3