summaryrefslogtreecommitdiff
path: root/keyboards/lets_split/rev2
diff options
context:
space:
mode:
authorclimbalima2016-11-16 19:26:38 -0500
committerclimbalima2016-11-16 19:26:38 -0500
commit5cac51a773bef7fc8064390ac3ee499121a9611d (patch)
tree765b36006bb3d60f51dd0af27e89dac7bce2a59b /keyboards/lets_split/rev2
parent1dd6ceb45dfcf5f0991b84fea5a761a35df7fcda (diff)
parentbce6e52391da7c5f620c96a91857940f0dee19df (diff)
Merge https://github.com/climbalima/qmk_firmware
Diffstat (limited to 'keyboards/lets_split/rev2')
-rw-r--r--keyboards/lets_split/rev2/config.h14
-rw-r--r--keyboards/lets_split/rev2/rev2.c6
-rw-r--r--keyboards/lets_split/rev2/rev2.h6
3 files changed, 26 insertions, 0 deletions
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, \