fix up lets_split keymaps

diff --git a/keyboards/lets_split/config.h b/keyboards/lets_split/config.h
index 6d72542423854d6d783c62d816817ee84f10f82a..c910d8f24f0ceee711b9e7319639e1fd23209680 100644 (file)
--- a/keyboards/lets_split/config.h
+++ b/keyboards/lets_split/config.h
@@ -21,14 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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 (file)
index 457a3d0..0000000
--- 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 a2c6b22b82088e2e09d78c6a15d1e3f916ce379f..e3cb310d1e3023a2e1915405d30b39672a42d035 100644 (file)
--- 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 457a3d01d4a4f6d3a66baaac45d37543aacf7888..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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 1e2d1b9a6631985612d77013ec8ccfb88328ba6b..b2a6e604efa3c6da5bf444f12fbac0962379a24b 100644 (file)
--- 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 800d9a7e7953c5f0d0a6013fa24fba6ea25bc78e..7c128421dd815c1813d478a4b26d202ebaae1bcc 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 #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 6bf9f0f0386df24b5f4aac69840b3f6cfa149209..1d38368fd7005e1f198f7bd6beccaeb802d87fe0 100644 (file)
--- 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 d0619c24895168d54fce58db7e2093e670883a6d..1f0603d501e73035531e84673cb8caf57de890cf 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 #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 0bc106ef2711be548fc35072b9ae59128203cf0e..16b93b3d8aca55192f339cf210f7c7580454e0d1 100644 (file)
--- 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 438c68f42064475cc44ca4dbab9e96cc46c9366f..0543e8930d29c05c04f1a71a55a742d1b9e9797e 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 #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 0c4e8e7de1205744db77cc86bf5bbf2defda24d5..16b93b3d8aca55192f339cf210f7c7580454e0d1 100644 (file)
--- 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