Merge https://github.com/climbalima/qmk_firmware

diff --cc keyboards/lets_split/Makefile
index 4e2a6f00fd8ea2e3d2f25fa611a2cba9d6d98783,396d5155530c3c8cba662e60af53a96bd6003ec7..6ce6e437311c8c475eaed3bb833a4f08e56ce5b1
--- 1/keyboards/lets_split/Makefile
--- 2/keyboards/lets_split/Makefile
+++ b/keyboards/lets_split/Makefile
@@@ -1,3 -1,78 +1,82 @@@
++<<<<<<< HEAD
 +ifndef MAKEFILE_INCLUDED
++=======
+ SRC += matrix.c \
+          i2c.c \
+          split_util.c \
+          serial.c
+ 
+ # MCU name
+ #MCU = at90usb1287
+ MCU = atmega32u4
+ 
+ # Processor frequency.
+ #     This will define a symbol, F_CPU, in all source code files equal to the
+ #     processor frequency in Hz. You can then use this symbol in your source code to
+ #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+ #     automatically to create a 32-bit value in your source code.
+ #
+ #     This will be an integer division of F_USB below, as it is sourced by
+ #     F_USB after it has run through any CPU prescalers. Note that this value
+ #     does not *change* the processor frequency - it should merely be updated to
+ #     reflect the processor speed set externally so that the code can use accurate
+ #     software delays.
+ F_CPU = 16000000
+ 
+ #
+ # LUFA specific
+ #
+ # Target architecture (see library "Board Types" documentation).
+ ARCH = AVR8
+ 
+ # Input clock frequency.
+ #     This will define a symbol, F_USB, in all source code files equal to the
+ #     input clock frequency (before any prescaling is performed) in Hz. This value may
+ #     differ from F_CPU if prescaling is used on the latter, and is required as the
+ #     raw input clock is fed directly to the PLL sections of the AVR for high speed
+ #     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+ #     at the end, this will be done automatically to create a 32-bit value in your
+ #     source code.
+ #
+ #     If no clock division is performed on the input clock inside the AVR (via the
+ #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+ F_USB = $(F_CPU)
+ 
+ # Interrupt driven control endpoint task(+60)
+ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+ 
+ 
+ # Boot Section Size in *bytes*
+ #   Teensy halfKay   512
+ #   Teensy++ halfKay 1024
+ #   Atmel DFU loader 4096
+ #   LUFA bootloader  4096
+ #   USBaspLoader     2048
+ OPT_DEFS += -DBOOTLOADER_SIZE=4096
+ 
+ # Build Options
+ #   change to "no" to disable the options, or define them in the Makefile in 
+ #   the appropriate keymap folder that will get included automatically
+ #
+ BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000)
+ MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+ EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
+ CONSOLE_ENABLE ?= no         # Console for debug(+400)
+ COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+ NKRO_ENABLE ?= no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+ BACKLIGHT_ENABLE ?= no      # Enable keyboard backlight functionality
+ MIDI_ENABLE ?= no            # MIDI controls
+ AUDIO_ENABLE ?= yes           # Audio output on port C6
+ UNICODE_ENABLE ?= no         # Unicode
+ BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+ RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+ USE_I2C ?= yes
+ # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+ SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
+ 
+ CUSTOM_MATRIX = yes
+ SUBPROJECT_DEFAULT = rev2
+ ifndef QUANTUM_DIR
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
        include ../../Makefile
  endif

diff --cc keyboards/lets_split/config.h
index 5bee553199c959fa1d48f13c7438ac4b0830ae51,059d45b0c00c84b1e00103530017ccb278ab141e..91b11f03fd8692c173a9579c5b408fcbeaeb55e6
--- 1/keyboards/lets_split/config.h
--- 2/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@@ -61,6 -94,7 +61,10 @@@ along with this program.  If not, see <
  //#define NO_ACTION_ONESHOT
  //#define NO_ACTION_MACRO
  //#define NO_ACTION_FUNCTION
+ <<<<<<< HEAD
++=======
++<<<<<<< HEAD
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  #ifdef SUBPROJECT_rev1
      #include "rev1/config.h"
  #endif
@@@ -68,3 -102,6 +72,9 @@@
      #include "rev2/config.h"
  #endif
  #endif
++<<<<<<< HEAD
++=======
+ 
+ 
+ 
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df

diff --cc keyboards/lets_split/keymaps/default/keymap.c
index fc41c01fdba1e73738dcb52c4a47da698d92cef9,d9406381641358601c83082b521e08486b6e3748..41b9b8d8ff117df50178fa6a0582e1263859b02d
--- 1/keyboards/lets_split/keymaps/default/keymap.c
--- 2/keyboards/lets_split/keymaps/default/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
@@@ -29,116 -29,24 +29,109 @@@ enum custom_keycodes 
  #define XXXXXXX KC_NO
  
  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
++<<<<<<< HEAD
 +
 +/* Qwerty
 + * ,-----------------------------------------------------------------------------------.
 + * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
 + * |------+------+------+------+------+-------------+------+------+------+------+------|
 + * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
 + * |------+------+------+------+------+------|------+------+------+------+------+------|
 + * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
 + * |------+------+------+------+------+------+------+------+------+------+------+------|
 + * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
 + * `-----------------------------------------------------------------------------------'
 + */
 +[_QWERTY] = KEYMAP( \
 +  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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
 +  KC_LCTL, ADJUST, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  MT(MOD_LSFT, KC_SPC),  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 +),
 +
 +/* Colemak
 + * ,-----------------------------------------------------------------------------------.
 + * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
 + * |------+------+------+------+------+-------------+------+------+------+------+------|
 + * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
 + * |------+------+------+------+------+------|------+------+------+------+------+------|
 + * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
 + * |------+------+------+------+------+------+------+------+------+------+------+------|
 + * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
 + * `-----------------------------------------------------------------------------------'
 + */
 +[_COLEMAK] = KEYMAP( \
 +  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
 +  KC_ESC,  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, KC_ENT , \
 +  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
 +),
 +
 +/* Dvorak
 + * ,-----------------------------------------------------------------------------------.
 + * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
 + * |------+------+------+------+------+-------------+------+------+------+------+------|
 + * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
 + * |------+------+------+------+------+------|------+------+------+------+------+------|
 + * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
 + * |------+------+------+------+------+------+------+------+------+------+------+------|
 + * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
 + * `-----------------------------------------------------------------------------------'
 + */
 +[_DVORAK] = KEYMAP( \
 +  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
 +  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
 +  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
 +  ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
++=======
+ [0] = KEYMAP( \
+   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
+   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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
+   KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER),   KC_SPC,  KC_SPC,  MO(_RAISE),   KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  ),
- 
- /* Lower
-  * ,-----------------------------------------------------------------------------------.
-  * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-  * `-----------------------------------------------------------------------------------'
-  */
- [_LOWER] = KEYMAP( \
-   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+ [3] = KEYMAP( \
+   KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
++<<<<<<< HEAD
 +  _______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
++=======
+   _______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  ),
- 
- /* Raise
-  * ,-----------------------------------------------------------------------------------.
-  * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-  * |------+------+------+------+------+-------------+------+------+------+------+------|
-  * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-  * |------+------+------+------+------+------|------+------+------+------+------+------|
-  * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-  * |------+------+------+------+------+------+------+------+------+------+------+------|
-  * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-  * `-----------------------------------------------------------------------------------'
-  */
- [_RAISE] = KEYMAP( \
-   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+ [4] = KEYMAP( \
+   KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
++<<<<<<< HEAD
 +  _______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
 +),
 +
 +/* Adjust (Lower + Raise)
 + * ,-----------------------------------------------------------------------------------.
 + * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
 + * |------+------+------+------+------+-------------+------+------+------+------+------|
 + * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
 + * |------+------+------+------+------+------|------+------+------+------+------+------|
 + * |      |      |      |      |      |      |      |      |      |      |      |      |
 + * |------+------+------+------+------+------+------+------+------+------+------+------|
 + * |      |      |      |      |      |             |      |      |      |      |      |
 + * `-----------------------------------------------------------------------------------'
 + */
 +[_ADJUST] =  KEYMAP( \
 +  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
 +  _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
 +  _______, RGB_TOG,RGB_MOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD, _______, _______, _______, \
 +  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
 +)
 +
 +
++=======
+   _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+ ),
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  };
  
  #ifdef AUDIO_ENABLE

diff --cc keyboards/lets_split/lets_split.c
index 851299aa2b4652e3b06d2a5a6ab03a60b3403bc1,fe2d4bc1936f5aeca9c9690930deacc939903a52..8bb33f9514b54fc139dca18f6505221cde1f92dc
--- 1/keyboards/lets_split/lets_split.c
--- 2/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@@ -1,2 -1,3 +1,6 @@@
  #include "lets_split.h"
  
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df

diff --cc keyboards/lets_split/rev1/config.h
index f4d900accbe410f98c13b00bba935d4577344bcc,b609ada077f45b667f6bbb77923ed6737889048f..da5b4767335c1ae580e798e93598db813ee53a2e
--- 1/keyboards/lets_split/rev1/config.h
--- 2/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@@ -25,7 -25,7 +25,11 @@@ along with this program.  If not, see <
  #define PRODUCT_ID      0x3060
  #define DEVICE_VER      0x0001
  #define MANUFACTURER    Wootpatoot
++<<<<<<< HEAD
 +#define PRODUCT         Lets Split
++=======
+ #define PRODUCT         Lets Split v1
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  #define DESCRIPTION     A split keyboard for the cheap makers
  
  /* key matrix size */
@@@ -41,11 -41,6 +45,14 @@@
  
  // #define USE_I2C
  
++<<<<<<< HEAD
 +// Use serial if not using I2C
 +#ifndef USE_I2C
 +#  define USE_SERIAL
 +#endif
 +
++=======
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  // #define EE_HANDS
  
  #define I2C_MASTER_LEFT
@@@ -74,9 -69,10 +81,16 @@@
  )
  
  /* ws2812 RGB LED */
++<<<<<<< HEAD
 +#define RGB_DI_PIN D4
 +#define RGBLIGHT_TIMER
 +#define RGBLED_NUM 8     // Number of LEDs
++=======
+ #define ws2812_PORTREG  PORTD
+ #define ws2812_DDRREG   DDRD
+ #define ws2812_pin PD1
+ #define RGBLED_NUM 28     // Number of LEDs
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  #define RGBLIGHT_HUE_STEP 10
  #define RGBLIGHT_SAT_STEP 17
  #define RGBLIGHT_VAL_STEP 17
@@@ -99,4 -95,4 +113,8 @@@
  //#define NO_ACTION_MACRO
  //#define NO_ACTION_FUNCTION
  
 -#endif
++<<<<<<< HEAD
 +#endif
++=======
++#endif
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df

diff --cc keyboards/lets_split/rev1/rev1.c
index c505d3a6e317630df35f0d166a77bf4de841f11e,574c116a75463358cb61b7df14e55729b61223fa..41dd1e3535501b047309c4594edd1803e3c791b9
--- 1/keyboards/lets_split/rev1/rev1.c
--- 2/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@@ -24,9 -24,7 +24,15 @@@ void matrix_init_kb(void) 
  };
  
  void shutdown_user(void) {
++<<<<<<< HEAD
 +    #ifdef AUDIO_ENABLE
 +        PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
 +      _delay_ms(150);
 +      stop_all_notes();
 +    #endif
++=======
+     PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+     _delay_ms(150);
+     stop_all_notes();
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  }

diff --cc keyboards/lets_split/rev1/rev1.h
index 50bda0315449e1194ce85cfe8be4c5faf62cc79f,04fe0ddeb8f111113304163d7c04ae81cec66913..998b2be7c7eb9803d6f59772e881fa09ec2150ea
--- 1/keyboards/lets_split/rev1/rev1.h
--- 2/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@@ -1,9 -1,9 +1,15 @@@
  #ifndef REV1_H
  #define REV1_H
  
++<<<<<<< HEAD
 +#include "../lets_split.h"
 +
 +//void promicro_bootloader_jmp(bool program);
++=======
+ #include "quantum.h"
+ 
+ void promicro_bootloader_jmp(bool program);
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  
  #define KEYMAP( \
        k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \

diff --cc keyboards/lets_split/rev2/config.h
index cd152e331f42d976675b6b035f5a615db8ed29a1,bf618704cd14db7667d8a5384bbf617ca6eb4dec..19c137e56c1919e1ae67fc14abf8fd7932123abf
--- 1/keyboards/lets_split/rev2/config.h
--- 2/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@@ -41,11 -41,6 +41,14 @@@ along with this program.  If not, see <
  
  // #define USE_I2C
  
++<<<<<<< HEAD
 +// Use serial if not using I2C
 +#ifndef USE_I2C
 +#  define USE_SERIAL
 +#endif
 +
++=======
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  // #define EE_HANDS
  
  #define I2C_MASTER_LEFT
@@@ -74,9 -69,10 +77,16 @@@
  )
  
  /* ws2812 RGB LED */
++<<<<<<< HEAD
 +#define RGB_DI_PIN D3
 +#define RGBLIGHT_TIMER
 +#define RGBLED_NUM 12    // Number of LEDs
++=======
+ #define ws2812_PORTREG  PORTD
+ #define ws2812_DDRREG   DDRD
+ #define ws2812_pin PD1
+ #define RGBLED_NUM 28     // Number of LEDs
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  #define RGBLIGHT_HUE_STEP 10
  #define RGBLIGHT_SAT_STEP 17
  #define RGBLIGHT_VAL_STEP 17
@@@ -99,4 -95,4 +109,8 @@@
  //#define NO_ACTION_MACRO
  //#define NO_ACTION_FUNCTION
  
 -#endif
++<<<<<<< HEAD
 +#endif
++=======
++#endif
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df

diff --cc keyboards/lets_split/rev2/rev2.c
index c505d3a6e317630df35f0d166a77bf4de841f11e,574c116a75463358cb61b7df14e55729b61223fa..41dd1e3535501b047309c4594edd1803e3c791b9
--- 1/keyboards/lets_split/rev2/rev2.c
--- 2/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@@ -24,9 -24,7 +24,15 @@@ void matrix_init_kb(void) 
  };
  
  void shutdown_user(void) {
++<<<<<<< HEAD
 +    #ifdef AUDIO_ENABLE
 +        PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
 +      _delay_ms(150);
 +      stop_all_notes();
 +    #endif
++=======
+     PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
+     _delay_ms(150);
+     stop_all_notes();
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  }

diff --cc keyboards/lets_split/rev2/rev2.h
index a8b0f0f4c702a5bd70d5548b8664d04df0766eee,2a2246f056cb095fd592b28ce466b4aff82bad0e..9e251ca57dbbfc69182acc2387104a6d81baf3ac
--- 1/keyboards/lets_split/rev2/rev2.h
--- 2/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@@ -1,9 -1,9 +1,15 @@@
  #ifndef REV2_H
  #define REV2_H
  
++<<<<<<< HEAD
 +#include "../lets_split.h"
 +
 +//void promicro_bootloader_jmp(bool program);
++=======
+ #include "quantum.h"
+ 
+ void promicro_bootloader_jmp(bool program);
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  
  #define KEYMAP( \
        k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \

diff --cc keyboards/maxipad/Makefile
index 4e2a6f00fd8ea2e3d2f25fa611a2cba9d6d98783,3f6d133c9b39a73c68f72aa9783d43a7e17a8388..c65665142afdd64bc7daadb6ac7ce06f5b466764
--- 1/keyboards/maxipad/Makefile
--- 2/keyboards/maxipad/Makefile
+++ b/keyboards/maxipad/Makefile
@@@ -1,3 -1,75 +1,81 @@@
- endif
++<<<<<<< HEAD
 +ifndef MAKEFILE_INCLUDED
 +      include ../../Makefile
++endif
++=======
+ 
+ 
+ # MCU name
+ #MCU = at90usb1287
+ MCU = atmega32u4
+ 
+ # Processor frequency.
+ #     This will define a symbol, F_CPU, in all source code files equal to the
+ #     processor frequency in Hz. You can then use this symbol in your source code to
+ #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+ #     automatically to create a 32-bit value in your source code.
+ #
+ #     This will be an integer division of F_USB below, as it is sourced by
+ #     F_USB after it has run through any CPU prescalers. Note that this value
+ #     does not *change* the processor frequency - it should merely be updated to
+ #     reflect the processor speed set externally so that the code can use accurate
+ #     software delays.
+ F_CPU = 16000000
+ 
+ 
+ #
+ # LUFA specific
+ #
+ # Target architecture (see library "Board Types" documentation).
+ ARCH = AVR8
+ 
+ # Input clock frequency.
+ #     This will define a symbol, F_USB, in all source code files equal to the
+ #     input clock frequency (before any prescaling is performed) in Hz. This value may
+ #     differ from F_CPU if prescaling is used on the latter, and is required as the
+ #     raw input clock is fed directly to the PLL sections of the AVR for high speed
+ #     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+ #     at the end, this will be done automatically to create a 32-bit value in your
+ #     source code.
+ #
+ #     If no clock division is performed on the input clock inside the AVR (via the
+ #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+ F_USB = $(F_CPU)
+ 
+ # Interrupt driven control endpoint task(+60)
+ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+ 
+ 
+ # Boot Section Size in *bytes*
+ #   Teensy halfKay   512
+ #   Teensy++ halfKay 1024
+ #   Atmel DFU loader 4096
+ #   LUFA bootloader  4096
+ #   USBaspLoader     2048
+ OPT_DEFS += -DBOOTLOADER_SIZE=512
+ 
+ 
+ # Build Options
+ #   change yes to no to disable
+ #
+ BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
+ MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+ EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
+ CONSOLE_ENABLE ?= yes        # Console for debug(+400)
+ COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+ # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+ SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
+ # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+ NKRO_ENABLE ?= no            # USB Nkey Rollover
+ BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
+ MIDI_ENABLE ?= no            # MIDI controls
+ UNICODE_ENABLE ?= no         # Unicode
+ BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+ AUDIO_ENABLE ?= no           # Audio output on port C6
+ 
+ ifndef QUANTUM_DIR
+       include ../../Makefile
+ endif
+ 
+ 
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df

diff --cc keyboards/maxipad/config.h
index 2462a5cfdae77fea15aabbd8ba0d74785a7d5b3e,59b8cebecdd85b9a2766931536d9fdc12bd33a77..4a942aae94a6d06d13961fe4016f697156cfee68
--- 1/keyboards/maxipad/config.h
--- 2/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@@ -24,9 -24,9 +24,15 @@@ along with this program.  If not, see <
  #define VENDOR_ID       0xFEED
  #define PRODUCT_ID      0x6060
  #define DEVICE_VER      0x0001
++<<<<<<< HEAD
 +#define MANUFACTURER    You
 +#define PRODUCT         maxipad
 +#define DESCRIPTION     A custom keyboard
++=======
+ #define MANUFACTURER    Wootpatoot
+ #define PRODUCT         maxipad
+ #define DESCRIPTION     g8ming keeb
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  
  /* key matrix size */
  #define MATRIX_ROWS 5

diff --cc keyboards/maxipad/keymaps/default/keymap.c
index 8a9bc4f0d4826794265e0d57493cb93f7e69281e,7ca127fe4ded35e8d0bfc1a35e463afa6c41ae9e..5e3a594ccd7efc2cce64a43ba2cd25a4c220c15e
--- 1/keyboards/maxipad/keymaps/default/keymap.c
--- 2/keyboards/maxipad/keymaps/default/keymap.c
+++ b/keyboards/maxipad/keymaps/default/keymap.c
@@@ -10,8 -10,8 +10,13 @@@ const uint16_t PROGMEM keymaps[][MATRIX
  ),
  [1] = KEYMAP(
    KC_GRV,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \
++<<<<<<< HEAD
 +  KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \
 +  KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \
++=======
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  \
  ),

diff --cc keyboards/maxipad/readme.md
index e722b6602255d716e8965c8cff19b249795fecab,964212b8a6058109e33954eb452f48ef7fd0e213..1971ce1f368c6e1b4c7993e0b1a5bfda0eeff2a6
--- 1/keyboards/maxipad/readme.md
--- 2/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@@ -3,7 -3,7 +3,11 @@@ maxipad keyboard firmwar
  
  ## Quantum MK Firmware
  
++<<<<<<< HEAD
 +For the full Quantum feature list, see [the parent readme](/).
++=======
+ For the full Quantum feature list, see [the parent readme.md](/doc/readme.md).
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  
  ## Building
  
@@@ -13,16 -13,16 +17,30 @@@ Depending on which keymap you would lik
  
  ### Default
  
++<<<<<<< HEAD
 +To build with the default keymap, simply run `make default`.
++=======
+ To build with the default keymap, simply run `make`.
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
  
  ### Other Keymaps
  
  Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
  
 -Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
++<<<<<<< HEAD
 +To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
 +
 +```
 +$ make [default|jack|<name>]
 +```
 +
 +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
++=======
+ To build the firmware binary hex file with a keymap just do `make` with `keymap` option like:
+ 
+ ```
+ $ make keymap=[default|jack|<name>]
+ ```
+ 
++Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
++>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df