aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorDavid Rambo <davrambo@gmail.com>2018-04-24 12:03:02 -0400
committerDrashna Jaelre <drashna@live.com>2018-04-24 09:03:02 -0700
commit2286cedb70e2899049d90bf9a26ce261bb74f2f5 (patch)
tree7761921993ddb5b8c1a7ba99ab984ad349ce91eb /keyboards
parenta0a4c9102c51d9032af270920447d0d6d3bac7bc (diff)
downloadfirmware-2286cedb70e2899049d90bf9a26ce261bb74f2f5.tar.gz
firmware-2286cedb70e2899049d90bf9a26ce261bb74f2f5.tar.bz2
firmware-2286cedb70e2899049d90bf9a26ce261bb74f2f5.zip
Update personal colemak Iris layout and deleted redundant folders (#2794)
* DRambo Planck keymap in Colemak * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * Added Iris Colemak layout for Mac, Windows, and Gaming. * changed comment text * DRambo Planck keymap in Colemak * Satan GH60 keymap for Bri QWERTY layout with Navigation layer toggled with "Caps Lock" key. * xd75 keymap in Colemak for Mac and Win * Added Iris Colemak layout for Mac, Windows, and Gaming. * changed comment text * Added Iris keymap from DavidRambo * Added planck keymap from DavidRambo * Added xd75 keymap from DavidRambo * Added readme * Deleted redundant repos in Iris, Planck, and XD75 keymaps. * Tweaked XD75 keymap * DRambo Planck keymap in Colemak * Tweaked XD75 keymap * Merge branch 'master' of https://github.com/DavidRambo/qmk_firmware Removed redundant repos with "Rambo" title. * changed iris nav layers * changed nav layers for xd75 * Updated Iris, tweaked nav on xd75
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/iris/keymaps/davidrambo/keymap.c30
-rw-r--r--keyboards/iris/keymaps/dnrambo/config.h45
-rw-r--r--keyboards/iris/keymaps/dnrambo/keymap.c158
-rw-r--r--keyboards/iris/keymaps/dnrambo/readme.md3
-rw-r--r--keyboards/iris/keymaps/dnrambo/rules.mk7
-rw-r--r--keyboards/planck/keymaps/rambo/config.h9
-rw-r--r--keyboards/planck/keymaps/rambo/keymap.c98
-rw-r--r--keyboards/planck/keymaps/rambo/rules.mk6
-rw-r--r--keyboards/xd75/keymaps/davidrambo/keymap.c14
-rw-r--r--keyboards/xd75/keymaps/rambo/config.h26
-rw-r--r--keyboards/xd75/keymaps/rambo/keymap.c150
-rw-r--r--keyboards/xd75/keymaps/rambo/readme.md4
-rw-r--r--keyboards/xd75/keymaps/rambo/rules.mk2
13 files changed, 22 insertions, 530 deletions
diff --git a/keyboards/iris/keymaps/davidrambo/keymap.c b/keyboards/iris/keymaps/davidrambo/keymap.c
index 31ec3eba1..40f0d0145 100644
--- a/keyboards/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/iris/keymaps/davidrambo/keymap.c
@@ -5,12 +5,12 @@
extern keymap_config_t keymap_config;
//keycode shorthands
-#define KC____ KC_TRNS
+#define KC____ KC_TRNS // three underscores "___" for transparent
#define KC_SYM MO(3)
#define KC_MAC TO(0)
#define KC_PC TO(1)
#define KC_GM TO(2)
-#define KC_NAV LT(4, KC_TAB)
+#define KC_NAVMAC LT(4, KC_TAB)
#define KC_NAVPC LT(5, KC_TAB)
//text editor shortcuts for NAV and NAVPC
@@ -18,8 +18,8 @@ extern keymap_config_t keymap_config;
#define KC_AR LALT(KC_RGHT)
#define KC_CL LCTL(KC_LEFT)
#define KC_CR LCTL(KC_RGHT)
-#define KC_A_BS LALT(KC_BSPC)
-#define KC_C_BS LALT(KC_BSPC)
+#define KC_ABSPC LALT(KC_BSPC)
+#define KC_CBSPC LCTL(KC_BSPC)
//internet browser tab shortcuts and window swapping for Mac and Windows
#define KC_GSL LGUI(S(KC_LEFT))
@@ -38,7 +38,7 @@ extern keymap_config_t keymap_config;
#define _PC 1
#define _GAME 2
#define _SYMBOL 3
-#define _NAV 4
+#define _NAVMAC 4
#define _NAVPC 5
enum {
@@ -56,13 +56,13 @@ enum {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_COLEMAK] = KC_KEYMAP(
+ [_COLEMAK] = LAYOUT_kc(
//,----+----+----+----+----+----. ,----+----+----+----+----+----.
ESC , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,MINS,
//|----+----+----+----+----+----| |----+----+----+----+----+----|
GRV , Q , W , F , P , G , J , L , U , Y ,SCLN,BSPC,
//|----+----+----+----+----+----| |----+----+----+----+----+----|
- NAV , A , R , S , T , D , H , N , E , I , O ,QUOT,
+ NAVMAC, A , R , S , T , D , H , N , E , I , O ,QUOT,
//|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
SFLK, Z , X , C , V , B , PC , ENT , K , M ,COMM, DOT,SLSH,RSFT,
//`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// `----+----+----' `----+----+----'
),
- [_PC] = KC_KEYMAP(
+ [_PC] = LAYOUT_kc(
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LGUI , LCTL , CTBS , ___ , ___ , ___
),
- [_GAME] = KC_KEYMAP(
+ [_GAME] = LAYOUT_kc(
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
___ , T , Q , W , E , R , ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LALT , LALT , SPC, BSPC, MAC, ___
),
- [_SYMBOL] = KC_KEYMAP(
+ [_SYMBOL] = LAYOUT_kc(
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -104,10 +104,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___ , HOME, END , VOLD, VOLU, MPLY,___, ___,___, MINS, ___ , ___ , ___ , ___ ,
- ___ , ___ , A_BS, ___, ___ , ___
+ ___ , ___ , ___, ___, ___ , ___
),
- [_NAV] = KC_KEYMAP(
+ [_NAVMAC] = LAYOUT_kc(
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -115,12 +115,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___ , ___ , ___ , ___ , ___ , ___ , GSL , LEFT, DOWN, RGHT, GSR , ___ ,
- ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,G_TAB, ___ , ___ , ___ , ___ , ___ ,
+ ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,G_TAB,ABSPC, ___ , ___ , ___ , ___ ,
___ , ___ , ___ , ___ , ___ , ___
),
- [_NAVPC] = KC_KEYMAP(
+ [_NAVPC] = LAYOUT_kc(
___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
___ , ___ , ___ , ___ , ___ , ___ , CPGU, LEFT, DOWN, RGHT, CPGD, ___ ,
- ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,A_TAB, ___ , ___ , ___ , ___ , ___ ,
+ ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,A_TAB,CBSPC, ___ , ___ , ___ , ___ ,
___ , ___ , ___ , ___ , ___ , ___
),
diff --git a/keyboards/iris/keymaps/dnrambo/config.h b/keyboards/iris/keymaps/dnrambo/config.h
deleted file mode 100644
index 01e078e32..000000000
--- a/keyboards/iris/keymaps/dnrambo/config.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright 2017 Danny Nguyen <danny@keeb.io>
-
-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/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "config_common.h"
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-#define PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-/*
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-*/
-#define TAPPING_TERM 200
-#include "../../config.h"
-
-#endif
diff --git a/keyboards/iris/keymaps/dnrambo/keymap.c b/keyboards/iris/keymaps/dnrambo/keymap.c
deleted file mode 100644
index 31ec3eba1..000000000
--- a/keyboards/iris/keymaps/dnrambo/keymap.c
+++ /dev/null
@@ -1,158 +0,0 @@
-#include "iris.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-
-extern keymap_config_t keymap_config;
-
-//keycode shorthands
-#define KC____ KC_TRNS
-#define KC_SYM MO(3)
-#define KC_MAC TO(0)
-#define KC_PC TO(1)
-#define KC_GM TO(2)
-#define KC_NAV LT(4, KC_TAB)
-#define KC_NAVPC LT(5, KC_TAB)
-
-//text editor shortcuts for NAV and NAVPC
-#define KC_AL LALT(KC_LEFT)
-#define KC_AR LALT(KC_RGHT)
-#define KC_CL LCTL(KC_LEFT)
-#define KC_CR LCTL(KC_RGHT)
-#define KC_A_BS LALT(KC_BSPC)
-#define KC_C_BS LALT(KC_BSPC)
-
-//internet browser tab shortcuts and window swapping for Mac and Windows
-#define KC_GSL LGUI(S(KC_LEFT))
-#define KC_GSR LGUI(S(KC_RGHT))
-#define KC_CPGD LCTL(KC_PGDN)
-#define KC_CPGU LCTL(KC_PGUP)
-
-#define KC_CMBS GUI_T(KC_BSPC)
-#define KC_CTBS CTL_T(KC_BSPC)
-#define KC_C_TAB LCTL(KC_TAB)
-#define KC_G_TAB LGUI(KC_TAB)
-#define KC_A_TAB LALT(KC_TAB)
-
-//layer shorthands
-#define _COLEMAK 0
-#define _PC 1
-#define _GAME 2
-#define _SYMBOL 3
-#define _NAV 4
-#define _NAVPC 5
-
-enum {
-// SFT_LCK //tapdance declarations
- COLEMAK = 0,
- PC,
- GAME,
- SYMBOL,
- NAV, //Navigation layer for Mac Colemak
- NAVPC, //Navigation layer for PC Colemak
- SFT_LCK //tapdance declaration
-};
-
-#define KC_SFLK TD(SFT_LCK) // alias for tapdance
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [_COLEMAK] = KC_KEYMAP(
- //,----+----+----+----+----+----. ,----+----+----+----+----+----.
- ESC , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 ,MINS,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- GRV , Q , W , F , P , G , J , L , U , Y ,SCLN,BSPC,
- //|----+----+----+----+----+----| |----+----+----+----+----+----|
- NAV , A , R , S , T , D , H , N , E , I , O ,QUOT,
- //|----+----+----+----+----+----+----. ,----|----+----+----+----+----+----|
- SFLK, Z , X , C , V , B , PC , ENT , K , M ,COMM, DOT,SLSH,RSFT,
- //`----+----+----+--+-+----+----+----/ \----+----+----+----+----+----+----'
- LCTL,LGUI,CMBS, SPC, SYM, LALT
- // `----+----+----' `----+----+----'
- ),
-
- [_PC] = KC_KEYMAP(
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- NAVPC,___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , GM, ___, ___ , ___ , ___ , ___ , ___ , ___ ,
-
- LGUI , LCTL , CTBS , ___ , ___ , ___
- ),
-
- [_GAME] = KC_KEYMAP(
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- ___ , T , Q , W , E , R , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- TAB , LSFT, A , S , D , F , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- I , LCTL, Z , X , C , V , M, P , ___, ___ , ___ , ___ , ___ , ___ ,
-
- LALT , LALT , SPC, BSPC, MAC, ___
- ),
-
- [_SYMBOL] = KC_KEYMAP(
-
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- LBRC, 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 0 , RBRC,
-
- BSLS, EXLM, AT , HASH, DLR , PERC, CIRC, AMPR, ASTR, LPRN, RPRN, EQL ,
-
- ___ , HOME, END , VOLD, VOLU, MPLY,___, ___,___, MINS, ___ , ___ , ___ , ___ ,
-
- ___ , ___ , A_BS, ___, ___ , ___
- ),
-
- [_NAV] = KC_KEYMAP(
-
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , C_TAB, AL , UP , AR , DEL , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , GSL , LEFT, DOWN, RGHT, GSR , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,G_TAB, ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___
- ),
-
- [_NAVPC] = KC_KEYMAP(
-
- ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , C_TAB, CL , UP , CR , DEL , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ , CPGU, LEFT, DOWN, RGHT, CPGD, ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___ ,___, ___,A_TAB, ___ , ___ , ___ , ___ , ___ ,
-
- ___ , ___ , ___ , ___ , ___ , ___
- ),
-
-};
-
-// Shift vs. capslock function. From bbaserdem's Planck keymap.
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- register_code (KC_LSFT);
- } else if (state->count == 2) {
- unregister_code (KC_LSFT);
- register_code (KC_CAPS);
- }
-}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- unregister_code (KC_LSFT);
- } else {
- unregister_code (KC_CAPS);
- }
-}
-
-qk_tap_dance_action_t tap_dance_actions[] = {
- //Tap once for Shift, twice for Caps Lock
- [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end)
-}; \ No newline at end of file
diff --git a/keyboards/iris/keymaps/dnrambo/readme.md b/keyboards/iris/keymaps/dnrambo/readme.md
deleted file mode 100644
index 4d21f37c0..000000000
--- a/keyboards/iris/keymaps/dnrambo/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Colemak layout for Iris rev2.1 with Mac and Windows layers and a Gaming Layer.
-# Symbol layer is based on my Planck layout, so it provides numbers, symbols, and volume controls.
-# Two Navigation layers, for Mac and Windows Colemak layers respectively. \ No newline at end of file
diff --git a/keyboards/iris/keymaps/dnrambo/rules.mk b/keyboards/iris/keymaps/dnrambo/rules.mk
deleted file mode 100644
index 0b7e7b905..000000000
--- a/keyboards/iris/keymaps/dnrambo/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-RGBLIGHT_ENABLE = no
-BACKLIGHT_ENABLE = no
-TAP_DANCE_ENABLE = yes
-
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/rambo/config.h b/keyboards/planck/keymaps/rambo/config.h
deleted file mode 100644
index c3bebf579..000000000
--- a/keyboards/planck/keymaps/rambo/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CONFIG_USER_H
-
-#define CONFIG_USER_H
-#define TAPPING_TERM 200
-#include "../../config.h"
-#define PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
-
-#endif \ No newline at end of file
diff --git a/keyboards/planck/keymaps/rambo/keymap.c b/keyboards/planck/keymaps/rambo/keymap.c
deleted file mode 100644
index 37e22afb9..000000000
--- a/keyboards/planck/keymaps/rambo/keymap.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "planck.h"
-
-//alias for clarity in layering
-#define _______ KC_TRNS
-#define A_BSPC LALT(KC_BSPC)
-#define A_LEFT LALT(KC_LEFT)
-#define A_RGHT LALT(KC_RGHT)
-#define C_TAB LCTL(KC_TAB)
-#define GSL LGUI(S(KC_LEFT))
-#define GSR LGUI(S(KC_RGHT))
-#define G_TAB LGUI(KC_TAB)
-#define G_GRV LGUI(KC_GRV) // MAC: switch between windows within an application
-#define SftEnt SFT_T(KC_ENT)
-#define NAV LT(2, KC_TAB)
-
-#define _COLEMAK 0
-#define _SYMBOL 1
-#define _NAVIGATION 2
-
-//tapdance declarations
-enum {
- SFT_LCK
-};
-
-//alias for tapdance
-#define SftLck TD(SFT_LCK)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Colemak
- * ,-----------------------------------------------------------------------------------.
- * | ESC` | Q | W | F | P | G | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab | A | R | S | T | D | H | N | E | I | O | " |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |SftLck| Z | X | C | V | B | K | M | , | . | /? |SftEnt|
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del | GUI | Ctrl | Alt | GUI | Space |Symbol| Left | Down | Up |Right |
- * `-----------------------------------------------------------------------------------'
-*/
-
-[_COLEMAK] = {
- {KC_GESC, 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},
- {SftLck , KC_Z , KC_X , KC_C , KC_V , KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SftEnt },
- {KC_DEL , KC_LGUI, KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT}
- },
-
-/* Symbol
- * ,-----------------------------------------------------------------------------------.
- * | [ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ] |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | \| | ! | @ | # | $ | % | ^ | & | * | ( | ) | =+ |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | | Home | End | ScUp | ScDn | F1 | F2 | -_ |Pg Up | | / | |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | `~ | | | |Alt(Bk)| | |Pg Dn | Vol- | Vol+ | |
- * `-----------------------------------------------------------------------------------'
- */
-[_SYMBOL] = {
- {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_WH_U, KC_WH_D,KC_F1 , KC_F2 , KC_MINS, KC_PGUP, _______, _______, _______},
- {KC_GRV, _______, _______, _______, A_BSPC, _______, _______, _______, KC_PGDN, KC_VOLD, KC_VOLU, KC_MUTE}
- },
-
-/* Navigation*/
-
-[_NAVIGATION] = {
- {_______, _______, _______, _______, _______, _______, C_TAB , A_LEFT, KC_UP, A_RGHT , KC_DEL , _______},
- {_______, _______, _______, _______, _______, _______, GSL , KC_LEFT, KC_DOWN, KC_RGHT, GSR , _______},
- {_______, _______, _______, _______, _______, _______, G_TAB , KC_HOME, _______, KC_END, G_GRV , _______},
- {RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
-}
-};
-
-// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- register_code (KC_LSFT);
- } else if (state->count == 2) {
- unregister_code (KC_LSFT);
- register_code (KC_CAPS);
- }
-}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- unregister_code (KC_LSFT);
- } else {
- unregister_code (KC_CAPS);
- }
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- //Tap once for Shift, twice for Caps Lock
- [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-}; \ No newline at end of file
diff --git a/keyboards/planck/keymaps/rambo/rules.mk b/keyboards/planck/keymaps/rambo/rules.mk
deleted file mode 100644
index ffa9b870a..000000000
--- a/keyboards/planck/keymaps/rambo/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-TAP_DANCE_ENABLE = yes
-MOUSEKEY_ENABLE = yes
-
-ifndef QUANTUM_DIR
- include ../../../../Makefile
-endif \ No newline at end of file
diff --git a/keyboards/xd75/keymaps/davidrambo/keymap.c b/keyboards/xd75/keymaps/davidrambo/keymap.c
index 6e95936c8..5d09dfa27 100644
--- a/keyboards/xd75/keymaps/davidrambo/keymap.c
+++ b/keyboards/xd75/keymaps/davidrambo/keymap.c
@@ -3,7 +3,7 @@
//aliases for clarity in layering
#define _______ KC_TRNS
#define A_BSPC LALT(KC_BSPC) // delete whole word in Mac
-#define C_BSPS LCTL(KC_BSPC) // delete whole word in PC
+// #define C_BSPS LCTL(KC_BSPC) // delete whole word in PC; currently not in use
#define A_LEFT LALT(KC_LEFT)
#define A_RGHT LALT(KC_RGHT)
#define C_RGHT LCTL(KC_RGHT)
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
{ NAVPC , _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______ },
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- { _______, KC_LCTL, KC_LGUI, _______, KC_LCTL, CBSPC , _______, _______, _______, _______, _______, KC_RCTL, KC_RALT, KC_RGUI, _______ },
+ { _______, KC_LCTL, KC_LGUI, _______, KC_LCTL, _______, _______, _______, _______, _______, _______, KC_RCTL, KC_RALT, KC_RGUI, _______ },
},
/* SYMBOL
@@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | = |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | | | | | | | | | | | -_ | | | | |
+ * | | HOME | END | BL_OFF | BL_ON | | | | | | -_ | | | | |
* |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
* | | | | | | | | | | | | | | | |
* '--------------------------------------------------------------------------------------------------------------------------------------'
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{ _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , _______, _______, _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , _______},
{ 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_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL },
- { _______, BL_OFF , BL_ON , BL_DEC , BL_INC , KC_F11 , _______, _______, _______, KC_F12 , KC_MINS, _______, _______, _______, _______},
+ { _______, KC_HOME, KC_END , BL_OFF , BL_ON , KC_F11 , _______, _______, _______, KC_F12 , KC_MINS, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, A_BSPC , _______, _______, _______, _______, _______, _______, _______, _______, _______},
},
@@ -102,15 +102,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TAB , A_LEFT, KC_UP, A_RGHT , KC_DEL , _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, GSL , KC_LEFT, KC_DOWN, KC_RGHT, GSR , _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, G_TAB , KC_HOME, _______, KC_END , G_GRV , _______},
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, G_TAB , ABSPC , KC_HOME, KC_END , G_GRV , _______},
{ RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
},
[_NAVPC] = { /* NAVIGATION FOR WINDOWS: replaces Alt with Control, GUI with Alt, and browser tab shortcuts*/
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
{ _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TAB , C_LEFT, KC_UP, C_RGHT , KC_DEL , _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGDN, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGUP, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, A_TAB , KC_HOME, _______, KC_END , _______, _______},
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______},
+ { _______, _______, _______, _______, _______, _______, _______, _______, _______, A_TAB , CBSPC , KC_HOME, KC_END , _______, _______},
{ RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
}
};
diff --git a/keyboards/xd75/keymaps/rambo/config.h b/keyboards/xd75/keymaps/rambo/config.h
deleted file mode 100644
index e87ccde79..000000000
--- a/keyboards/xd75/keymaps/rambo/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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/>.
- */
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
-
-#endif
diff --git a/keyboards/xd75/keymaps/rambo/keymap.c b/keyboards/xd75/keymaps/rambo/keymap.c
deleted file mode 100644
index 6e95936c8..000000000
--- a/keyboards/xd75/keymaps/rambo/keymap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-#include "xd75.h"
-
-//aliases for clarity in layering
-#define _______ KC_TRNS
-#define A_BSPC LALT(KC_BSPC) // delete whole word in Mac
-#define C_BSPS LCTL(KC_BSPC) // delete whole word in PC
-#define A_LEFT LALT(KC_LEFT)
-#define A_RGHT LALT(KC_RGHT)
-#define C_RGHT LCTL(KC_RGHT)
-#define C_LEFT LCTL(KC_LEFT)
-#define SftEnt SFT_T(KC_ENT)
-#define GBSPC LGUI_T(KC_BSPC)
-#define CBSPC LCTL_T(KC_BSPC)
-
-//internet browser tab shortcuts and window swapping for Mac and Win
-#define GSL LGUI(S(KC_LEFT)) // back one tab in Safari
-#define GSR LGUI(S(KC_RGHT)) // forward one tab in Safari
-#define CTLPGDN LCTL(KC_PGDN) // back one tab on Windows
-#define CTLPGUP LCTL(KC_PGUP) // forward one tab on Windows
-#define G_TAB LGUI(KC_TAB) // MAC: switch applications
-#define G_GRV LGUI(KC_GRV) // MAC: switch between windows within an application
-#define A_TAB LALT(KC_TAB)
-#define C_TAB LCTL(KC_TAB)
-
-//
-#define NAV LT(3, KC_TAB)
-#define NAVPC LT(4, KC_TAB)
-
-// Layer shorthand
-#define _COLEMAK 0
-#define _PC 1
-#define _SYMBOL 2 //Function keys, numbers, symbols, Backlighting
-#define _NAV 3 //Navigation Layer on Mac
-#define _NAVPC 4 //Navigation Layer on Win
-
-//tapdance declarations
-enum {
- SFT_LCK
-};
-
-//alias for tapdance
-#define SftLck TD(SFT_LCK)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* COLEMAK
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | `~ | 1 | 2 | 3 | 4 | 5 | - | SWITCH | = | 6 | 7 | 8 | 9 | 0 | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | ESC/`~ | Q | W | F | P | G | [ | \ | ] | J | L | U | Y | ; | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | NAVTAB | A | S | D | F | G | PgUp |PlayPaus| ENTER | H | N | E | I | O | ' |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * |SFT/CAPS| Z | X | C | V | B | PgDn | UP | ENTER | K | M | , | . | / | SftEnt |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | DEL | LGUI | LCTRL | LALT | LGUI | BKSPC | LEFT | DOWN | RIGHT | SPACE | SYMBOL | RGUI | RALT | RCTRL | BL |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_COLEMAK] = { /* COLEMAK */
- { KC_GRV , KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, TG(1) , KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC },
- { KC_GESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_LBRC, KC_BSLS, KC_RBRC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC },
- { NAV , KC_A, KC_R, KC_S, KC_T, KC_D, KC_PGUP, KC_ESC , KC_ENT , KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT },
- { SftLck , KC_Z, KC_X, KC_C, KC_V, KC_B, KC_PGDN, KC_UP , KC_ENT , KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SftEnt },
- { KC_DEL , KC_LGUI, KC_LCTL, KC_LALT, KC_LGUI, GBSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, MO(2) , KC_RGUI, KC_RALT, KC_RCTL, BL_STEP },
- },
-
-// Windows Layer: essentially swaps Control and GUI
-
- [_PC] = { /* WINDOWS */
- { _______, _______, _______, _______, _______, _______, _______, TG(0) , _______, _______, _______, _______, _______, _______, _______ },
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- { NAVPC , _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______ },
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- { _______, KC_LCTL, KC_LGUI, _______, KC_LCTL, CBSPC , _______, _______, _______, _______, _______, KC_RCTL, KC_RALT, KC_RGUI, _______ },
- },
-
-/* SYMBOL
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F12 | F1 | F2 | F3 | F4 | F5 | | | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | [{ | 1 | 2 | 3 | 4 | 5 | | | | 6 | 7 | 8 | 9 | 0 | }] |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | | ! | @ | # | $ | % | | | | ^ | & | * | ( | ) | = |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | | | | | | | | | | | -_ | | | | |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | | | | | | | | | | | | | | | |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
- [_SYMBOL] = { /* SYMBOL */
- { _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , _______, _______, _______, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , _______},
- { 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_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL },
- { _______, BL_OFF , BL_ON , BL_DEC , BL_INC , KC_F11 , _______, _______, _______, KC_F12 , KC_MINS, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, A_BSPC , _______, _______, _______, _______, _______, _______, _______, _______, _______},
- },
-
-
- [_NAV] = { /* NAVIGATION for Mac */
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TAB , A_LEFT, KC_UP, A_RGHT , KC_DEL , _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, GSL , KC_LEFT, KC_DOWN, KC_RGHT, GSR , _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, G_TAB , KC_HOME, _______, KC_END , G_GRV , _______},
- { RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- },
-
- [_NAVPC] = { /* NAVIGATION FOR WINDOWS: replaces Alt with Control, GUI with Alt, and browser tab shortcuts*/
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, C_TAB , C_LEFT, KC_UP, C_RGHT , KC_DEL , _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, CTLPGDN, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGUP, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, A_TAB , KC_HOME, _______, KC_END , _______, _______},
- { RESET , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- }
-};
-
-// Shift vs capslock function. From bbaserdem's Planck keymap.
-void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- register_code (KC_LSFT);
- } else if (state->count == 2) {
- unregister_code (KC_LSFT);
- register_code (KC_CAPS);
- }
-}
-void caps_tap_end (qk_tap_dance_state_t *state, void *user_data) {
- if (state->count == 1) {
- unregister_code (KC_LSFT);
- } else {
- unregister_code (KC_CAPS);
- }
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
- //Tap once for Shift, twice for Caps Lock
- [SFT_LCK] = ACTION_TAP_DANCE_FN_ADVANCED( caps_tap, NULL, caps_tap_end )
-};
-
-/* Template for future layers
- [_LAYER_NAME] = {
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- }
-};
-*/
diff --git a/keyboards/xd75/keymaps/rambo/readme.md b/keyboards/xd75/keymaps/rambo/readme.md
deleted file mode 100644
index 17b928c50..000000000
--- a/keyboards/xd75/keymaps/rambo/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# A Colemak layout for XD75 with both Mac and Windows layers.
-# These two layers share momentary toggle access to a "Symbol" layer, which is modeled after my Planck layout.
-# Each of the base Colemak layers have their own Navigation layers for the right hand to use arrows and shortcuts for both text editing and web browsing.
-# The rules.mk file overrides the XD75's "BACKLIGHT_ENABLE" with YES and also adds tap dance functionality. \ No newline at end of file
diff --git a/keyboards/xd75/keymaps/rambo/rules.mk b/keyboards/xd75/keymaps/rambo/rules.mk
deleted file mode 100644
index edc9cc6bc..000000000
--- a/keyboards/xd75/keymaps/rambo/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-TAP_DANCE_ENABLE = yes # Enable tap dance functionality \ No newline at end of file