From 587b270d803e948482f5851990944e1f78428596 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Wed, 10 Apr 2024 18:44:42 -0400 Subject: Refactor Dactyl keymap (untested) --- keyboards/orbekk_dactyl/config.h | 37 +++++++++++++++++------- keyboards/orbekk_dactyl/keymaps/default/layout.h | 11 +++++++ keyboards/orbekk_dactyl/keymaps/orbekk/keymap.c | 0 keyboards/orbekk_dactyl/rules.mk | 4 --- 4 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 keyboards/orbekk_dactyl/keymaps/orbekk/keymap.c diff --git a/keyboards/orbekk_dactyl/config.h b/keyboards/orbekk_dactyl/config.h index cb82ae5022..482d17fa89 100644 --- a/keyboards/orbekk_dactyl/config.h +++ b/keyboards/orbekk_dactyl/config.h @@ -27,14 +27,29 @@ #define MASTER_LEFT -// Don't send keyboard macros too fast. -#define TAP_CODE_DELAY 12 - -#define ACHORDION_STREAK - -#define TAPPING_TERM_MS 200 -#define PERMISSIVE_HOLD - -#define TRI_LAYER_LOWER_LAYER 4 // LOW -#define TRI_LAYER_UPPER_LAYER 5 // RAISE -#define TRI_LAYER_ADJUST_LAYER 7 // FN +#define LAYOUT(k0A, k0B, k0C, k0D, k0E, k4E, k4D, k4C, k4B, k4A, k1A, k1B, k1C, k1D, k1E, k5E, k5D, k5C, k5B, k5A, k2A, k2B, k2C, k2D, k2E, k6E, k6D, k6C, k6B, k6A, k3B, k3D, k3E, k7E, k7D, k7B) { \ + {k0A, k0B, k0C, k0D, k0E}, \ + {k1A, k1B, k1C, k1D, k1E}, \ + {k2A, k2B, k2C, k2D, k2E}, \ + {KC_NO, k3B, KC_NO, k3D, k3E}, \ + {k4A, k4B, k4C, k4D, k4E}, \ + {k5A, k5B, k5C, k5D, k5E}, \ + {k6A, k6B, k6C, k6D, k6E}, \ + {KC_NO, k7B, KC_NO, k7D, k7E} \ +} + +#define LAYOUT_LR( \ +LA0, LA1, LA2, LA3, LA4, \ +LB0, LB1, LB2, LB3, LB4, \ +LC0, LC1, LC2, LC3, LC4, \ +LT0, LT1, \ +RA0, RA1, RA2, RA3, RA4, \ +RB0, RB1, RB2, RB3, RB4, \ +RC0, RC1, RC2, RC3, RC4, \ +RT0, RT1 \ +) LAYOUT( \ +LA0, LA1, LA2, LA3, LA4, RA0, RA1, RA2, RA3, RA4, \ +LB0, LB1, LB2, LB3, LB4, RB0, RB1, RB2, RB3, RB4, \ +LC0, LC1, LC2, LC3, LC4, RC0, RC1, RC2, RC3, RC4, \ +LT0, LT1, KC_NO, KC_NO, RT0, RT1 \ +) diff --git a/keyboards/orbekk_dactyl/keymaps/default/layout.h b/keyboards/orbekk_dactyl/keymaps/default/layout.h index cb5fea86d6..b992f3c9f8 100644 --- a/keyboards/orbekk_dactyl/keymaps/default/layout.h +++ b/keyboards/orbekk_dactyl/keymaps/default/layout.h @@ -2,6 +2,17 @@ #include QMK_KEYBOARD_H +#define LAYOUT(k0A, k0B, k0C, k0D, k0E, k4E, k4D, k4C, k4B, k4A, k1A, k1B, k1C, k1D, k1E, k5E, k5D, k5C, k5B, k5A, k2A, k2B, k2C, k2D, k2E, k6E, k6D, k6C, k6B, k6A, k3B, k3D, k3E, k7E, k7D, k7B) { \ + {k0A, k0B, k0C, k0D, k0E}, \ + {k1A, k1B, k1C, k1D, k1E}, \ + {k2A, k2B, k2C, k2D, k2E}, \ + {KC_NO, k3B, KC_NO, k3D, k3E}, \ + {k4A, k4B, k4C, k4D, k4E}, \ + {k5A, k5B, k5C, k5D, k5E}, \ + {k6A, k6B, k6C, k6D, k6E}, \ + {KC_NO, k7B, KC_NO, k7D, k7E} \ +} + #define LAYOUT_LR( \ LA0, LA1, LA2, LA3, LA4, \ LB0, LB1, LB2, LB3, LB4, \ diff --git a/keyboards/orbekk_dactyl/keymaps/orbekk/keymap.c b/keyboards/orbekk_dactyl/keymaps/orbekk/keymap.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/orbekk_dactyl/rules.mk b/keyboards/orbekk_dactyl/rules.mk index ae5277d6df..161ec22b16 100644 --- a/keyboards/orbekk_dactyl/rules.mk +++ b/keyboards/orbekk_dactyl/rules.mk @@ -1,5 +1 @@ SERIAL_DRIVER = vendor -TRI_LAYER_ENABLE = yes -COMBO_ENABLE = yes -SRC += features/custom_shift_keys.c -SRC += features/achordion.c -- cgit v1.2.3