From cb719757c2987bd0b42bc9ad0489b8582a386f4d Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Fri, 18 Aug 2017 23:03:09 +0200 Subject: [PATCH] Reverse the split shift/fn Turns out that 3c and 3d are not reversed when splitting the right shift in the way that the Mark I layout does. Reversing it here, rather than in the generic satan.h to avoid breaking the other layouts. --- keyboards/satan/keymaps/mark1/keymap.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/keyboards/satan/keymaps/mark1/keymap.c b/keyboards/satan/keymaps/mark1/keymap.c index 1e8726135..78c331e92 100644 --- a/keyboards/satan/keymaps/mark1/keymap.c +++ b/keyboards/satan/keymaps/mark1/keymap.c @@ -6,16 +6,31 @@ #define KC_HOME LCTL(KC_A) // Home, or ctrl-a #define KC_END LCTL(KC_E) // End, or ctrl-e +// When using this split right shift layout, k3c and k3d are no longer reversed +// as in other layouts +#define COMPACT_KEYMAP_SPLIT_RSHIFT( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49,\ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ + k40, k41, k42, k45, k4a, k4b, k4c, k4d \ +) COMPACT_KEYMAP ( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49,\ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3c, \ + k40, k41, k42, k45, k4a, k4b, k4c, k4d \ +) + // Mark I keyboard layout for GH60 Satan // http://www.keyboard-layout-editor.com/#/gists/e1cde292bd2094cc3b763206d4d2cfb5 - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 0: qwerty - COMPACT_KEYMAP( + COMPACT_KEYMAP_SPLIT_RSHIFT( ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, NO, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT,NO, ENT , - LSFT,FN , Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN , + LSFT,FN , Z, X, C, V, B, N, M, COMM,DOT, SLSH,RSFT,FN, LCTL,LALT,LGUI, SPC, RGUI,RALT,RCTL,FNLK ), // 1: fn layer