Prime_R refactor and Configurator support (#3289)

* Matrix refactor: rename KEYMAP to LAYOUT

* Keymap refactor: QMK_KEYBOARD_H; new matrix names

* Configurator support

2 files changed, 135 insertions, 133 deletions

diff --git a/keyboards/prime_r/keymaps/default/keymap.c b/keyboards/prime_r/keymaps/default/keymap.c
index ff00dc6572..a39d197e27 100644
--- a/keyboards/prime_r/keymaps/default/keymap.c
+++ b/keyboards/prime_r/keymaps/default/keymap.c
@@ -17,9 +17,7 @@
  */
 // Prime_R Rev 1.0
 
-#include "prime_r.h"
-#include "action_layer.h"
-#include "backlight.h"
+#include QMK_KEYBOARD_H
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
@@ -40,29 +38,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------------------------------------------'
    */
   // 0: Base Layer
-	KEYMAP(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_PGUP, KC_BSPC, KC_PSCR, KC_PGUP, KC_PGDN, \
-		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_PGDN, KC_DEL,  KC_7,    KC_8,    KC_9,    \
-		KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,    KC_J,   KC_K,    KC_L,    KC_DQUO,          KC_ENT,  KC_4,    KC_5,    KC_6,    \
-		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,   KC_M,    KC_LABK, KC_RABK, KC_QUES, KC_LSFT, KC_1,    KC_2,    KC_3,    \
-		KC_LCTL,          KC_LGUI, KC_APP,  KC_LALT, MO(0),           KC_SPC,          KC_RALT, KC_APP,  KC_RGUI, KC_RCTL, KC_0,    KC_DOT,  KC_ENT), \
+  [0] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_PGUP, KC_BSPC, KC_PSCR, KC_PGUP, KC_PGDN, \
+    KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    KC_PGDN, KC_DEL,  KC_7,    KC_8,    KC_9,    \
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,    KC_J,   KC_K,    KC_L,    KC_DQUO,          KC_ENT,  KC_4,    KC_5,    KC_6,    \
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,    KC_N,   KC_M,    KC_LABK, KC_RABK, KC_QUES, KC_LSFT, KC_1,    KC_2,    KC_3,    \
+    KC_LCTL,          KC_LGUI, KC_APP,  KC_LALT, MO(0),           KC_SPC,          KC_RALT, KC_APP,  KC_RGUI, KC_RCTL, KC_0,    KC_DOT,  KC_ENT   \
+  ),
 
-		// 1: Function Layer
-	KEYMAP(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+  // 1: Function Layer
+  [1] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,          _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______  \
+  ),
 
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
 
-	switch (id) {
+  switch (id) {
 
-	}
-	return MACRO_NONE;
+  }
+  return MACRO_NONE;
 }
 
 void matrix_init_user(void) {
@@ -72,5 +72,5 @@ void matrix_scan_user(void) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
\ No newline at end of file
+  return true;
+}
diff --git a/keyboards/prime_r/keymaps/rooski/keymap.c b/keyboards/prime_r/keymaps/rooski/keymap.c
index 091dcce245..3fadc6c6bc 100644
--- a/keyboards/prime_r/keymaps/rooski/keymap.c
+++ b/keyboards/prime_r/keymaps/rooski/keymap.c
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */// Prime_R Rev 1.0
 
-#include "prime_r.h"
-#include "action_layer.h"
-#include "backlight.h"
+#include QMK_KEYBOARD_H
 
 // Fillers to make layering more clear
 #define _______ KC_TRNS
@@ -29,13 +27,13 @@ static bool arrow_toggle = false;
 
 //Arrow Keys
 enum custom_keycodes{
-	AR_TOG = SAFE_RANGE, //Toggle Arrow Keys
-	AR_LT,	//Num0 or Left Arrow
-	AR_RT,	//NumEnt or Right Arrow
-	AR_DN,	//NumDot or Down Arrow
-	AR_UP,	//Num2 or Up Arrow
+  AR_TOG = SAFE_RANGE, //Toggle Arrow Keys
+  AR_LT,  //Num0 or Left Arrow
+  AR_RT,  //NumEnt or Right Arrow
+  AR_DN,  //NumDot or Down Arrow
+  AR_UP,  //Num2 or Up Arrow
 };
-		
+
 // Tap/Hold Space Layer
 #define SPC_LT LT(1, KC_SPC)
 
@@ -54,12 +52,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------------------------------------------'
    */
   // 0: Base Layer
-	KEYMAP(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, KC_DEL,  KC_HOME, KC_END,   \
-		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_P7,   KC_P8,   KC_P9,    \
-		KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,    \
-		KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_P1,   AR_UP,   KC_P3,    \
-		KC_LCTL,          KC_LGUI, KC_LALT, TO(1),   SPC_LT,           SPC_LT,           AR_TOG,  KC_APP,  KC_RALT, KC_RCTL, AR_LT,   AR_DN,   AR_RT),   \
+  [0] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_BSPC, KC_DEL,  KC_HOME, KC_END,   \
+    KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_P7,   KC_P8,   KC_P9,    \
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,          KC_ENT,  KC_P4,   KC_P5,   KC_P6,    \
+    KC_LSPO,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_P1,   AR_UP,   KC_P3,    \
+    KC_LCTL,          KC_LGUI, KC_LALT, TO(1),   SPC_LT,           SPC_LT,           AR_TOG,  KC_APP,  KC_RALT, KC_RCTL, AR_LT,   AR_DN,   AR_RT     \
+  ),
 
   /* (Function Layer)
    * ,---------------------------------------------------------------.
@@ -73,14 +72,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |---------------------------------------------------------------|
    * |Ctrl|Gui |Alt|TO0| 1/SP |  1/SP  |ART|TO2|Alt|Ctrl |MUT|VDN|STP|
    * `---------------------------------------------------------------'
-   */  
+   */
   // 1: Function Layer
-	KEYMAP(
-		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_EQL,  _______, KC_PSLS, KC_PAST, KC_PPLS, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______, 
-		BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT,          _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, 
-		_______,          _______, _______, TO(0),   _______,          _______,          _______, TO(2),   _______, _______, KC_MUTE, KC_VOLD, KC_MSTP),	
+  [1] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_EQL,  _______, KC_PSLS, KC_PAST, KC_PPLS,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______, _______,
+    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_QUOT,          _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______,
+    _______,          _______, _______, TO(0),   _______,          _______,          _______, TO(2),   _______, _______, KC_MUTE, KC_VOLD, KC_MSTP
+  ),
 
   /* (Numpad Mods)
    * ,---------------------------------------------------------------.
@@ -96,104 +96,106 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `---------------------------------------------------------------'
    */
     // 2: Numpad Mods
-	KEYMAP(
-		_______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, _______, KC_PSLS, KC_PAST, KC_PPLS, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RBRC, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN,          _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AR_UP,   _______, 
-		_______,          _______, _______, TO(0),   _______,          _______,          _______, KC_APP,  _______, _______, AR_LT,   AR_DN,   AR_RT ),
-		
+  [2] = LAYOUT(
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, _______, KC_PSLS, KC_PAST, KC_PPLS,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RBRC, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_SCLN,          _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, AR_UP,   _______,
+    _______,          _______, _______, TO(0),   _______,          _______,          _______, KC_APP,  _______, _______, AR_LT,   AR_DN,   AR_RT
+  ),
+
   // 3: Extra
-	KEYMAP(
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-		_______,          _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______),
+  [3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,          _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______
+  ),
 
 };
 
 void matrix_init_user(void) {
-	if (get_backlight_level() != 0){
-		backlight_toggle();
-	}
+  if (get_backlight_level() != 0){
+    backlight_toggle();
+  }
 };
 
 void matrix_scan_user(void) {
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	if(record->event.pressed){
-		switch(keycode) {
-			case AR_TOG:
-				arrow_toggle = !arrow_toggle;
-				backlight_toggle();	
-				return false; break;
-			
-			case AR_UP:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_DOWN(X_UP));
-				} else {
-					SEND_STRING(SS_DOWN(X_KP_2));
-				}
-				return false; break;
-			
-			case AR_DN:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_DOWN(X_DOWN));
-				} else {
-					SEND_STRING(SS_DOWN(X_KP_DOT));
-				}
-				return false; break;
-			
-			case AR_LT:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_DOWN(X_LEFT));
-				} else {
-					SEND_STRING(SS_DOWN(X_KP_0));
-				}
-				return false; break;
-			
-			case AR_RT:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_DOWN(X_RIGHT));
-				} else {
-					SEND_STRING(SS_DOWN(X_KP_ENTER));
-				}
-				return false; break;
-		}
-	}
-	if(!record->event.pressed){
-		switch(keycode) {
-			case AR_UP:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_UP(X_UP));
-				} else {
-					SEND_STRING(SS_UP(X_KP_2));
-				}
-				return false; break;
-			case AR_DN:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_UP(X_DOWN));
-				} else {
-					SEND_STRING(SS_UP(X_KP_DOT));
-				}
-				return false; break;
-			case AR_LT:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_UP(X_LEFT));
-				} else {
-					SEND_STRING(SS_UP(X_KP_0));
-				}
-				return false; break;
-			case AR_RT:
-				if(arrow_toggle == 1){
-					SEND_STRING(SS_UP(X_RIGHT));
-				} else {
-					SEND_STRING(SS_UP(X_KP_ENTER));
-				}
-				return false; break;
-		}
-	}
-	return true;
-};
\ No newline at end of file
+  if(record->event.pressed){
+    switch(keycode) {
+      case AR_TOG:
+        arrow_toggle = !arrow_toggle;
+        backlight_toggle();
+        return false; break;
+
+      case AR_UP:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_DOWN(X_UP));
+        } else {
+          SEND_STRING(SS_DOWN(X_KP_2));
+        }
+        return false; break;
+
+      case AR_DN:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_DOWN(X_DOWN));
+        } else {
+          SEND_STRING(SS_DOWN(X_KP_DOT));
+        }
+        return false; break;
+
+      case AR_LT:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_DOWN(X_LEFT));
+        } else {
+          SEND_STRING(SS_DOWN(X_KP_0));
+        }
+        return false; break;
+
+      case AR_RT:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_DOWN(X_RIGHT));
+        } else {
+          SEND_STRING(SS_DOWN(X_KP_ENTER));
+        }
+        return false; break;
+    }
+  }
+  if(!record->event.pressed){
+    switch(keycode) {
+      case AR_UP:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_UP(X_UP));
+        } else {
+          SEND_STRING(SS_UP(X_KP_2));
+        }
+        return false; break;
+      case AR_DN:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_UP(X_DOWN));
+        } else {
+          SEND_STRING(SS_UP(X_KP_DOT));
+        }
+        return false; break;
+      case AR_LT:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_UP(X_LEFT));
+        } else {
+          SEND_STRING(SS_UP(X_KP_0));
+        }
+        return false; break;
+      case AR_RT:
+        if(arrow_toggle == 1){
+          SEND_STRING(SS_UP(X_RIGHT));
+        } else {
+          SEND_STRING(SS_UP(X_KP_ENTER));
+        }
+        return false; break;
+    }
+  }
+  return true;
+};