Merge branch 'master' of https://github.com/climbalima/qmk_firmware
second trydaktil_thumb_popravljen
commit
ec0db2933c
|
@ -25,9 +25,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PRODUCT_ID 0x3060
|
||||
#define DEVICE_VER 0x0001
|
||||
#define MANUFACTURER Wootpatoot
|
||||
#define PRODUCT Lets Split v2
|
||||
#define PRODUCT Lets Split
|
||||
#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 USE_I2C
|
||||
|
@ -85,6 +97,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
//#define NO_ACTION_ONESHOT
|
||||
//#define NO_ACTION_MACRO
|
||||
//#define NO_ACTION_FUNCTION
|
||||
<<<<<<< HEAD
|
||||
#ifdef SUBPROJECT_rev1
|
||||
#include "rev1/config.h"
|
||||
#endif
|
||||
|
@ -92,3 +105,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#include "rev2/config.h"
|
||||
#endif
|
||||
#endif
|
||||
=======
|
||||
|
||||
#endif
|
||||
>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d
|
||||
|
|
Loading…
Reference in New Issue