Updates bootloader settings, adds file size check (#2029)

[qmk_firmware.git] / keyboards / lets_split / rev1 / config.h

diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index da5b4767335c1ae580e798e93598db813ee53a2e..73f90e715dfe2f41256aff161cf8b9597eb8d964 100644 (file)
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -1,5 +1,6 @@
 /*
 Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
 
 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
@@ -15,8 +16,8 @@ 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_H
-#define CONFIG_H
+#ifndef REV1_CONFIG_H
+#define REV1_CONFIG_H
 
 #include "config_common.h"
 
@@ -25,11 +26,7 @@ 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 */
@@ -40,26 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // wiring of each half
 #define MATRIX_ROW_PINS { B5, B4, E6, D7 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-#define CATERINA_BOOTLOADER
-
-// #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
-// #define I2C_MASTER_RIGHT
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
+// #define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
@@ -81,19 +59,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 )
 
 /* ws2812 RGB LED */
-<<<<<<< HEAD
-#define RGB_DI_PIN D4
+#define RGB_DI_PIN D3
 #define RGBLIGHT_TIMER
-#define RGBLED_NUM 8     // Number of LEDs
-=======
+#define RGBLED_NUM 16    // 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
 
 /*
  * Feature disable options
@@ -113,8 +83,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-<<<<<<< HEAD
-#endif
-=======
 #endif
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df