ridingqwerty: userspace update (#8076)

* Userspace overhaul

* Remove testing directory

* Minorca keymap tweaks

18 files changed, 2388 insertions, 101 deletions

diff --git a/keyboards/atreus/keymaps/ridingqwerty/keymap.c b/keyboards/atreus/keymaps/ridingqwerty/keymap.c
index 336df49730..1eeb17fd17 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 95b257f758..5c89d5481d 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
+
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/config.h b/keyboards/handwired/minorca/keymaps/ridingqwerty/config.h
new file mode 100644
index 0000000000..c54aac3189
--- /dev/null
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/config.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS { B3, B7, D0, D1, D2, D3, C6, C7, B5, B6, F7, F6 }
+
+#undef MATRIX_ROW_PINS
+#define MATRIX_ROW_PINS { F0, F1, F4, F5 }
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
new file mode 100644
index 0000000000..ae490914d5
--- /dev/null
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/keymap.c
@@ -0,0 +1,123 @@
+/* Copyright 2019 George Koenig
+ *
+ * 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 "ridingqwerty.h"
+
+/*                                                         MinOrca
+        ┏━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┯━━━━━━━━┓
+        ┃   ⎋    │   Q    │   W    │   E    │   R    │   T    │   Y    │   U    │   I    │   O    │   P    │  ❦ ⌫   ┃
+        ┠────────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴─┬──────┴────────┨
+        ┃   ¶ ⇥    │   A    │   S    │   D    │   F    │   G    │   H    │   J    │   K    │   L    │     🔢 ↵      ┃
+        ┠──────────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬────┴───┬───────────┨
+        ┃    " ⇧       │   Z    │   X    │   C    │   V    │   B    │   N    │   M    │   ,    │  𝔽 .   │    ⇧ /    ┃
+        ┠──────────┬───┴──────┬─┴────────┼────────┴────────┴──┬─────┴────────┴─────┬──┴───────┬┴───────┬┴───────────┨
+        ┃   { ⎈    │   [ ⌘    │  (  ⌥    │       🔢 ␣         │       ★ ␣          │   ) ⌥    │  ] ⌘   │    } ⎈     ┃
+        ┗━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━━━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━┷━━━━━━━━━━━━┛
+*/
+
+#define LAYOUT_minorca( \
+    KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10, KA11, \
+    KB00,  KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09,    KB11,   \
+    KC00,    KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10,   KC11,  \
+    KD00,  KD02,  KD03,          KD04, KD07,           KD09,  KD10,  KD11   \
+) { \
+  {  KA00,  KA01,   KA02,  KA03,  KA04,  KA05,   KA06,   KA07,  KA08,   KA09,  KA10,   KA11  }, \
+  {  KB00,  KB01,   KB02,  KB03,  KB04,  KB05,   KB06,   KB07,  KB08,   KB09,  KC_NO,  KB11  }, \
+  {  KC00,  KC_NO,  KC02,  KC03,  KC04,  KC05,   KC06,   KC07,  KC08,   KC09,  KC10,   KC11  }, \
+  {  KD00,  KC_NO,  KD02,  KD03,  KD04,  KC_NO,  KC_NO,  KD07,  KC_NO,  KD09,  KD10,   KD11  } \
+}
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = {
+        {KC_GESC,  KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     SC(BSPC) },
+        {ED(TAB),  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     XXXXXXX,  NM(SCLN) },
+        {LS(QUOT), XXXXXXX,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  FK(DOT),  RS(SLSH) },
+        {LC(ESC),  XXXXXXX,  LG(LBRC), LA(RBRC), NM(BSPC), XXXXXXX,  XXXXXXX,  SM(SPC),  XXXXXXX,  RA(MINS), RG(EQL),  RC(ENT)  }
+/*
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+*/
+
+
+    },
+#ifdef UNICODE_H
+    [_RUNE] = {
+        {KC_ESC,  X(INGWZ), X(WUNJO),  X(EHWAZ), X(RAIDO), X(TIWAZ), X(IWAZ),  X(UR),    X(ISAZ),  X(ETHEL), X(PERTH), SC(BSPC) },
+        {ED(TAB), X(ANSUZ), X(SOWIL),  X(DAGAZ), X(FE),    X(GEBO),  X(HAGLZ), X(JERAN), X(KAUNA), X(LAUKZ), XXXXXXX,  NM(SCLN) },
+        {MT_QUOT, XXXXXXX,  X(ALGIZ),  X(THURS), X(KAUNA), X(WUNJO), X(BEORC), X(NAUDZ), X(MANNZ), KC_COMM,  FK(DOT),  RS(SLSH) },
+        {LC(ESC), XXXXXXX,  LG(LBRC),  LA(RBRC), NM(BSPC), XXXXXXX,  XXXXXXX,  SM(SPC),  XXXXXXX,  RA(MINS), RG(EQL),  RC(ENT)  }
+    },
+#endif
+    [_EDITOR] = {
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        {KC_GRV,  _______, _______, KC_END,  _______, KC_F5,   _______, _______, KC_INS,  _______, KC_PGUP, KC_DELT },
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+        {_______, KC_HOME, _______, KC_DELT, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, KC_SCLN },
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+        {_______, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PGDN, _______, KC_SCLN, KC_QUOT, KC_BSLS },
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+        {_______, XXXXXXX, _______, _______, KC_EQL,  XXXXXXX, XXXXXXX, KC_MINS, XXXXXXX, KC_COLN, KC_DQUO, KC_PIPE }
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+    },
+    [_NUMBER] = {
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        {KC_0,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC },
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+        {_______, KC_4,    KC_5,    KC_6,    KC_PAST, _______, KC_PPLS, KC_4,    KC_5,    KC_6,    XXXXXXX, _______ },
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+        {_______, KC_7,    KC_8,    KC_9,    KC_SLSH, _______, _______, KC_MINS, KC_1,    KC_2,    KC_3,    _______ },
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+        {_______, XXXXXXX, KC_0,    _______, _______, XXXXXXX, XXXXXXX, KC_0,    XXXXXXX, KC_DOT,  _______, _______ }
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+    },
+    [_SYMBOL] = {
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        {KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT },
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+        {_______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, XXXXXXX, _______ },
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+        {_______, XXXXXXX, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_BSLS },
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+        {_______, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_COLN, KC_DQUO, KC_PIPE }
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+    },
+    [_SECRET] = {
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        {RESET,   _______, _______, _______, SECRET0, SECRET1, _______, _______, _______, _______, VERSION, _______ },
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+        {_______, SECRET4, SECRET8, DEBUG,   _______, _______, _______, _______, _______, SECRET7, XXXXXXX, MAKE    },
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+        {_______, XXXXXXX, SECRET6, _______, SECRET2, SECRET5, _______, _______, SECRET3, _______, _______, _______ },
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+        {_______, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, _______, _______ }
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+    },
+    [_F_KEYS] = {
+      //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+        {KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11  },
+      //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┴────────┤
+        {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______ },
+      //├────────┴────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┬────────┤
+        {_______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
+      //├─────────────────┼────────┼────────┼────────┴────────┼────────┴────────┼────────┴────────┼────────┼────────┤
+        {_______, XXXXXXX, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, _______, _______, _______ }
+      //└─────────────────┴────────┴────────┴─────────────────┴─────────────────┴─────────────────┴────────┴────────┘
+    },
+};
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/readme.md b/keyboards/handwired/minorca/keymaps/ridingqwerty/readme.md
new file mode 100644
index 0000000000..4f0b3564b9
--- /dev/null
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/readme.md
@@ -0,0 +1 @@
+# Handwire of Minorca using teensy 2.0
diff --git a/keyboards/handwired/minorca/keymaps/ridingqwerty/rules.mk b/keyboards/handwired/minorca/keymaps/ridingqwerty/rules.mk
new file mode 100644
index 0000000000..ac798576a5
--- /dev/null
+++ b/keyboards/handwired/minorca/keymaps/ridingqwerty/rules.mk
@@ -0,0 +1,10 @@
+MCU = atmega32u4
+BOOTLOADER = halfkay
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+UNICODE_ENABLE = no         # Unicode
+UNICODEMAP_ENABLE = yes     # Unicode Map
diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h
index 2461b8b8dd..6501efe62f 100644
--- a/users/ridingqwerty/config.h
+++ b/users/ridingqwerty/config.h
@@ -1,3 +1,11 @@
 #pragma once
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COL 0
+
 #define TAPPING_TERM 175
 #define MACRO_TIMER 5
+#define TAPPING_FORCE_HOLD_PER_KEY
+// testing
+#define TAPPING_TERM_PER_KEY
+//#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc...
diff --git a/users/ridingqwerty/dict.h b/users/ridingqwerty/dict.h
new file mode 100644
index 0000000000..43d4d50b50
--- /dev/null
+++ b/users/ridingqwerty/dict.h
@@ -0,0 +1,1012 @@
+#pragma once
+
+// lower this number if a smaller dictionary is desired
+#define NUMBER_OF_WORDS 1000
+
+#define MAX_WORDS 1000
+#if (NUMBER_OF_WORDS > MAX_WORDS) 
+#    error *** NUMBER_OF_WORDS must be between 0 and 1000 inclusive
+#endif
+
+const char *dict[MAX_WORDS] = { \
+"the", \
+"of", \
+"to", \
+"and", \
+"a", \
+"in", \
+"is", \
+"it", \
+"you", \
+"that", \
+"he", \
+"was", \
+"for", \
+"on", \
+"are", \
+"with", \
+"as", \
+"I", \
+"his", \
+"they", \
+"be", \
+"at", \
+"one", \
+"have", \
+"this", \
+"from", \
+"or", \
+"had", \
+"by", \
+"not", \
+"word", \
+"but", \
+"what", \
+"some", \
+"we", \
+"can", \
+"out", \
+"other", \
+"were", \
+"all", \
+"there", \
+"when", \
+"up", \
+"use", \
+"your", \
+"how", \
+"said", \
+"an", \
+"each", \
+"she", \
+"which", \
+"do", \
+"their", \
+"time", \
+"if", \
+"will", \
+"way", \
+"about", \
+"many", \
+"then", \
+"them", \
+"write", \
+"would", \
+"like", \
+"so", \
+"these", \
+"her", \
+"long", \
+"make", \
+"thing", \
+"see", \
+"him", \
+"two", \
+"has", \
+"look", \
+"more", \
+"day", \
+"could", \
+"go", \
+"come", \
+"did", \
+"number", \
+"sound", \
+"no", \
+"most", \
+"people", \
+"my", \
+"over", \
+"know", \
+"water", \
+"than", \
+"call", \
+"first", \
+"who", \
+"may", \
+"down", \
+"side", \
+"been", \
+"now", \
+"find", \
+"any", \
+"new", \
+"work", \
+"part", \
+"take", \
+"get", \
+"place", \
+"made", \
+"live", \
+"where", \
+"after", \
+"back", \
+"little", \
+"only", \
+"round", \
+"man", \
+"year", \
+"came", \
+"show", \
+"every", \
+"good", \
+"me", \
+"give", \
+"our", \
+"under", \
+"name", \
+"very", \
+"through", \
+"just", \
+"form", \
+"sentence", \
+"great", \
+"think", \
+"say", \
+"help", \
+"low", \
+"line", \
+"differ", \
+"turn", \
+"cause", \
+"much", \
+"mean", \
+"before", \
+"move", \
+"right", \
+"boy", \
+"old", \
+"too", \
+"same", \
+"tell", \
+"does", \
+"set", \
+"three", \
+"want", \
+"air", \
+"well", \
+"also", \
+"play", \
+"small", \
+"end", \
+"put", \
+"home", \
+"read", \
+"hand", \
+"port", \
+"large", \
+"spell", \
+"add", \
+"even", \
+"land", \
+"here", \
+"must", \
+"big", \
+"high", \
+"such", \
+"follow", \
+"act", \
+"why", \
+"ask", \
+"men", \
+"change", \
+"went", \
+"light", \
+"kind", \
+"off", \
+"need", \
+"house", \
+"picture", \
+"try", \
+"us", \
+"again", \
+"animal", \
+"point", \
+"mother", \
+"world", \
+"near", \
+"build", \
+"self", \
+"earth", \
+"father", \
+"head", \
+"stand", \
+"own", \
+"page", \
+"should", \
+"country", \
+"found", \
+"answer", \
+"school", \
+"grow", \
+"study", \
+"still", \
+"learn", \
+"plant", \
+"cover", \
+"food", \
+"sun", \
+"four", \
+"between", \
+"state", \
+"keep", \
+"eye", \
+"never", \
+"last", \
+"let", \
+"thought", \
+"city", \
+"tree", \
+"cross", \
+"farm", \
+"hard", \
+"start", \
+"might", \
+"story", \
+"saw", \
+"far", \
+"sea", \
+"draw", \
+"left", \
+"late", \
+"run", \
+"don't", \
+"while", \
+"press", \
+"close", \
+"night", \
+"real", \
+"life", \
+"few", \
+"north", \
+"open", \
+"seem", \
+"together", \
+"next", \
+"white", \
+"children", \
+"begin", \
+"got", \
+"walk", \
+"example", \
+"ease", \
+"paper", \
+"group", \
+"always", \
+"music", \
+"those", \
+"both", \
+"mark", \
+"often", \
+"letter", \
+"until", \
+"mile", \
+"river", \
+"car", \
+"feet", \