summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
authorclimbalima <climbalima@gmail.com>2016-11-10 20:06:54 -0500
committerclimbalima <climbalima@gmail.com>2016-11-10 20:06:54 -0500
commitec0db2933cc2935a985087a4021f64f2422a3a46 (patch)
treebe0719a42a1508dd84ccef4b9bcbb08146395eb7 /keyboards
parentb5cecb4cc9df2d541050a9a95f48c1d5fb796ae4 (diff)
parent79f82d3d80a24483d14b078d325bb0f45af58e3d (diff)
Merge branch 'master' of https://github.com/climbalima/qmk_firmware
second try
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/lets_split/config.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 245529ae08..a5394c5e4d 100644
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -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,10 +97,15 @@ 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
#ifdef SUBPROJECT_rev2
#include "rev2/config.h"
#endif
-#endif \ No newline at end of file
+#endif
+=======
+
+#endif
+>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d