Merge remote-tracking branch 'origin/master' into develop

4 files changed, 472 insertions, 0 deletions

diff --git a/keyboards/crkbd/keymaps/rarick/config.h b/keyboards/crkbd/keymaps/rarick/config.h
new file mode 100644
index 0000000000..dca1af4caf
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rarick/config.h
@@ -0,0 +1,48 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
+
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
+
+#ifdef RGBLIGHT_ENABLE
+    #undef RGBLED_NUM
+    #define RGBLIGHT_ANIMATIONS
+    #define RGBLED_NUM 27
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+#endif
+
+// Sets path to OLED font
+#define OLED_FONT_H "keyboards/crkbd/keymaps/rarick/glcdfont.c"
+
+// Limits maximum brightness of LEDs to 150 out of 255
+// Higher may cause the controller to crash.
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/crkbd/keymaps/rarick/glcdfont.c b/keyboards/crkbd/keymaps/rarick/glcdfont.c
new file mode 100644
index 0000000000..ae81ba5737
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rarick/glcdfont.c
@@ -0,0 +1,233 @@
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#include "progmem.h"
+
+// Standard ASCII 5x7 font
+// Cowboy Bebop
+const unsigned char font[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, 
+  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, 
+  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, 
+  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, 
+  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, 
+  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, 
+  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, 
+  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, 
+  0x00, 0x18, 0x24, 0x18, 0x00, 0x00, 
+  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, 
+  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, 
+  0x26, 0x29, 0x79, 0x29, 0x26, 0x00, 
+  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, 
+  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, 
+  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, 
+  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, 
+  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, 
+  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, 
+  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, 
+  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, 
+  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, 
+  0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 
+  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, 
+  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, 
+  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, 
+  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, 
+  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, 
+  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, 
+  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, 
+  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, 
+  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 
+  0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 
+  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, 
+  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, 
+  0x23, 0x13, 0x08, 0x64, 0x62, 0x00, 
+  0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 
+  0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 
+  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 
+  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, 
+  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, 
+  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 
+  0x00, 0x80, 0x70, 0x30, 0x00, 0x00, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 
+  0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+  0x20, 0x10, 0x08, 0x04, 0x02, 0x00, 
+  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 
+  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, 
+  0x72, 0x49, 0x49, 0x49, 0x46, 0x00, 
+  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, 
+  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, 
+  0x27, 0x45, 0x45, 0x45, 0x39, 0x00, 
+  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, 
+  0x41, 0x21, 0x11, 0x09, 0x07, 0x00, 
+  0x36, 0x49, 0x49, 0x49, 0x36, 0x00, 
+  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 
+  0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 
+  0x00, 0x40, 0x34, 0x00, 0x00, 0x00, 
+  0x00, 0x08, 0x14, 0x22, 0x41, 0x00, 
+  0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 
+  0x00, 0x41, 0x22, 0x14, 0x08, 0x00, 
+  0x02, 0x01, 0x59, 0x09, 0x06, 0x00, 
+  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, 
+  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, 
+  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, 
+  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, 
+  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, 
+  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, 
+  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, 
+  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, 
+  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 
+  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, 
+  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, 
+  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, 
+  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, 
+  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, 
+  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, 
+  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, 
+  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, 
+  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, 
+  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, 
+  0x26, 0x49, 0x49, 0x49, 0x32, 0x00, 
+  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, 
+  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, 
+  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, 
+  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, 
+  0x63, 0x14, 0x08, 0x14, 0x63, 0x00, 
+  0x03, 0x04, 0x78, 0x04, 0x03, 0x00, 
+  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 
+  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, 
+  0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 
+  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, 
+  0x04, 0x02, 0x01, 0x02, 0x04, 0x00, 
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 
+  0x00, 0x03, 0x07, 0x08, 0x00, 0x00, 
+  0x20, 0x54, 0x54, 0x78, 0x40, 0x00, 
+  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, 
+  0x38, 0x44, 0x44, 0x44, 0x28, 0x00, 
+  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, 
+  0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 
+  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, 
+  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, 
+  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 
+  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, 
+  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, 
+  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 
+  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, 
+  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, 
+  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, 
+  0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 
+  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, 
+  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, 
+  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, 
+  0x48, 0x54, 0x54, 0x54, 0x24, 0x00, 
+  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, 
+  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, 
+  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, 
+  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, 
+  0x44, 0x28, 0x10, 0x28, 0x44, 0x00, 
+  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, 
+  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 
+  0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 
+  0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 
+  0x00, 0x41, 0x36, 0x08, 0x00, 0x00, 
+  0x02, 0x01, 0x02, 0x04, 0x02, 0x00, 
+  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 
+  0x06, 0x06, 0x06, 0x7F, 0xFF, 0xFF, 
+  0xFF, 0x07, 0x01, 0x01, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC, 
+  0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00, 
+  0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E, 
+  0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00, 
+  0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B, 
+  0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00, 
+  0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE, 
+  0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0xFF, 0xFF, 
+  0xFF, 0x36, 0x3E, 0x7F, 0x3E, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x7F, 0xFF, 0x1C, 
+  0x08, 0x00, 0x00, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 
+  0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x00, 
+  0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F, 
+  0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00, 
+  0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F, 
+  0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00, 
+  0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20, 
+  0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00, 
+  0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F, 
+  0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 
+  0x30, 0x30, 0x30, 0x7F, 0x7F, 0x7F, 
+  0x7F, 0x70, 0x40, 0x40, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x40, 0x48, 
+  0x54, 0x24, 0x00, 0x78, 0x54, 0x54, 
+  0x04, 0x78, 0x54, 0x54, 0x04, 0x00, 
+  0x00, 0x0C, 0x70, 0x08, 0x04, 0x78, 
+  0x44, 0x44, 0x3C, 0x00, 0x78, 0x40, 
+  0x40, 0x3C, 0x00, 0x00, 0x40, 0x48, 
+  0x54, 0x24, 0x00, 0x78, 0x14, 0x14, 
+  0x48, 0x30, 0x28, 0x7C, 0x00, 0x78, 
+  0x44, 0x44, 0x04, 0x78, 0x54, 0x54, 
+  0x04, 0x00, 0x00, 0x78, 0x44, 0x44, 
+  0x04, 0x78, 0x44, 0x44, 0x3C, 0x00, 
+  0x7C, 0x20, 0x18, 0x78, 0x30, 0x0C, 
+  0x78, 0x54, 0x54, 0x28, 0x78, 0x44, 
+  0x44, 0x3C, 0x00, 0x0C, 0x70, 0x08, 
+  0x44, 0x00, 0x40, 0x00, 0x40, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+};
diff --git a/keyboards/crkbd/keymaps/rarick/keymap.c b/keyboards/crkbd/keymaps/rarick/keymap.c
new file mode 100644
index 0000000000..b11bac1e72
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rarick/keymap.c
@@ -0,0 +1,177 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+
+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 <stdio.h>
+
+#define KC_SFTTB LSFT_T(KC_TAB)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+     KC_SFTTB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+     KC_LCTRL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LALT,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RGUI
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, KC_PGUP,   KC_UP, KC_PGDN, XXXXXXX, XXXXXXX,                      XXXXXXX,    KC_7,    KC_8,    KC_9,    KC_0,  KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,                      KC_HOME,    KC_4,    KC_5,    KC_6, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       KC_END,    KC_1,    KC_2,    KC_3, XXXXXXX, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,    _______,   MO(3), _______
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______,   MO(3), _______,    _______, _______, _______
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                        KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,    _______, _______, _______
+                                      //`--------------------------'  `--------------------------'
+  )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+#define L_BASE 0
+#define L_LOWER 2
+#define L_RAISE 4
+#define L_ADJUST 8
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Spike"), false);
+            break;
+        case L_LOWER:
+            oled_write_ln_P(PSTR("Jet"), false);
+            break;
+        case L_RAISE:
+            oled_write_ln_P(PSTR("Faye"), false);
+            break;
+        case L_ADJUST:
+        case L_ADJUST|L_LOWER:
+        case L_ADJUST|L_RAISE:
+        case L_ADJUST|L_LOWER|L_RAISE:
+            oled_write_ln_P(PSTR("Ed"), false);
+            break;
+    }
+}
+
+char keylog_str[24] = {};
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
+void oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    set_keylog(keycode, record);
+  }
+  return true;
+}
+
+#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/crkbd/keymaps/rarick/rules.mk b/keyboards/crkbd/keymaps/rarick/rules.mk
new file mode 100644
index 0000000000..775268a1d4
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rarick/rules.mk
@@ -0,0 +1,14 @@
+# Bootloader for the elite-c
+BOOTLOADER = atmel-dfu
+
+# Enable RGB matric
+RGB_MATRIX_ENABLE = yes
+
+# Enable OLED driver
+OLED_DRIVER_ENABLE = yes
+
+# Enable media keys
+EXTRAKEY_ENABLE = yes
+
+# Disabled to save space
+MOUSEKEY_ENABLE = no