aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/lets_split/rev2/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev2/config.h')
-rw-r--r--keyboards/lets_split/rev2/config.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index bf618704c..19c137e56 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -41,6 +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
@@ -69,10 +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
@@ -95,4 +109,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-#endif \ No newline at end of file
+<<<<<<< HEAD
+#endif
+=======
+#endif
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df