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

1 files changed, 59 insertions, 67 deletions

diff --git a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
index aa757508a4..b36abd4c56 100644
--- a/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
+++ b/keyboards/keebio/iris/keymaps/davidrambo/keymap.c
@@ -1,35 +1,30 @@
 #include QMK_KEYBOARD_H
 
-extern keymap_config_t keymap_config;
-
 //keycode shorthands
-#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_NAVMAC LT(4, KC_TAB)
-#define KC_NAVPC  LT(5, KC_TAB)
+#define MACNAV LT(4, KC_TAB)
+#define PCNAV  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_ABSPC LALT(KC_BSPC)
-#define KC_CBSPC LCTL(KC_BSPC)
+#define ALEFT   LALT(KC_LEFT)
+#define ARGHT   LALT(KC_RGHT)
+#define CLEFT   LCTL(KC_LEFT)
+#define CRGHT   LCTL(KC_RGHT)
+#define ABSPC LALT(KC_BSPC)
+#define CBSPC LCTL(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 GSL  LGUI(S(KC_LEFT))
+#define GSR  LGUI(S(KC_RGHT))
+#define CTLPGDN LCTL(KC_PGDN)
+#define CTLPGUP LCTL(KC_PGUP)
+
+#define CMBS  GUI_T(KC_BSPC)
+#define CTBS  CTL_T(KC_BSPC)
+#define C_TAB LCTL(KC_TAB)
+#define G_TAB LGUI(KC_TAB)
+#define A_TAB LALT(KC_TAB)
 
-#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)
+#define SFLK TD(SFT_LCK)     // alias for tapdance
 
 //layer shorthands
 #define _COLEMAK 0
@@ -39,101 +34,98 @@ extern keymap_config_t keymap_config;
 #define _NAVMAC 4
 #define _NAVPC 5
 
-enum {
-//	SFT_LCK //tapdance declarations
+enum custom_keycodes {
+    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] = LAYOUT(
-  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
-     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_MINS,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-     KC_GRV , KC_Q  , KC_W  , KC_F  , KC_P  , KC_G  ,                KC_J  , KC_L  , KC_U  , KC_Y  ,KC_SCLN,KC_BSPC,
-  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
-   KC_NAVMAC, KC_A  , KC_R  , KC_S  , KC_T  , KC_D  ,                KC_H  , KC_N  , KC_E  , KC_I  , KC_O  ,KC_QUOT,
-  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
-     KC_SFLK, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  , KC_PC ,     KC_ENT , KC_K  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,
-  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
-                       KC_LCTL,KC_LGUI,KC_CMBS,         KC_SPC, KC_SYM, KC_LALT
-  //                  `----+----+----'        `----+----+----'
+  //,------+------+------+------+------+------.                    ,------+------+------+------+------+------.
+     KC_ESC, KC_1 , KC_2 , KC_3 , KC_4, KC_5,                       KC_6  , KC_7 , KC_8 , KC_9 , KC_0  , KC_MINS,
+  //|------+------+------+------+------+------|                    |------+------+------+------+------+------|
+     KC_GRV, KC_Q , KC_W , KC_F , KC_P, KC_G,                       KC_J  , KC_L , KC_U , KC_Y , KC_SCLN,KC_BSPC,
+  //|------+------+------+------+------+------|                    |------+------+------+------+------+------|
+     MACNAV, 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 , TO(1),        KC_ENT, KC_K, KC_M , KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,
+  //`------+------+------+------+------+----+------/         \-----+------+------+------+------+------+------'
+                              KC_LCTL, KC_LALT, CMBS,         KC_SPC, MO(3), KC_RALT
+  //                          `------+------+------'           `------+------+------'
   ),
 
     [_PC] = LAYOUT(
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    _______, _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
         
-    KC_NAVPC,KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    PCNAV  , _______, _______, _______, _______, _______,                 _______, _______, _______, _______, _______, _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ , KC_GM, KC____, KC____ , KC____ , KC____ , KC____ , KC____ , KC____ , 
+    _______, _______, _______, _______, _______, _______, TO(2),    _______, _______, _______, _______, _______, _______, _______, 
         
-                      KC_LGUI , KC_LCTL , KC_CTBS ,    KC____ , KC____ , KC____ 
+                                    KC_LALT, KC_LGUI, CTBS,            _______, _______, _______
     ),
    
     [_GAME] = LAYOUT(
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
-        
-     KC_B  ,  KC_T  ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    _______, _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______,
+       
+    KC_B   , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   ,                _______, _______, _______, _______, _______, _______,
         
-    KC_TAB , KC_LSFT,  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,          KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,                _______, _______, _______, _______, _______, _______,
         
-    KC_LALT, KC_LCTL,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_M,   KC_P , KC____, KC____ , KC____ , KC____ , KC____ , KC____ , 
+    KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_M,   KC_P , _______, _______, _______, _______, _______, _______, 
         
-                          KC_G   ,  KC_I  , KC_SPC,    KC_BSPC, KC_MAC, KC____ 
+                                   KC_G, KC_I, KC_SPC,                KC_BSPC, TO(0), _______
     ), 
     
     [_SYMBOL] = LAYOUT(
     
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    KC_F12 , KC_F1  , KC_F2 , KC_F3  , KC_F4  , KC_F5,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11,
     
-    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_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_BSLS, KC_EXLM, KC_AT , KC_HASH, KC_DLR , KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL,
         
-    KC____ , KC_HOME, KC_END , KC_VOLD, KC_VOLU, KC_MPLY,KC____,  KC____,KC____, KC_MINS, KC____ , KC____ , KC____ , KC____ , 
+    _______, KC_HOME, KC_END, KC_VOLD, KC_VOLU, KC_MPLY, _______,   _______, _______, KC_MINS, _______, _______, _______, _______, 
         
-                        KC____ , KC____ , KC____,      KC____, KC____ , KC____ 
+                           _______, _______, _______,                    _______, _______, _______
     ),
    
     [_NAVMAC] = LAYOUT(
     
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    RESET  , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_C_TAB, KC_AL ,  KC_UP ,  KC_AR , KC_DEL , KC____ ,
+    _______, _______, _______, _______, _______, _______,                    C_TAB,   ALEFT  ,  KC_UP , ARGHT  , KC_DEL , _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_GSL , KC_LEFT, KC_DOWN, KC_RGHT, KC_GSR , KC____ ,
+    _______, _______, _______, _______, _______, _______,                    GSL ,    KC_LEFT, KC_DOWN, KC_RGHT, GSR    , _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,KC____,  KC____,KC_G_TAB,KC_ABSPC, KC____ , KC____ , KC____ , KC____ , 
+    _______, _______, _______, _______, _______, _______, _______,  _______, G_TAB,   ABSPC  , _______, _______, _______, _______, 
         
-                        KC____ , KC____ , KC____ ,       KC____ , KC____ , KC____ 
+                                   _______, _______, _______,         _______, _______, _______
     ),
     
     [_NAVPC] = LAYOUT(
     
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,
+    RESET , _______, _______, _______, _______, _______,                    _______, _______, _______, _______, _______, _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_C_TAB, KC_CL ,  KC_UP ,  KC_CR , KC_DEL , KC____ ,
+    _______, _______, _______, _______, _______, _______,                   C_TAB  , CLEFT  , KC_UP  , CRGHT  , KC_DEL , _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,         KC_CPGU, KC_LEFT, KC_DOWN, KC_RGHT, KC_CPGD, KC____ ,
+    _______, _______, _______, _______, _______, _______,                   CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
         
-    KC____ , KC____ , KC____ , KC____ , KC____ , KC____ ,KC____,  KC____,KC_A_TAB,KC_CBSPC, KC____ , KC____ , KC____ , KC____ , 
+    _______, _______, _______, _______, _______, _______,_______,  _______, A_TAB  , CBSPC, _______, _______, _______, _______, 
         
-                        KC____ , KC____ , KC____ ,       KC____ , KC____ , KC____ 
+                              _______, _______, _______,                _______, _______, _______
     ),
    
 };
 
-// Shift vs. capslock function. From bbaserdem's Planck keymap.
+// Shift vs. capslock function. From bbaserdem's Planck keymap (since deprecated).
 void caps_tap (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         register_code (KC_LSFT);