[Keymap] Romac added and tweaks to existing keymaps (#5941)

* Initial keymap for Romac

* Formatting changes

* keymap tweaks

* Add new cycle layer key

* add cycle layer code

* initial upload

* keymap updates

* keymap updates

* keymap updates for new layer names

* new enum layers

* case added for 4th layer

* removed extra space for formatting

7 files changed, 132 insertions, 30 deletions

diff --git a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/keymaps/stanrc85/keymap.c
index 8e4c8b42b1..2e6a704839 100644
--- a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c
+++ b/keyboards/hs60/v2/keymaps/stanrc85/keymap.c
@@ -17,33 +17,33 @@
 #include "stanrc85.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_60_ansi(
+  [_QWERTY] = LAYOUT_60_ansi(
 	TD_TESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
 	KC_TAB,  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_BSLS,
 	KC_CTLE, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(3),   TD_TCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(_FN2_60),   TD_TCTL),
 
-  [1] = LAYOUT_60_ansi(
+  [_DEFAULT] = LAYOUT_60_ansi(
 	KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
 	KC_TAB,  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_BSLS,
 	KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC ,          KC_RALT, MO(2),  MO(3),   KC_RCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, MO(_FN1_60), MO(_FN2_60), KC_RCTL),
 
-  [2] = LAYOUT_60_ansi(
+  [_FN1_60] = LAYOUT_60_ansi(
 	KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 	_______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, _______, _______, KC_INS,
 	KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
 	_______, KC_RDP,  _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______,
 	_______, _______, _______,                   _______,                   _______, _______, _______, _______),
 
-  [3] = LAYOUT_60_ansi(
+  [_FN2_60] = LAYOUT_60_ansi(
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST,
 	_______, EF_INC,  ES_INC,  S1_INC,  H1_INC,  S2_INC,  H2_INC,  BR_INC,  _______, _______, _______, _______, _______, RESET,
 	_______, EF_DEC,  ES_DEC,  S1_DEC,  H1_DEC,  S2_DEC,  H2_DEC,  BR_DEC,  _______, _______, _______, _______, KC_MAKE,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                   _______,                   _______, _______, _______, TG(1))
+	_______, _______, _______,                   _______,                   _______, _______, _______, TG(_DEFAULT))
 };
 
 // Backlight specific keys:
diff --git a/keyboards/romac/keymaps/stanrc85/config.h b/keyboards/romac/keymaps/stanrc85/config.h
new file mode 100644
index 0000000000..722fd7e9e9
--- /dev/null
+++ b/keyboards/romac/keymaps/stanrc85/config.h
@@ -0,0 +1,11 @@
+#undef RGBLED_NUM
+#define RGBLED_NUM 16
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_ANIMATIONS
+#endif
+
diff --git a/keyboards/romac/keymaps/stanrc85/keymap.c b/keyboards/romac/keymaps/stanrc85/keymap.c
new file mode 100644
index 0000000000..ecca61cae0
--- /dev/null
+++ b/keyboards/romac/keymaps/stanrc85/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2019 Stanrc85
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "stanrc85.h"
+
+enum keys {
+  U_LAYR = SAFE_RANGE,
+  D_LAYR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_NUMPAD] = LAYOUT(
+	KC_7,   KC_8, KC_9,
+	KC_4,   KC_5, KC_6,
+	KC_1,   KC_2, KC_3,
+	U_LAYR, KC_0, KC_ENT),
+
+  [_NAVKEY] = LAYOUT(
+	KC_HOME, KC_INS,  KC_PGUP,
+	KC_END,  KC_UP,   KC_PGDN,
+	KC_LEFT, KC_DOWN, KC_RGHT,
+	U_LAYR,  TD_TWIN, D_LAYR),
+
+  [_MEDIA] = LAYOUT(
+	KC_MUTE, KC_VOLD, KC_VOLU,
+	CA_QUOT, KC_MPLY, CA_SCLN,
+	CA_COPY, CA_PSTE, KC_NO,
+	U_LAYR,  KC_NO,   D_LAYR),
+
+  [_RGB] = LAYOUT(
+	RGB_SAI, RGB_VAI, RGB_HUI,
+	RGB_SAD, RGB_VAD, RGB_HUD,
+	RGB_TOG, RGB_MOD, KC_NO,
+	U_LAYR,  KC_NO,   D_LAYR),
+
+  [_FN1PAD] = LAYOUT(
+	KC_NO, KC_NO,   KC_NO,
+	KC_NO, KC_NO,   RESET,
+	KC_NO, KC_NO,   KC_MAKE,
+	KC_NO, KC_LSFT, D_LAYR)
+};
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  keypos_t key;
+  uint8_t current_layer;
+  uint8_t next_layer;
+  switch (keycode) {
+  case U_LAYR: //cycles up the layers
+    if (!record->event.pressed) {
+      current_layer = layer_switch_get_layer(key);
+      next_layer = current_layer+1;
+      layer_move(next_layer);
+    }
+    break;
+  case D_LAYR: //cycles down the layers
+    if (!record->event.pressed) {
+      current_layer = layer_switch_get_layer(key);
+      next_layer = current_layer-1;
+      layer_move(next_layer);
+    }
+    break;
+  }
+  return true;
+};
diff --git a/keyboards/romac/keymaps/stanrc85/rules.mk b/keyboards/romac/keymaps/stanrc85/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/romac/keymaps/stanrc85/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index d820171d4d..f478398901 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -17,33 +17,33 @@
 #include "stanrc85.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_60_ansi(
+  [_QWERTY] = LAYOUT_60_ansi(
     TD_TESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
 	KC_TAB,  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_BSLS,
 	KC_CTLE, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(3),   TD_TCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(_FN2_60),   TD_TCTL),
 
-  [1] = LAYOUT_60_ansi(
+  [_DEFAULT] = LAYOUT_60_ansi(
 	KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
 	KC_TAB,  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_BSLS,
 	KC_CAPS, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC ,          KC_RALT, MO(2),  MO(3),   KC_RCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_RALT, MO(_FN1_60), MO(_FN2_60), KC_RCTL),
 
-  [2] = LAYOUT_60_ansi(
+  [_FN1_60] = LAYOUT_60_ansi(
 	KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
 	_______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, _______, _______, KC_INS,
 	KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,
 	_______, KC_RDP,  _______, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______,
 	_______, _______, _______,                   _______,                   _______, _______, _______, _______),
 
-  [3] = LAYOUT_60_ansi(
+  [_FN2_60] = LAYOUT_60_ansi(
 	_______, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE,
 	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                   _______,                   _______, _______, _______, TG(1))
+	_______, _______, _______,                   _______,                   _______, _______, _______, TG(_DEFAULT))
 };
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
diff --git a/users/stanrc85/layer_rgb.c b/users/stanrc85/layer_rgb.c
index 23eeb3b083..58f17489a1 100644
--- a/users/stanrc85/layer_rgb.c
+++ b/users/stanrc85/layer_rgb.c
@@ -1,26 +1,29 @@
 #include "stanrc85.h"
 
 void matrix_init_user(void) {
-  rgblight_setrgb(0xFF,  0x00, 0x00);
+  rgblight_setrgb(0xFF, 0x00, 0x00);
 };
 
 uint32_t layer_state_set_user(uint32_t state) {
   switch (biton32(state)) {
     case 0:
-        rgblight_setrgb (0xFF,  0x00, 0x00);
-        break;
+      rgblight_setrgb (0xFF, 0x00, 0x00);
+      break;
     case 1:
-        rgblight_setrgb (0x00,  0xFF, 0x00);
-        break;
+      rgblight_setrgb (0x00, 0xFF, 0x00);
+      break;
     case 2:
-        rgblight_setrgb (0x00,  0x00, 0xFF);
-        break;
+      rgblight_setrgb (0x00, 0x00, 0xFF);
+      break;
     case 3:
-        rgblight_setrgb (0xFF,  0xFF, 0xFF);
-        break;
+      rgblight_setrgb (0xFF, 0xFF, 0xFF);
+      break;
+    case 4:
+      rgblight_setrgb (0xFF, 0x00, 0xFF);
+      break;
     default: //  for any other layers, or the default layer
-        rgblight_setrgb (0xFF,  0x00, 0x00);
-        break;
+      rgblight_setrgb (0xFF, 0x00, 0x00);
+      break;
     }
   return state;
 }
diff --git a/users/stanrc85/stanrc85.h b/users/stanrc85/stanrc85.h
index b3d413fa1d..ceb7167e10 100644
--- a/users/stanrc85/stanrc85.h
+++ b/users/stanrc85/stanrc85.h
@@ -3,10 +3,17 @@
 #include "quantum.h"
 #include "version.h"
 
-#define DEFAULT 0  //Custom ANSI
-#define LAYER1 1   //Default ANSI (enable with Fn2+CAPS)
-#define LAYER2 2   //Function keys, arrows, custom shortcuts, volume control
-#define LAYER3 3   //RGB Underglow controls and RESET
+enum my_layers {
+  _NUMPAD = 0,  //Macropad numpad
+  _NAVKEY,      //Macropad nav keys
+  _MEDIA,       //Macropad media controls
+  _RGB,         //Macropad RGB controls
+  _FN1PAD,      //Macropad reset and make commands
+  _QWERTY = 0,  //Qwerty with custom shortcuts and functions
+  _DEFAULT,     //Default ANSI for gaming, enable with FN2+RCtl
+  _FN1_60,      //Function keys, arrows, custom shortcuts, volume control
+  _FN2_60       //RGB Underglow controls and RESET
+};
 
 //Aliases for longer keycodes
 #define KC_CAD	LALT(LCTL(KC_DEL))
@@ -14,10 +21,12 @@
 #define CA_QUOT LCA(KC_QUOT)
 #define CA_SCLN LCA(KC_SCLN)
 #define KC_CTLE LCTL_T(KC_ESC)
-#define LT_SPCF LT(2, KC_SPC)
+#define LT_SPCF LT(_FN1_60, KC_SPC)
 #define TD_TESC TD(TD_ESC)
 #define TD_TWIN TD(TD_WIN)
 #define TD_TCTL TD(TD_RCTL)
+#define CA_COPY LCTL(KC_C)
+#define CA_PSTE LCTL(KC_V)
 
 enum cust_keys {
   KC_MAKE = SAFE_RANGE,