summaryrefslogtreecommitdiff
path: root/keyboards/lets_split/rev2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/lets_split/rev2')
-rw-r--r--keyboards/lets_split/rev2/config.h18
-rw-r--r--keyboards/lets_split/rev2/rev2.c6
-rw-r--r--keyboards/lets_split/rev2/rev2.h5
3 files changed, 3 insertions, 26 deletions
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index 19c137e56c..e9689d773d 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -41,14 +41,11 @@ 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
@@ -77,19 +74,11 @@ 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
/*
* Feature disable options
@@ -109,8 +98,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
-<<<<<<< HEAD
-#endif
-=======
-#endif
->>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
+
+#endif \ No newline at end of file
diff --git a/keyboards/lets_split/rev2/rev2.c b/keyboards/lets_split/rev2/rev2.c
index 41dd1e3535..c505d3a6e3 100644
--- a/keyboards/lets_split/rev2/rev2.c
+++ b/keyboards/lets_split/rev2/rev2.c
@@ -24,15 +24,9 @@ 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 9e251ca57d..990976de2b 100644
--- a/keyboards/lets_split/rev2/rev2.h
+++ b/keyboards/lets_split/rev2/rev2.h
@@ -1,15 +1,12 @@
#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
+//void promicro_bootloader_jmp(bool program);
#define KEYMAP( \
k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \