2020 February 29 Breaking Changes Update (#8064)

2 files changed, 4 insertions, 14 deletions

diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
index 10e9b9dcdf..6e22e9e23a 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/keymap.c
@@ -20,9 +20,9 @@ enum planck_keycodes {
   DYNAMIC_MACRO_RANGE,
 };
 
-#define FKEYS F(_FKEYS)
+#define FKEYS LT(_FKEYS, KC_TAB)
 #define NUMSYM TT(_NUMSYM)
-#define FKEYGRV F(_FKEYGRV)
+#define FKEYGRV LT(_FKEYS, KC_GRV)
 #define MACSLEEP M(5)
 #define PLOVER M(6)
 #define LAYERRESET M(7)
@@ -82,11 +82,6 @@ void persistant_default_layer_set(uint16_t default_layer) {
   default_layer_set(default_layer);
 }
 
-const uint16_t PROGMEM fn_actions[] = {
- [_FKEYS] = ACTION_LAYER_TAP_KEY(_FKEYS, KC_TAB),
- [_FKEYGRV] = ACTION_LAYER_TAP_KEY(_FKEYS, KC_GRV),
-};
-
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
       switch(id) {
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
index 6f7167cbbe..b4d5234561 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/keymap.c
@@ -25,8 +25,8 @@ enum tv44_keycodes {
   EXT_MOUSE
 };
 
-#define LOWER F(_LOWER)
-#define RAISE F(_RAISE)
+#define LOWER LT(_LOWER, KC_SPC)
+#define RAISE LT(_RAISE, KC_SPC)
 #define WINDOW_SHORTCUT MO(_WINDOW_SHORTCUT)
 #define MAC_SHORTCUT MO(_MAC_SHORTCUT)
 
@@ -153,11 +153,6 @@ XXXXXXX,XXXXXXX,XXXXXXX,                EXT_MOUSE,EXT_MOUSE,        XXXXXXX,XXXX
 )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
- [_LOWER] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC),
- [_RAISE] = ACTION_LAYER_TAP_KEY(_RAISE, KC_SPC)
-};
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch(keycode) {
     case WINDOW: