10 files changed, 170 insertions, 28 deletions
diff --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile
index 4e2a6f00f..6ce6e4373 100644
--- a/keyboards/lets_split/Makefile
+++ b/keyboards/lets_split/Makefile
@@ -1,3 +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
 \ No newline at end of file
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 5bee55319..91b11f03f 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -61,6 +61,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#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 +72,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #include "rev2/config.h"
 #endif
 #endif
+<<<<<<< HEAD
+=======
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c
index fc41c01fd..41b9b8d8f 100644
--- a/keyboards/lets_split/keymaps/default/keymap.c
+++ b/keyboards/lets_split/keymaps/default/keymap.c
@@ -29,6 +29,7 @@ enum custom_keycodes {
 #define XXXXXXX KC_NO
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+<<<<<<< HEAD
 /* Qwerty
 * ,-----------------------------------------------------------------------------------.
@@ -82,41 +83,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  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
 ),
+[3] = KEYMAP( \
-/* Lower
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
- * ,-----------------------------------------------------------------------------------.
- * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | 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, \
  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
 ),
+[4] = KEYMAP( \
-/* Raise
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
- * ,-----------------------------------------------------------------------------------.
- * |   `  |   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, \
  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 \
 ),
@@ -139,6 +128,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
+=======
+  _______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
+),
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
 };
 #ifdef AUDIO_ENABLE
diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c
index 851299aa2..8bb33f951 100644
--- a/keyboards/lets_split/lets_split.c
+++ b/keyboards/lets_split/lets_split.c
@@ -1,2 +1,6 @@
 #include "lets_split.h"
+<<<<<<< HEAD
+=======
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index f4d900acc..da5b47673 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -25,7 +25,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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 +45,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #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 +81,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 /* 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 +113,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
+<<<<<<< HEAD
 #endif
+=======
+#endif
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c
index c505d3a6e..41dd1e353 100644
--- a/keyboards/lets_split/rev1/rev1.c
+++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,9 +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 --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h
index 50bda0315..998b2be7c 100644
--- a/keyboards/lets_split/rev1/rev1.h
+++ b/keyboards/lets_split/rev1/rev1.h
@@ -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 --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index cd152e331..19c137e56 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -41,11 +41,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #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 +77,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 /* 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 +109,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
+<<<<<<< HEAD
 #endif
+=======
+#endif
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index c505d3a6e..41dd1e353 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -24,9 +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 --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h
index a8b0f0f4c..9e251ca57 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -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 --git a/keyboards/lets_split/Makefile b/keyboards/lets_split/Makefile index 4e2a6f00f..6ce6e4373 100644 --- a/keyboards/lets_split/Makefile +++ b/keyboards/lets_split/Makefile
@@ -1,3 +1,82 @@
		1	<<<<<<< HEAD
1	ifndef MAKEFILE_INCLUDED	2	ifndef MAKEFILE_INCLUDED
		3	=======
		4	SRC += matrix.c \
		5	i2c.c \
		6	split_util.c \
		7	serial.c
		8
		9	# MCU name
		10	#MCU = at90usb1287
		11	MCU = atmega32u4
		12
		13	# Processor frequency.
		14	# This will define a symbol, F_CPU, in all source code files equal to the
		15	# processor frequency in Hz. You can then use this symbol in your source code to
		16	# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
		17	# automatically to create a 32-bit value in your source code.
		18	#
		19	# This will be an integer division of F_USB below, as it is sourced by
		20	# F_USB after it has run through any CPU prescalers. Note that this value
		21	# does not change the processor frequency - it should merely be updated to
		22	# reflect the processor speed set externally so that the code can use accurate
		23	# software delays.
		24	F_CPU = 16000000
		25
		26	#
		27	# LUFA specific
		28	#
		29	# Target architecture (see library "Board Types" documentation).
		30	ARCH = AVR8
		31
		32	# Input clock frequency.
		33	# This will define a symbol, F_USB, in all source code files equal to the
		34	# input clock frequency (before any prescaling is performed) in Hz. This value may
		35	# differ from F_CPU if prescaling is used on the latter, and is required as the
		36	# raw input clock is fed directly to the PLL sections of the AVR for high speed
		37	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
		38	# at the end, this will be done automatically to create a 32-bit value in your
		39	# source code.
		40	#
		41	# If no clock division is performed on the input clock inside the AVR (via the
		42	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
		43	F_USB = $(F_CPU)
		44
		45	# Interrupt driven control endpoint task(+60)
		46	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
		47
		48
		49	# Boot Section Size in bytes
		50	# Teensy halfKay 512
		51	# Teensy++ halfKay 1024
		52	# Atmel DFU loader 4096
		53	# LUFA bootloader 4096
		54	# USBaspLoader 2048
		55	OPT_DEFS += -DBOOTLOADER_SIZE=4096
		56
		57	# Build Options
		58	# change to "no" to disable the options, or define them in the Makefile in
		59	# the appropriate keymap folder that will get included automatically
		60	#
		61	BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
		62	MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
		63	EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
		64	CONSOLE_ENABLE ?= no # Console for debug(+400)
		65	COMMAND_ENABLE ?= yes # Commands for debug and configuration
		66	NKRO_ENABLE ?= no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
		67	BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality
		68	MIDI_ENABLE ?= no # MIDI controls
		69	AUDIO_ENABLE ?= yes # Audio output on port C6
		70	UNICODE_ENABLE ?= no # Unicode
		71	BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
		72	RGBLIGHT_ENABLE ?= no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
		73	USE_I2C ?= yes
		74	# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
		75	SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
		76
		77	CUSTOM_MATRIX = yes
		78	SUBPROJECT_DEFAULT = rev2
		79	ifndef QUANTUM_DIR
		80	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
2	include ../../Makefile	81	include ../../Makefile
3	endif \ No newline at end of file	82	endif \ No newline at end of file


diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 5bee55319..91b11f03f 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h
@@ -61,6 +61,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
61	//#define NO_ACTION_ONESHOT	61	//#define NO_ACTION_ONESHOT
62	//#define NO_ACTION_MACRO	62	//#define NO_ACTION_MACRO
63	//#define NO_ACTION_FUNCTION	63	//#define NO_ACTION_FUNCTION
		64	<<<<<<< HEAD
		65	=======
		66	<<<<<<< HEAD
		67	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
64	#ifdef SUBPROJECT_rev1	68	#ifdef SUBPROJECT_rev1
65	#include "rev1/config.h"	69	#include "rev1/config.h"
66	#endif	70	#endif
@@ -68,3 +72,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
68	#include "rev2/config.h"	72	#include "rev2/config.h"
69	#endif	73	#endif
70	#endif	74	#endif
		75	<<<<<<< HEAD
		76	=======
		77
		78
		79
		80	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df


diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index fc41c01fd..41b9b8d8f 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c
@@ -29,6 +29,7 @@ enum custom_keycodes {
29	#define XXXXXXX KC_NO	29	#define XXXXXXX KC_NO
30		30
31	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	31	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		32	<<<<<<< HEAD
32		33
33	/* Qwerty	34	/* Qwerty
34	* ,-----------------------------------------------------------------------------------.	35	* ,-----------------------------------------------------------------------------------.
@@ -82,41 +83,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82	KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \	83	KC_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \
83	KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \	84	KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT , \
84	ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \	85	ADJUST, KC_LCTL, KC_LALT, KC_LGUI, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
		86	=======
		87	[0] = KEYMAP( \
		88	KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \
		89	KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \
		90	KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \
		91	KC_LCTL, _LOWER, KC_LGUI, KC_LALT, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \
		92	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
85	),	93	),
86		94	[3] = KEYMAP( \
87	/* Lower	95	KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, \
88	* ,-----------------------------------------------------------------------------------.
89	* \| ~ \| ! \| @ \| # \| $ \| % \| ^ \| & \| * \| ( \| ) \| Bksp \|
90	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
91	* \| Del \| F1 \| F2 \| F3 \| F4 \| F5 \| F6 \| _ \| + \| \| \ \| \| \|
92	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
93	* \| \| F7 \| F8 \| F9 \| F10 \| F11 \| F12 \|ISO ~ \|ISO \| \| \| \|Enter \|
94	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
95	* \| \| \| \| \| \| \| \| Next \| Vol- \| Vol+ \| Play \|
96	* `-----------------------------------------------------------------------------------'
97	*/
98	[_LOWER] = KEYMAP( \
99	KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
100	KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \	96	KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
101	_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \	97	_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
		98	<<<<<<< HEAD
102	_______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \	99	_______, _______, _______, _______, _______, KC_BSPC, MT(MOD_LSFT, KC_BSPC), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
		100	=======
		101	_______, _______, _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
		102	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
103	),	103	),
104		104	[4] = KEYMAP( \
105	/* Raise	105	KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, \
106	* ,-----------------------------------------------------------------------------------.
107	* \| ` \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 \| 7 \| 8 \| 9 \| 0 \| Bksp \|
108	* \|------+------+------+------+------+-------------+------+------+------+------+------\|
109	* \| Del \| F1 \| F2 \| F3 \| F4 \| F5 \| F6 \| - \| = \| [ \| ] \| \ \|
110	* \|------+------+------+------+------+------\|------+------+------+------+------+------\|
111	* \| \| F7 \| F8 \| F9 \| F10 \| F11 \| F12 \|ISO # \|ISO / \| \| \|Enter \|
112	* \|------+------+------+------+------+------+------+------+------+------+------+------\|
113	* \| \| \| \| \| \| \| \| Next \| Vol- \| Vol+ \| Play \|
114	* `-----------------------------------------------------------------------------------'
115	*/
116	[_RAISE] = KEYMAP( \
117	KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \
118	KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \	106	KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \
119	_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \	107	_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \
		108	<<<<<<< HEAD
120	_______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \	109	_______, _______, _______, _______, _______, KC_ENT, MT(MOD_LSFT, KC_ENT), _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
121	),	110	),
122		111
@@ -139,6 +128,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
139	)	128	)
140		129
141		130
		131	=======
		132	_______, _______, _______, _______, _______, KC_ENT, KC_ENT, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
		133	),
		134	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
142	};	135	};
143		136
144	#ifdef AUDIO_ENABLE	137	#ifdef AUDIO_ENABLE


diff --git a/keyboards/lets_split/lets_split.c b/keyboards/lets_split/lets_split.c index 851299aa2..8bb33f951 100644 --- a/keyboards/lets_split/lets_split.c +++ b/keyboards/lets_split/lets_split.c
@@ -1,2 +1,6 @@
1	#include "lets_split.h"	1	#include "lets_split.h"
2		2
		3	<<<<<<< HEAD
		4	=======
		5
		6	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df


diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index f4d900acc..da5b47673 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h
@@ -25,7 +25,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
25	#define PRODUCT_ID 0x3060	25	#define PRODUCT_ID 0x3060
26	#define DEVICE_VER 0x0001	26	#define DEVICE_VER 0x0001
27	#define MANUFACTURER Wootpatoot	27	#define MANUFACTURER Wootpatoot
		28	<<<<<<< HEAD
28	#define PRODUCT Lets Split	29	#define PRODUCT Lets Split
		30	=======
		31	#define PRODUCT Lets Split v1
		32	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
29	#define DESCRIPTION A split keyboard for the cheap makers	33	#define DESCRIPTION A split keyboard for the cheap makers
30		34
31	/* key matrix size */	35	/* key matrix size */
@@ -41,11 +45,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41		45
42	// #define USE_I2C	46	// #define USE_I2C
43		47
		48	<<<<<<< HEAD
44	// Use serial if not using I2C	49	// Use serial if not using I2C
45	#ifndef USE_I2C	50	#ifndef USE_I2C
46	# define USE_SERIAL	51	# define USE_SERIAL
47	#endif	52	#endif
48		53
		54	=======
		55	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
49	// #define EE_HANDS	56	// #define EE_HANDS
50		57
51	#define I2C_MASTER_LEFT	58	#define I2C_MASTER_LEFT
@@ -74,9 +81,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74	)	81	)
75		82
76	/* ws2812 RGB LED */	83	/* ws2812 RGB LED */
		84	<<<<<<< HEAD
77	#define RGB_DI_PIN D4	85	#define RGB_DI_PIN D4
78	#define RGBLIGHT_TIMER	86	#define RGBLIGHT_TIMER
79	#define RGBLED_NUM 8 // Number of LEDs	87	#define RGBLED_NUM 8 // Number of LEDs
		88	=======
		89	#define ws2812_PORTREG PORTD
		90	#define ws2812_DDRREG DDRD
		91	#define ws2812_pin PD1
		92	#define RGBLED_NUM 28 // Number of LEDs
		93	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
80	#define RGBLIGHT_HUE_STEP 10	94	#define RGBLIGHT_HUE_STEP 10
81	#define RGBLIGHT_SAT_STEP 17	95	#define RGBLIGHT_SAT_STEP 17
82	#define RGBLIGHT_VAL_STEP 17	96	#define RGBLIGHT_VAL_STEP 17
@@ -99,4 +113,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
99	//#define NO_ACTION_MACRO	113	//#define NO_ACTION_MACRO
100	//#define NO_ACTION_FUNCTION	114	//#define NO_ACTION_FUNCTION
101		115
		116	<<<<<<< HEAD
102	#endif	117	#endif
		118	=======
		119	#endif
		120	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df


diff --git a/keyboards/lets_split/rev1/rev1.c b/keyboards/lets_split/rev1/rev1.c index c505d3a6e..41dd1e353 100644 --- a/keyboards/lets_split/rev1/rev1.c +++ b/keyboards/lets_split/rev1/rev1.c
@@ -24,9 +24,15 @@ void matrix_init_kb(void) {
24	};	24	};
25		25
26	void shutdown_user(void) {	26	void shutdown_user(void) {
		27	<<<<<<< HEAD
27	#ifdef AUDIO_ENABLE	28	#ifdef AUDIO_ENABLE
28	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);	29	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
29	_delay_ms(150);	30	_delay_ms(150);
30	stop_all_notes();	31	stop_all_notes();
31	#endif	32	#endif
		33	=======
		34	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
		35	_delay_ms(150);
		36	stop_all_notes();
		37	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
32	}	38	}


diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 50bda0315..998b2be7c 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h
@@ -1,9 +1,15 @@
1	#ifndef REV1_H	1	#ifndef REV1_H
2	#define REV1_H	2	#define REV1_H
3		3
		4	<<<<<<< HEAD
4	#include "../lets_split.h"	5	#include "../lets_split.h"
5		6
6	//void promicro_bootloader_jmp(bool program);	7	//void promicro_bootloader_jmp(bool program);
		8	=======
		9	#include "quantum.h"
		10
		11	void promicro_bootloader_jmp(bool program);
		12	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
7		13
8	#define KEYMAP( \	14	#define KEYMAP( \
9	k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \	15	k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \


diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index cd152e331..19c137e56 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h
@@ -41,11 +41,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
41		41
42	// #define USE_I2C	42	// #define USE_I2C
43		43
		44	<<<<<<< HEAD
44	// Use serial if not using I2C	45	// Use serial if not using I2C
45	#ifndef USE_I2C	46	#ifndef USE_I2C
46	# define USE_SERIAL	47	# define USE_SERIAL
47	#endif	48	#endif
48		49
		50	=======
		51	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
49	// #define EE_HANDS	52	// #define EE_HANDS
50		53
51	#define I2C_MASTER_LEFT	54	#define I2C_MASTER_LEFT
@@ -74,9 +77,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
74	)	77	)
75		78
76	/* ws2812 RGB LED */	79	/* ws2812 RGB LED */
		80	<<<<<<< HEAD
77	#define RGB_DI_PIN D3	81	#define RGB_DI_PIN D3
78	#define RGBLIGHT_TIMER	82	#define RGBLIGHT_TIMER
79	#define RGBLED_NUM 12 // Number of LEDs	83	#define RGBLED_NUM 12 // Number of LEDs
		84	=======
		85	#define ws2812_PORTREG PORTD
		86	#define ws2812_DDRREG DDRD
		87	#define ws2812_pin PD1
		88	#define RGBLED_NUM 28 // Number of LEDs
		89	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
80	#define RGBLIGHT_HUE_STEP 10	90	#define RGBLIGHT_HUE_STEP 10
81	#define RGBLIGHT_SAT_STEP 17	91	#define RGBLIGHT_SAT_STEP 17
82	#define RGBLIGHT_VAL_STEP 17	92	#define RGBLIGHT_VAL_STEP 17
@@ -99,4 +109,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
99	//#define NO_ACTION_MACRO	109	//#define NO_ACTION_MACRO
100	//#define NO_ACTION_FUNCTION	110	//#define NO_ACTION_FUNCTION
101		111
		112	<<<<<<< HEAD
102	#endif	113	#endif
		114	=======
		115	#endif
		116	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df


diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c index c505d3a6e..41dd1e353 100644 --- a/keyboards/lets_split/rev2/rev2.c +++ b/keyboards/lets_split/rev2/rev2.c
@@ -24,9 +24,15 @@ void matrix_init_kb(void) {
24	};	24	};
25		25
26	void shutdown_user(void) {	26	void shutdown_user(void) {
		27	<<<<<<< HEAD
27	#ifdef AUDIO_ENABLE	28	#ifdef AUDIO_ENABLE
28	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);	29	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
29	_delay_ms(150);	30	_delay_ms(150);
30	stop_all_notes();	31	stop_all_notes();
31	#endif	32	#endif
		33	=======
		34	PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
		35	_delay_ms(150);
		36	stop_all_notes();
		37	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
32	}	38	}


diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index a8b0f0f4c..9e251ca57 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,9 +1,15 @@
1	#ifndef REV2_H	1	#ifndef REV2_H
2	#define REV2_H	2	#define REV2_H
3		3
		4	<<<<<<< HEAD
4	#include "../lets_split.h"	5	#include "../lets_split.h"
5		6
6	//void promicro_bootloader_jmp(bool program);	7	//void promicro_bootloader_jmp(bool program);
		8	=======
		9	#include "quantum.h"
		10
		11	void promicro_bootloader_jmp(bool program);
		12	>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
7		13
8	#define KEYMAP( \	14	#define KEYMAP( \
9	k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \	15	k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \