drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

should have fixed conflixed

Browse source
This commit is contained in:
climbalima 2016-11-16 19:49:38 -05:00
parent 668c739702
commit 21b6b4e6c4
13 changed files with 10 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

18
keyboards/lets_split/rev2/config.h
View file

@ -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