Cleanup Default Keymaps (#5442)

[qmk_firmware.git] / keyboards / the_ruler / keymaps / default / keymap.c

diff --git a/keyboards/the_ruler/keymaps/default/keymap.c b/keyboards/the_ruler/keymaps/default/keymap.c
index 78a7855344123cb14b0e5061cbc8fc679ed25b29..8b0f44b5edeb4e6f088d4aeeef1a963bf1ed0540 100644 (file)
--- a/keyboards/the_ruler/keymaps/default/keymap.c
+++ b/keyboards/the_ruler/keymaps/default/keymap.c
@@ -1,6 +1,4 @@
-#include "the_ruler.h"
-#include "action_layer.h"
-#include "eeconfig.h"
+#include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
 
@@ -18,10 +16,6 @@ enum custom_keycodes {
   FN_2
 };
 
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
@@ -33,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |  FN_2 |   2   |TSKMGR |CALTDEL|  ESC  |  FN_1 |
  * `-----------------------------------------------'
  */
-[_DEFAULT] = KEYMAP( \
+[_DEFAULT] = LAYOUT( \
   MO(_FN_2), KC_2, TSKMGR, CALTDEL, KC_ESC, MO(_FN_1)
 ),
 
@@ -42,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |RGB_TOG|RGB_HUD|RGB_HUI|RGB_SAD|RGB_SAI|  FN_1 |
  * `-----------------------------------------------'
  */
-[_FN_1] = KEYMAP( \
+[_FN_1] = LAYOUT( \
   RGB_TOG, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______
 ),
 
@@ -51,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |  FN_2 |RGB_VAD|RGB_VAI|RGB_MOD|TSKMGR | RESET |
  * `-----------------------------------------------'
  */
-[_FN_2] = KEYMAP( \
+[_FN_2] = LAYOUT( \
   _______, RGB_VAD, RGB_VAI, RGB_MOD, TSKMGR, RESET
 )
 
@@ -67,4 +61,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     // NONE
   }
   return true;
-}
\ No newline at end of file
+}