diff options
Diffstat (limited to 'keyboards/lets_split/config.h')
| -rw-r--r-- | keyboards/lets_split/config.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 05439facb..a5394c5e4 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -28,6 +28,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 @@ -37,6 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 @@ -94,5 +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 +======= #endif +>>>>>>> 79f82d3d80a24483d14b078d325bb0f45af58e3d |