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

4 files changed, 214 insertions, 0 deletions

diff --git a/keyboards/crkbd/keymaps/davidrambo/config.h b/keyboards/crkbd/keymaps/davidrambo/config.h
new file mode 100644
index 0000000000..25f5f3b22f
--- /dev/null
+++ b/keyboards/crkbd/keymaps/davidrambo/config.h
@@ -0,0 +1,84 @@
+/*
+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
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define RGBLIGHT_SPLIT
+
+//#define SSD1306OLED
+
+#define TAPPING_TERM 200
+#define PERMISSIVE_HOLD
+
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_STARTUP_HUE 231
+    #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+    #define RGB_MATRIX_TYPING_MEATMAP_DECREASE_DELAY_MS 50
+    // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+    // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    // #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+    // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 100 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+    #define RGB_MATRIX_HUE_STEP 8
+    #define RGB_MATRIX_SAT_STEP 8
+    #define RGB_MATRIX_VAL_STEP 8
+    #define RGB_MATRIX_SPD_STEP 10
+
+    /* Disable the animations you don't want/need.  You will need to disable a good number of these    *
+     * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
+     #define DISABLE_RGB_MATRIX_ALPHAS_MODS
+     #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+     #define DISABLE_RGB_MATRIX_BREATHING
+     #define DISABLE_RGB_MATRIX_CYCLE_ALL
+     #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+     #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
+     #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
+     #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+     #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+     #define DISABLE_RGB_MATRIX_DUAL_BEACON
+     #define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+     #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+     #define DISABLE_RGB_MATRIX_RAINDROPS
+     #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    // #   define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+     #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+     #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+     #define DISABLE_RGB_MATRIX_SPLASH
+     #define DISABLE_RGB_MATRIX_MULTISPLASH
+     #define DISABLE_RGB_MATRIX_SOLID_SPLASH
+     #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/crkbd/keymaps/davidrambo/keymap.c b/keyboards/crkbd/keymaps/davidrambo/keymap.c
new file mode 100644
index 0000000000..6e97795220
--- /dev/null
+++ b/keyboards/crkbd/keymaps/davidrambo/keymap.c
@@ -0,0 +1,126 @@
+/* Copyright 2021 David Rambo
+ *
+ * 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
+
+//extern uint8_t is_master;
+
+
+enum custom_layers {
+    _COLEMAK,
+    _SYMBOL,
+    _NAVIGATION,
+    _FKEYS,
+};
+
+//keycode shorthands
+#define SYM  MO(1)
+#define NAV  LT(2, KC_ESC)
+#define FKEY MO(3)
+
+//aliases for clarity in layering
+#define SftEnt SFT_T(KC_ENT)   // Shift when held, Enter when tapped
+#define BSCTL  LCTL_T(KC_BSPC) // Ctrl when held, Backspace when tapped
+#define CTAB   LCTL(KC_TAB)
+#define ATAB   LALT(KC_TAB)
+
+//aliases for Navigation layer
+#define CBSPC LCTL(KC_BSPC)  // delete whole word
+#define C_CL   LCTL(KC_LEFT) // move cursor one word back
+#define C_CR   LCTL(KC_RGHT) // move cursor one word forward
+
+//internet browser tab shortcuts and window swapping
+#define CTLPGDN LCTL(KC_PGDN)
+#define CTLPGUP LCTL(KC_PGUP)
+
+#define G_GRV   LGUI(KC_GRV)
+#define SftEnt  SFT_T(KC_ENT)
+
+enum custom_keycodes {
+  PLACEHOLDER = SAFE_RANGE,
+  SET_RGB,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_COLEMAK] = LAYOUT(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                        KC_J,    KC_L,    KC_U,    KC_Y, KC_SCLN, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      NAV   ,    KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                        KC_H,    KC_N,    KC_E,    KC_I, KC_O   , KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                        KC_K,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  SftEnt,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LALT, KC_LGUI,   BSCTL,   KC_SPC,   SYM ,   FKEY
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [_SYMBOL] = LAYOUT(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      KC_LBRC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_RBRC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_BSLS, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_HOME, KC_END,  _______, _______, _______,                       KC_GRV, KC_MINS, KC_PGUP, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,    _______, _______, KC_PGDN
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [_NAVIGATION] = LAYOUT(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      _______, _______, _______, _______, _______, _______,                      CTAB ,   C_CL  ,   KC_UP,   C_CR  ,  KC_DEL, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,                     CTLPGUP, KC_LEFT , KC_DOWN, KC_RGHT, CTLPGDN, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        RESET, _______, _______, _______, _______, _______,                      ATAB   , CBSPC , KC_HOME, KC_END,    G_GRV , _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,    _______, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [_FKEYS] = LAYOUT(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                        KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, RGB_SAI, RGB_HUI, RGB_VAI, RGB_TOG, SET_RGB,                     _______, _______, _______, _______, _______,  _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, RGB_MOD, RGB_M_P, KC_VOLD, KC_VOLU, KC_MPLY,                     _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,     _______, _______, _______
+                                      //`--------------------------'  `--------------------------'
+  )
+};
+
+void keyboard_post_init_user(void) {
+//    rgb_matrix_sethsv(191, 43, 81);
+    rgblight_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+        
+        case SET_RGB:
+            if (record->event.pressed) {
+                rgb_matrix_sethsv_noeeprom(18, 86, 95);
+            }
+            return false;
+            break;
+
+    }
+    return true;
+}
diff --git a/keyboards/crkbd/keymaps/davidrambo/readme.md b/keyboards/crkbd/keymaps/davidrambo/readme.md
new file mode 100644
index 0000000000..e8ce162b64
--- /dev/null
+++ b/keyboards/crkbd/keymaps/davidrambo/readme.md
@@ -0,0 +1 @@
+This is my Corne keymap, which uses Colemak and shortcuts for Linux and Windows.
diff --git a/keyboards/crkbd/keymaps/davidrambo/rules.mk b/keyboards/crkbd/keymaps/davidrambo/rules.mk
new file mode 100644
index 0000000000..782b689f42
--- /dev/null
+++ b/keyboards/crkbd/keymaps/davidrambo/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+BOOTLOADER = atmel-dfu