Merge pull request #1172 from nooges/hexwire-fixes

Let's Split hexwire keymap fixes

5 files changed, 45 insertions, 26 deletions

diff --git a/keyboards/lets_split/keymaps/hexwire/Makefile b/keyboards/lets_split/keymaps/hexwire/Makefile
index 1e3cebb145..1e57612788 100644
--- a/keyboards/lets_split/keymaps/hexwire/Makefile
+++ b/keyboards/lets_split/keymaps/hexwire/Makefile
@@ -1 +1,5 @@
 RGBLIGHT_ENABLE = yes
+
+ifndef QUANTUM_DIR
+	include ../../../../Makefile
+endif
diff --git a/keyboards/lets_split/keymaps/hexwire/compact_keymap.h b/keyboards/lets_split/keymaps/hexwire/compact_keymap.h
deleted file mode 100644
index d9d063fbfe..0000000000
--- a/keyboards/lets_split/keymaps/hexwire/compact_keymap.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef COMPACT_KEYMAP_H
-#define COMPACT_KEYMAP_H
-
-#define COMPACT_KEYMAP( \
-  k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
-  k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
-  k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
-  k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \
-  ) \
-  { \
-    { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05 }, \
-    { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15 }, \
-    { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25 }, \
-    { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35 }, \
-    { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45 }, \
-    { KC_##k50, KC_##k51, KC_##k52, KC_##k53, KC_##k54, KC_##k55 }, \
-    { KC_##k60, KC_##k61, KC_##k62, KC_##k63, KC_##k64, KC_##k65 }, \
-    { KC_##k70, KC_##k71, KC_##k72, KC_##k73, KC_##k74, KC_##k75 } \
-  }
-
-#define KC_ KC_TRNS
-
-#endif
\ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/hexwire/config.h b/keyboards/lets_split/keymaps/hexwire/config.h
index 983f8e352e..9c8c6d7f40 100644
--- a/keyboards/lets_split/keymaps/hexwire/config.h
+++ b/keyboards/lets_split/keymaps/hexwire/config.h
@@ -18,10 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_SERIAL
 
-#define EE_HANDS
+#define TAPPING_TERM 150
 
 #undef RGBLED_NUM
-#define RGB_DI_PIN B0
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 8
 #define RGBLIGHT_HUE_STEP 8
@@ -30,9 +29,41 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifdef SUBPROJECT_rev1
     #include "../../rev1/config.h"
+    #define COMPACT_KEYMAP( \
+      k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
+      k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \
+      k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
+      k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75 \
+    ) \
+    { \
+      { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05 }, \
+      { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15 }, \
+      { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25 }, \
+      { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35 }, \
+      { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45 }, \
+      { KC_##k50, KC_##k51, KC_##k52, KC_##k53, KC_##k54, KC_##k55 }, \
+      { KC_##k60, KC_##k61, KC_##k62, KC_##k63, KC_##k64, KC_##k65 }, \
+      { KC_##k70, KC_##k71, KC_##k72, KC_##k73, KC_##k74, KC_##k75 } \
+    }
 #endif
 #ifdef SUBPROJECT_rev2
     #include "../../rev2/config.h"
+    #define COMPACT_KEYMAP( \
+      k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
+      k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
+      k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
+      k30, k31, k32, k33, k34, k35, k75, k74, k73, k72, k71, k70 \
+      ) \
+      { \
+        { KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05 }, \
+        { KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15 }, \
+        { KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25 }, \
+        { KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35 }, \
+        { KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45 }, \
+        { KC_##k50, KC_##k51, KC_##k52, KC_##k53, KC_##k54, KC_##k55 }, \
+        { KC_##k60, KC_##k61, KC_##k62, KC_##k63, KC_##k64, KC_##k65 }, \
+        { KC_##k70, KC_##k71, KC_##k72, KC_##k73, KC_##k74, KC_##k75 } \
+      }
 #endif
 #ifdef SUBPROJECT_rev2fliphalf
 	#include "../../rev2fliphalf/config.h"
diff --git a/keyboards/lets_split/keymaps/hexwire/keymap.c b/keyboards/lets_split/keymaps/hexwire/keymap.c
index 796a1fcab0..f8370490d6 100644
--- a/keyboards/lets_split/keymaps/hexwire/keymap.c
+++ b/keyboards/lets_split/keymaps/hexwire/keymap.c
@@ -1,7 +1,6 @@
 #include "lets_split.h"
 #include "action_layer.h"
 #include "eeconfig.h"
-#include "compact_keymap.h"
 
 extern keymap_config_t keymap_config;
 
@@ -25,6 +24,7 @@ enum custom_keycodes {
   ADJUST,
 };
 
+#define KC_ KC_TRNS
 #define _______ KC_TRNS
 
 #define KC_CAPW LGUI(LSFT(KC_3))        // Capture whole screen
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index 2f5bde9531..5fb87cf5d7 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -63,6 +63,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
 
+/* ws2812 RGB LED */
+#define RGB_DI_PIN D3
+#define RGBLIGHT_TIMER
+#define RGBLED_NUM 16    // Number of LEDs
+#define ws2812_PORTREG  PORTD
+#define ws2812_DDRREG   DDRD
+
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.