summaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev1/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev1/config.h')
-rw-r--r--keyboards/lets_split/rev1/config.h26
1 files changed, 0 insertions, 26 deletions
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index da5b476733..825e5ec245 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -25,11 +25,8 @@ 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 */
@@ -44,15 +41,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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
@@ -80,21 +73,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
-/* 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
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
@@ -113,8 +91,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