From 4ad0bbd6724addd72680a37949280a0b10eb2460 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Tue, 14 Nov 2017 17:37:57 -0500 Subject: [PATCH] fix up lets_split keymaps --- keyboards/lets_split/config.h | 10 ---------- keyboards/lets_split/keymaps/DE_simple/Makefile | 3 --- keyboards/lets_split/keymaps/DE_simple/keymap.c | 2 +- keyboards/lets_split/keymaps/DE_simple/rules.mk | 3 --- keyboards/lets_split/lets_split.h | 4 +--- keyboards/lets_split/rev1/config.h | 2 +- keyboards/lets_split/rev1/rev1.h | 2 +- keyboards/lets_split/rev2/config.h | 2 +- keyboards/lets_split/rev2/rev2.h | 2 +- keyboards/lets_split/sockets/config.h | 2 +- keyboards/lets_split/sockets/sockets.h | 4 +++- 11 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 keyboards/lets_split/keymaps/DE_simple/Makefile diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h index 6d7254242..c910d8f24 100644 --- a/keyboards/lets_split/config.h +++ b/keyboards/lets_split/config.h @@ -21,14 +21,4 @@ along with this program. If not, see . #include "config_common.h" -#ifdef SUBPROJECT_rev1 - #include "rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "rev2/config.h" -#endif -#ifdef SUBPROJECT_sockets - #include "sockets/config.h" -#endif - #endif diff --git a/keyboards/lets_split/keymaps/DE_simple/Makefile b/keyboards/lets_split/keymaps/DE_simple/Makefile deleted file mode 100644 index 457a3d01d..000000000 --- a/keyboards/lets_split/keymaps/DE_simple/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/lets_split/keymaps/DE_simple/keymap.c b/keyboards/lets_split/keymaps/DE_simple/keymap.c index a2c6b22b8..e3cb310d1 100644 --- a/keyboards/lets_split/keymaps/DE_simple/keymap.c +++ b/keyboards/lets_split/keymaps/DE_simple/keymap.c @@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef AUDIO_ENABLE -float tone_qwertz[][2] = SONG(QWERTZ_SOUND); +float tone_qwertz[][2] = SONG(QWERTY_SOUND); float tone_dvorak[][2] = SONG(DVORAK_SOUND); float tone_colemak[][2] = SONG(COLEMAK_SOUND); #endif diff --git a/keyboards/lets_split/keymaps/DE_simple/rules.mk b/keyboards/lets_split/keymaps/DE_simple/rules.mk index 457a3d01d..e69de29bb 100644 --- a/keyboards/lets_split/keymaps/DE_simple/rules.mk +++ b/keyboards/lets_split/keymaps/DE_simple/rules.mk @@ -1,3 +0,0 @@ -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/lets_split/lets_split.h b/keyboards/lets_split/lets_split.h index 1e2d1b9a6..b2a6e604e 100644 --- a/keyboards/lets_split/lets_split.h +++ b/keyboards/lets_split/lets_split.h @@ -3,13 +3,11 @@ #include "quantum.h" -#include QMK_KEYBOARD_H - #ifdef KEYBOARD_lets_split_rev1 #include "rev1.h" #elif KEYBOARD_lets_split_rev2 #include "rev2.h" -#else +#elif KEYBOARD_lets_split_sockets #include "sockets.h" #endif diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h index 800d9a7e7..7c128421d 100644 --- a/keyboards/lets_split/rev1/config.h +++ b/keyboards/lets_split/rev1/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #ifndef REV1_CONFIG_H #define REV1_CONFIG_H -#include "../config.h" +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED diff --git a/keyboards/lets_split/rev1/rev1.h b/keyboards/lets_split/rev1/rev1.h index 6bf9f0f03..1d38368fd 100644 --- a/keyboards/lets_split/rev1/rev1.h +++ b/keyboards/lets_split/rev1/rev1.h @@ -1,7 +1,7 @@ #ifndef REV1_H #define REV1_H -#include "../lets_split.h" +#include "lets_split.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h index d0619c248..1f0603d50 100644 --- a/keyboards/lets_split/rev2/config.h +++ b/keyboards/lets_split/rev2/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #ifndef REV2_CONFIG_H #define REV2_CONFIG_H -#include "../config.h" +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED diff --git a/keyboards/lets_split/rev2/rev2.h b/keyboards/lets_split/rev2/rev2.h index 0bc106ef2..16b93b3d8 100644 --- a/keyboards/lets_split/rev2/rev2.h +++ b/keyboards/lets_split/rev2/rev2.h @@ -1,7 +1,7 @@ #ifndef REV2_H #define REV2_H -#include "../lets_split.h" +#include "lets_split.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/lets_split/sockets/config.h b/keyboards/lets_split/sockets/config.h index 438c68f42..0543e8930 100644 --- a/keyboards/lets_split/sockets/config.h +++ b/keyboards/lets_split/sockets/config.h @@ -19,7 +19,7 @@ along with this program. If not, see . #ifndef SOCKETS_CONFIG_H #define SOCKETS_CONFIG_H -#include "../config.h" +#include "config_common.h" /* USB Device descriptor parameter */ #define VENDOR_ID 0xBEE5 diff --git a/keyboards/lets_split/sockets/sockets.h b/keyboards/lets_split/sockets/sockets.h index 0c4e8e7de..16b93b3d8 100644 --- a/keyboards/lets_split/sockets/sockets.h +++ b/keyboards/lets_split/sockets/sockets.h @@ -1,7 +1,7 @@ #ifndef REV2_H #define REV2_H -#include "../lets_split.h" +#include "lets_split.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" @@ -57,4 +57,6 @@ } #endif +#define LAYOUT_ortho_4x12 KEYMAP + #endif