2020 February 29 Breaking Changes Update (#8064)

[jackhill/qmk/firmware.git] / keyboards / lets_split / keymaps / adam / keymap.c

diff --git a/keyboards/lets_split/keymaps/adam/keymap.c b/keyboards/lets_split/keymaps/adam/keymap.c
index a5ad8e3..baa4e08 100644 (file)
--- a/keyboards/lets_split/keymaps/adam/keymap.c
+++ b/keyboards/lets_split/keymaps/adam/keymap.c
@@ -11,6 +11,9 @@ extern keymap_config_t keymap_config;
 #define FLOCK 1 // symbols arrows and F keys on F held down
 #define JLOCK 2 // same as Flock but with fall thru J and mapped to J held down
 
+#define FLOCK_F LT(FLOCK, KC_F)
+#define FLOCK_J LT(JLOCK, KC_J)
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Qwerty
@@ -27,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = LAYOUT ( \
   TD(1),         KC_2,       KC_3,         KC_4,     KC_5,         KC_MINS, KC_EQL,    KC_6,        KC_7,        KC_8,         KC_9,           KC_0,     \
   KC_Q,         KC_W,       KC_E,         KC_R,     KC_T,         KC_TAB,  KC_TAB,    KC_Y,        KC_U,        KC_I,         KC_O,           KC_P,    \
-  SFT_T(KC_A),  ALT_T(KC_S),CTL_T(KC_D),  F(FLOCK), GUI_T(KC_G),  KC_BSPC, KC_DELETE, GUI_T(KC_H), F(JLOCK),    CTL_T(KC_K),  ALT_T(KC_L),    SFT_T(KC_SCLN), \
+  SFT_T(KC_A),  ALT_T(KC_S),CTL_T(KC_D),  FLOCK_F,  GUI_T(KC_G),  KC_BSPC, KC_DELETE, GUI_T(KC_H), FLOCK_J,     CTL_T(KC_K),  ALT_T(KC_L),    SFT_T(KC_SCLN), \
   KC_Z,         KC_X,       KC_C,         KC_V,     KC_B,         KC_SPC,  KC_ENT,    KC_N,        KC_M,        KC_COMM,      KC_DOT,         KC_QUOTE
 ),
 [FLOCK] = LAYOUT ( \
@@ -44,10 +47,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-  [FLOCK] = ACTION_LAYER_TAP_KEY(FLOCK,KC_F),
-  [JLOCK] = ACTION_LAYER_TAP_KEY(JLOCK,KC_J)
-};
 #ifdef TAP_DANCE_ENABLE
 void tap_1(qk_tap_dance_state_t *state, void *user_data) {
   switch (state->count) {