Merge branch 'develop'

15 files changed, 43 insertions, 96 deletions

diff --git a/keyboards/lets_split/keymaps/DE_programming/rules.mk b/keyboards/lets_split/keymaps/DE_programming/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/DE_programming/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/DE_simple/rules.mk b/keyboards/lets_split/keymaps/DE_simple/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/DE_simple/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 826c381b32..c2c45bebfd 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -21,15 +21,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
-
 /* Select hand configuration */
 
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_lets_split_rev2
     /* RGB Underglow */
     #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
@@ -47,7 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef TAPPING_TERM
 #define TAPPING_TERM 200 //At 500 some bad logic takes hold
-#define IGNORE_MOD_TAP_INTERRUPT
 #define PERMISSIVE_HOLD
 
 #endif
diff --git a/keyboards/lets_split/keymaps/fabian/config.h b/keyboards/lets_split/keymaps/fabian/config.h
index d05757233d..3e79f43ed0 100644
--- a/keyboards/lets_split/keymaps/fabian/config.h
+++ b/keyboards/lets_split/keymaps/fabian/config.h
@@ -19,14 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 // #define EE_HANDS
-
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/config.h b/keyboards/lets_split/keymaps/heartrobotninja/config.h
index d4193609ad..bd68b24d08 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/config.h
+++ b/keyboards/lets_split/keymaps/heartrobotninja/config.h
@@ -41,14 +41,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #undef TAPPING_TOGGLE
 #define TAPPING_TOGGLE 2
 
-#ifdef SUBPROJECT_rev1
-#include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-#include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-#include "../../rev2fliphalf/config.h"
-#endif
-
 #endif
diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h
index 94be36ef55..e51e065bb6 100644
--- a/keyboards/lets_split/keymaps/mjt/config.h
+++ b/keyboards/lets_split/keymaps/mjt/config.h
@@ -20,17 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-
-#ifdef SUBPROJECT_rev1
-    #include "../../rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "../../rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev2fliphalf
-	#include "../../rev2fliphalf/config.h"
-#endif
-
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/lets_split/keymaps/piemod/rules.mk b/keyboards/lets_split/keymaps/piemod/rules.mk
index 79a0a17383..e4319facfb 100644
--- a/keyboards/lets_split/keymaps/piemod/rules.mk
+++ b/keyboards/lets_split/keymaps/piemod/rules.mk
@@ -10,4 +10,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
-SUBPROJECT_rev1 = no
diff --git a/keyboards/lets_split/keymaps/poker/rules.mk b/keyboards/lets_split/keymaps/poker/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/poker/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h
index 1a46cdf108..3ae9165cfd 100644
--- a/keyboards/lets_split/keymaps/shaymdev/config.h
+++ b/keyboards/lets_split/keymaps/shaymdev/config.h
@@ -25,8 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define _MASTER_RIGHT
 // #define EE_HANDS
 
-#undef RGB_DI_PIN
-#define RGB_DI_PIN D3
+#undef WS2812_DI_PIN
+#define WS2812_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -50,7 +50,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                                 }
 #endif
 
-#define COMBO_COUNT 1
-
-#define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 220
diff --git a/keyboards/lets_split/keymaps/shaymdev/keymap.c b/keyboards/lets_split/keymaps/shaymdev/keymap.c
index 19a2c082df..fe919133a9 100644
--- a/keyboards/lets_split/keymaps/shaymdev/keymap.c
+++ b/keyboards/lets_split/keymaps/shaymdev/keymap.c
@@ -35,14 +35,14 @@ enum custom_keycodes {
 #define RAISE MO(_RAISE)
 #define RAS RAISE
 
-enum combos //match combo_count in config.h
+enum combos
 {
 	EU_ENT,
 };
 
 const uint16_t PROGMEM eu_combo[]     = {KC_E, KC_U, COMBO_END};
 
-combo_t key_combos[COMBO_COUNT] = {
+combo_t key_combos[] = {
 	[EU_ENT]                = COMBO_ACTION(eu_combo),
 };
 
@@ -58,38 +58,38 @@ void process_combo_event(uint16_t combo_index, bool pressed) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[_DVORAK] = LAYOUT( 
-  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT, KC_P,    KC_Y,        KC_F,    KC_G,   KC_C,  KC_R,   KC_L,    KC_SLSH, 
-  KC_TAB,  KC_A,    KC_O,    KC_E,   KC_U,    KC_I,        KC_D,    KC_H,   KC_T,  KC_N,   KC_S,    KC_MINS, 
-  KC_EQL,  KC_SCLN, KC_Q,    KC_J,   KC_K,    KC_X,        KC_B,    KC_M,   KC_W,  KC_V,   KC_Z,    KC_BSLS, 
-  XXXXXXX, KC_ENT,  KC_LALT, TT(LWR), KC_LSFT, KC_LCTL,		 KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX  
+[_DVORAK] = LAYOUT(
+  KC_ESC,  KC_QUOT, KC_COMM, KC_DOT, KC_P,    KC_Y,        KC_F,    KC_G,   KC_C,  KC_R,   KC_L,    KC_SLSH,
+  KC_TAB,  KC_A,    KC_O,    KC_E,   KC_U,    KC_I,        KC_D,    KC_H,   KC_T,  KC_N,   KC_S,    KC_MINS,
+  KC_EQL,  KC_SCLN, KC_Q,    KC_J,   KC_K,    KC_X,        KC_B,    KC_M,   KC_W,  KC_V,   KC_Z,    KC_BSLS,
+  XXXXXXX, KC_ENT,  KC_LALT, TT(LWR), KC_LSFT, KC_LCTL,		 KC_BSPC, KC_SPC, TT(RAS), KC_DEL, KC_LGUI, XXXXXXX
 ),
 
-[_QWERTY] = LAYOUT( 
-  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_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    	  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, 
+[_QWERTY] = LAYOUT(
+  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_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    	  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
   KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    	  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LGUI,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
 ),
 
-[_LOWER] = LAYOUT( 
-  _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,     _______, KC_P7,   KC_P8, KC_P9, KC_PMNS, _______, 
-  _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_ASTR, 		_______, KC_P4,   KC_P5, KC_P6, KC_PPLS, _______, 
-  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,			_______, KC_P1,   KC_P2, KC_P3, KC_PENT, _______, 
+[_LOWER] = LAYOUT(
+  _______, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_AMPR,     _______, KC_P7,   KC_P8, KC_P9, KC_PMNS, _______,
+  _______, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_ASTR, 		_______, KC_P4,   KC_P5, KC_P6, KC_PPLS, _______,
+  _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_GRV,			_______, KC_P1,   KC_P2, KC_P3, KC_PENT, _______,
   _______, _______, _______, _______, _______, _______,     _______, KC_KP_0, _______, _______, _______, _______ //This kp_0 is blocking the space key.... may want to do something about that.
 ),
 
-[_RAISE] = LAYOUT( 
+[_RAISE] = LAYOUT(
   _______, KC_PSCR, KC_HOME, KC_UP,   KC_END,  KC_PGUP,  		KC_VOLU, KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX,
   KC_CAPS, KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,  	 	KC_VOLD, KC_F4,   KC_F5,   KC_F6,   KC_F11,  XXXXXXX,
   _______, KC_NUM,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  	 	KC_MUTE, KC_F1,   KC_F2,   KC_F3,   KC_F12,  XXXXXXX,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
 ),
 
-[_ADJUST] =  LAYOUT( 
-    TO_DV, QK_BOOT, _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,  
-  RGB_TOG, RGB_MOD, VK_TOGG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______, 
-  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 		_______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, 
+[_ADJUST] =  LAYOUT(
+    TO_DV, QK_BOOT, _______, _______, _______, _______, 		_______, _______, _______, _______, _______, KC_DEL,
+  RGB_TOG, RGB_MOD, VK_TOGG, AU_ON,   AU_OFF,  AG_NORM, 		AG_SWAP,  QWERTY,  DVORAK, _______, _______, _______,
+  RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 		_______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
   _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
 )
 
diff --git a/keyboards/lets_split/keymaps/vim-mode/rules.mk b/keyboards/lets_split/keymaps/vim-mode/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/vim-mode/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/waples/rules.mk b/keyboards/lets_split/keymaps/waples/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/lets_split/keymaps/waples/rules.mk
+++ /dev/null
diff --git a/keyboards/lets_split/keymaps/zer09/config.h b/keyboards/lets_split/keymaps/zer09/config.h
index 36d94824d5..6cdb6dd8b4 100644
--- a/keyboards/lets_split/keymaps/zer09/config.h
+++ b/keyboards/lets_split/keymaps/zer09/config.h
@@ -45,7 +45,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #undef RGBLED_NUM
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 #define RGBLED_NUM 50
 #endif
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c
index 4adc40e9c6..e09fa0d318 100644
--- a/keyboards/lets_split/keymaps/zer09/keymap.c
+++ b/keyboards/lets_split/keymaps/zer09/keymap.c
@@ -1,6 +1,24 @@
-#include "keymap.h"
+#include "zer09.h"
 
-extern keymap_config_t keymap_config;
+#undef LAYOUT
+#define LAYOUT( \
+  L00, L01, L02, L03, L04,     R00, R01, R02, R03, R04, \
+  L10, L11, L12, L13, L14,     R10, R11, R12, R13, R14, \
+  L20, L21, L22, L23, L24,     R20, R21, R22, R23, R24, \
+  L30, L31, L32, L33, L34,     R30, R31, R32, R33, R34, \
+  L40, L41, L42, L43, L44,     R40, R41, R42, R43, R44 \
+) { \
+  { L00, L01, L02, L03, L04 }, \
+  { L10, L11, L12, L13, L14 }, \
+  { L20, L21, L22, L23, L24 }, \
+  { L30, L31, L32, L33, L34 }, \
+  { L40, L41, L42, L43, L44 }, \
+  { R00, R01, R02, R03, R04 }, \
+  { R10, R11, R12, R13, R14 }, \
+  { R20, R21, R22, R23, R24 }, \
+  { R30, R31, R32, R33, R34 }, \
+  { R40, R41, R42, R43, R44 } \
+}
 
 #define _baseLayer LAYOUT( \
   KC_QUOTE,    KC_COMMA,    KC_DOT,      KC_P,        KC_Y,           /**/KC_F,           KC_G,        KC_C,        KC_R,        KC_L,        \
diff --git a/keyboards/lets_split/keymaps/zer09/keymap.h b/keyboards/lets_split/keymaps/zer09/keymap.h
deleted file mode 100644
index 03f8f480af..0000000000
--- a/keyboards/lets_split/keymaps/zer09/keymap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "lets_split.h"
-#include "action_layer.h"
-#include "eeconfig.h"
-#include "tap_dance.h"
-#include "zer09.h"
-
-#ifdef LAYOUT_ortho_4x12
-#undef LAYOUT_ortho_4x12
-#endif
-
-#ifdef LAYOUT
-#undef LAYOUT
-#define LAYOUT( \
-  L00, L01, L02, L03, L04,     R00, R01, R02, R03, R04,  \
-  L10, L11, L12, L13, L14,     R10, R11, R12, R13, R14,  \
-  L20, L21, L22, L23, L24,     R20, R21, R22, R23, R24,  \
-  L30, L31, L32, L33, L34,     R30, R31, R32, R33, R34,  \
-  L40, L41, L42, L43, L44,     R40, R41, R42, R43, R44   \
-) \
-  { \
-    { L00, L01, L02, L03, L04 }, \
-    { L10, L11, L12, L13, L14 }, \
-    { L20, L21, L22, L23, L24 }, \
-    { L30, L31, L32, L33, L34 }, \
-    { L40, L41, L42, L43, L44 }, \
-    { R00, R01, R02, R03, R04 }, \
-    { R10, R11, R12, R13, R14 }, \
-    { R20, R21, R22, R23, R24 }, \
-    { R30, R31, R32, R33, R34 }, \
-    { R40, R41, R42, R43, R44 }  \
-  }
-#endif