darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/climbalima/qmk_firmware

Browse source 
second try
This commit is contained in:
climbalima 2016-11-10 20:06:54 -05:00
commit ec0db2933c
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
keyboards/lets_split/config.h
View file

@ -25,9 +25,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT_ID 0x3060 #define PRODUCT_ID 0x3060
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER Wootpatoot #define MANUFACTURER Wootpatoot
#define PRODUCT Lets Split v2 #define PRODUCT Lets Split
#define DESCRIPTION A split keyboard for the cheap makers #define DESCRIPTION A split keyboard for the cheap makers
<<<<<<< HEAD
=======
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 8
#define MATRIX_COLS 6
// wiring of each half
#define MATRIX_ROW_PINS { B5, B4, E6, D7 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d
#define CATERINA_BOOTLOADER #define CATERINA_BOOTLOADER
// #define USE_I2C // #define USE_I2C
@ -85,10 +97,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
<<<<<<< HEAD
#ifdef SUBPROJECT_rev1 #ifdef SUBPROJECT_rev1
#include "rev1/config.h" #include "rev1/config.h"
#endif #endif
#ifdef SUBPROJECT_rev2 #ifdef SUBPROJECT_rev2
#include "rev2/config.h" #include "rev2/config.h"
#endif #endif
#endif #endif
=======
#endif
>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d