ridingqwerty: userspace update (#8076)

* Userspace overhaul

* Remove testing directory

* Minorca keymap tweaks

2 files changed, 98 insertions, 60 deletions

diff --git a/keyboards/atreus/keymaps/ridingqwerty/keymap.c b/keyboards/atreus/keymaps/ridingqwerty/keymap.c
index 336df4973..1eeb17fd1 100644
--- a/keyboards/atreus/keymaps/ridingqwerty/keymap.c
+++ b/keyboards/atreus/keymaps/ridingqwerty/keymap.c
@@ -30,9 +30,7 @@
                     MODS                   //              LAYERS              //                  MODS           //
 */
 
-#ifdef LAYOUT
-#undef LAYOUT
-#define LAYOUT( \
+#define LAYOUT_atreus( \
     K00,   K01,   K02,   K03,   K04,                 K40,   K41,   K42,   K43,   K44, \
     K10,   K11,   K12,   K13,   K14,                 K50,   K51,   K52,   K53,   K54, \
     K20,   K21,   K22,   K23,   K24,                 K60,   K61,   K62,   K63,   K64, \
@@ -47,70 +45,109 @@
   { K64, K63, K62, K61, K60, KC_NO }, \
   { K75, K74, K73, K72, K71, K70   }  \
 }
-#endif
+
+//#define ALPHA XP(UCM_LDEL, UCM_UDEL)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT( /* Qwerty */
-    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
-    ED_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    NM_SCLN,
-    LS_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, FK_DOT,  RS_SLSH,
-    LC_ESC,  LG_TAB,  LA_LBRC, LS_RBRC, NM_BSPC, ED_ESC,  SC_TAB,  SM_SPC,  RS_MINS, RA_EQL,  RG_QUOT, RC_ENT
+  [_QWERTY] = LAYOUT_atreus_wrapper( /* Qwerty */
+    ________________ATREUS_L1__________________,                   ________________ATREUS_R1__________________,
+    ________________ATREUS_L2__________________,                   ________________ATREUS_R2__________________,
+    ________________ATREUS_L3__________________,                   ________________ATREUS_R3__________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
+  ),
+  [_DVORAK] = LAYOUT_atreus_wrapper( /* Qwerty */
+    ________________DVORAK_L1__________________,                   ________________DVORAK_R1__________________,
+    ________________DVORAK_L2__________________,                   ________________DVORAK_R2__________________,
+    ________________DVORAK_L3__________________,                   ________________DVORAK_R3__________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
+  ),
+  [_COLEMAK] = LAYOUT_atreus_wrapper( /* Qwerty */
+    ________________COLEMAK_L1_________________,                   ________________COLEMAK_R1_________________,
+    ________________COLEMAK_L2_________________,                   ________________COLEMAK_R2_________________,
+    ________________COLEMAK_L3_________________,                   ________________COLEMAK_R3_________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
+  ),
+//#if defined(UNICODEMAP_ENABLE)
+//#ifdef UNICODE_H
+#ifdef UNICODEMAP_ENABLE
+  [_GREEK] = LAYOUT_atreus_wrapper(
+    ________________GREEK_L1___________________,                   ________________GREEK_R1___________________,
+    ________________GREEK_L2___________________,                   ________________GREEK_R2___________________,
+    ________________GREEK_L3___________________,                   ________________GREEK_R3___________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
+  ),
+  [_RUSSIAN] = LAYOUT_atreus_wrapper(
+    ________________CYRLC_L1___________________,                   ________________CYRLC_R1___________________,
+    ________________CYRLC_L2___________________,                   ________________CYRLC_R2___________________,
+    ________________CYRLC_L3___________________,                   ________________CYRLC_R3___________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________CYRLC_R4___________________
+  ),
+  [_RUNES] = LAYOUT_atreus_wrapper(
+    ________________FTHRK_L1___________________,                   ________________FTHRK_R1___________________,
+    ________________FTHRK_L2___________________,                   ________________FTHRK_R2___________________,
+    ________________FTHRK_L3___________________,                   ________________FTHRK_R3___________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
+  ),
+  [_HIRA1] = LAYOUT_atreus_wrapper(
+    ________________JIS1_L1____________________,                   ________________JIS1_R1____________________,
+    ________________JIS1_L2____________________,                   ________________JIS1_R2____________________,
+    ________________JIS1_L3____________________,                   ________________JIS1_R3____________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
   ),
-  [_EDITOR] = LAYOUT( /* ED_A, ED_ESC */
-    KC_GRV,  _______, KC_END,  _______, KC_TAB,                    _______, _______, KC_INS,  _______, KC_PGUP,
-    KC_HOME, _______, KC_DELT, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_ENT, 
-    _______, _______, _______, _______, _______,                   KC_PGDN, _______, _______, _______, KC_BSLS,
-    _______, _______, _______, _______, _______, _______, KC_ENT,  _______, _______, _______, _______, _______
+  [_HIRA2] = LAYOUT_atreus_wrapper(
+    ________________JIS2_L1____________________,                   ________________JIS2_R1____________________,
+    ________________JIS2_L2____________________,                   ________________JIS2_R2____________________,
+    ________________JIS2_L3____________________,                   ________________JIS2_R3____________________,
+    ________________BOTTOM_L4__________________, ____THUMBS_R4___, ________________BOTTOM_R4__________________
   ),
-  [_NUMBER] = LAYOUT( /* NM_SCLN, NM_BSPC */
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,  
-    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                      _______, KC_4,    KC_5,    KC_6,    _______,
-    _______, _______, _______, _______, _______,                   _______, KC_1,    KC_2,    KC_3,    KC_BSLS,
-    _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_0,    KC_0,    KC_DOT,  _______, _______
+#endif
+  [_EDITOR] = LAYOUT_atreus_wrapper( /* ED_A, ED_ESC */
+    ________________EDITOR_L1__________________,                   ________________EDITOR_R1__________________,
+    ________________EDITOR_L2__________________,                   ________________EDITOR_R2__________________,
+    ________________EDITOR_L3__________________,                   ________________EDITOR_R3__________________,
+    _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______
+  ),
+  [_NUMBER] = LAYOUT_atreus_wrapper( /* NM_SCLN, NM_BSPC */
+    ________________NUMROW_L1__________________,                   ________________NUMROW_R1__________________,
+    ________________NUMROW_R1__________________,                   ________________NUMPAD_R2__________________,
+    ___________________________________________,                   ________________NUMPAD_R3__________________,
+    ___________________________________________, ________________, ________________NUMPAD_R4__________________
   ),
-  [_SYMBOL] = LAYOUT( /* SM_SPC */
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
-    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,                   _______, _______, _______, _______, KC_COLN, 
+  [_SYMBOL] = LAYOUT_atreus_wrapper( /* SM_SPC */
+    ________________SYMROW_L1__________________,                   ________________SYMROW_R1__________________,
+    ________________SYMROW_R1__________________,                   ________________SYMROW_R1__________________,
     _______, _______, _______, _______, _______,                   _______, _______, _______, _______, KC_BSLS, 
-    _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, _______, _______, _______
+    KC_LBRC, _______, _______, _______, _______, ________________, _______, _______, _______, _______, KC_RBRC
   ),
-  [_F_KEYS] = LAYOUT( /* FK_DOT */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  
-    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                    _______, _______, _______, _______, KC_F11,
-    KC_F11,  KC_F12,  _______, _______, _______,                   _______, _______, _______, _______, KC_F12,
+  [_F_KEYS] = LAYOUT_atreus_wrapper( /* FK_DOT */
+    ________________FKEYROW_L1_________________,                   ________________FKEYROW_R1_________________,
+    ________________FKEYROW_R1_________________,                   ________________FKEYROW_L1_________________,
+    KC_F11,  KC_F12,  _______, _______, _______,                   KC_F11,  KC_F12,  _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
-  [_SECRET] = LAYOUT( /* shhhh... */
-    RESET,   _______, _______, RUSTY,   FUEL,                      KC_F13,  _______, _______, _______, _______,
+  [_DEBUG] = LAYOUT_atreus_wrapper( /* shhhh... */
+    ________________DEBUG_L1___________________,                   ________________DEBUG_R1___________________,
+    ________________DEBUG_L2___________________,                   ________________DEBUG_R2___________________,
+    ________________DEBUG_L3___________________,                   ________________DEBUG_R3___________________,
+    _______, _______, _______, _______, _______, ________________, _______, _______, _______, _______, _______
+  ),
+  [_SECRET] = LAYOUT_atreus_wrapper( /* shhhh... */
+/*
+    _______, _______, _______, RUSTY,   FUEL,                      _______, _______, _______, _______, _______,
     AR1ST,   SYSNOC,  _______, _______, _______,                   _______, _______, _______, OS_LAB,  _______,
-    CDLOCAL, _______, C0RE,    VAXIS,   _______,                   _______, MUNKY,   _______, _______, _______,
+    CDLOCAL, _______, C0RE,    VAXIS,   _______,                   _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+*/
+    ________________SECRET_L1__________________,                   ________________SECRET_R1__________________,
+    ________________SECRET_L2__________________,                   ________________SECRET_R2__________________,
+    ________________SECRET_L3__________________,                   ________________SECRET_R3__________________,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+
   ),
-  [_FINAL] = LAYOUT( /* . */
-    _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, 
+  [_FINAL] = LAYOUT_atreus( /* . */
+    _______, _______, _______, _______, TESTING,                   _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
-
-// custom tap/hold keys
-uint16_t key_timer;
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-    switch(keycode) {
-        case RG_QUOT:   
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                layer_on(_NUMBER);
-                register_mods(MOD_BIT(KC_RGUI));
-            } else {
-                unregister_mods(MOD_BIT(KC_RGUI));
-                layer_off(_NUMBER);
-                if (timer_elapsed(key_timer) < TAPPING_TERM) {
-                    tap_code(KC_QUOT);
-                }
-            }
-            return false; break;
-    }
-    return true;
-};
diff --git a/keyboards/atreus/keymaps/ridingqwerty/rules.mk b/keyboards/atreus/keymaps/ridingqwerty/rules.mk
index 95b257f75..5c89d5481 100644
--- a/keyboards/atreus/keymaps/ridingqwerty/rules.mk
+++ b/keyboards/atreus/keymaps/ridingqwerty/rules.mk
@@ -5,13 +5,14 @@ MCU = STM32F303
 #
 BACKLIGHT_ENABLE = no
 BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration
-#MOUSEKEY_ENABLE = yes # Mouse keys
+MOUSEKEY_ENABLE = no # Mouse keys
 EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes  # Console for debug
-COMMAND_ENABLE = yes    # Commands for debug and configuration
-#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+CONSOLE_ENABLE = no  # Console for debug
+COMMAND_ENABLE = no    # Commands for debug and configuration
 NKRO_ENABLE = yes     # USB Nkey Rollover
-AUDIO_ENABLE = yes
+AUDIO_ENABLE = yes   # Doot
 RGBLIGHT_ENABLE = no
-# SERIAL_LINK_ENABLE = yes
-#TAP_DANCE_ENABLE = yes
+TAP_DANCE_ENABLE = no
+UNICODE_ENABLE = no
+UNICODEMAP_ENABLE = yes
+