From fadb69e2031a259248dd575384da8846ba0c2aa3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 15 Aug 2019 22:01:34 +0100
Subject: Refactor of lets_split_eh to enable RGB split animations (#6411)

---
 keyboards/lets_split_eh/config.h                 |  8 +-------
 keyboards/lets_split_eh/eh/config.h              | 18 ++++++++----------
 keyboards/lets_split_eh/eh/eh.c                  | 13 -------------
 keyboards/lets_split_eh/eh/eh.h                  |  5 +----
 keyboards/lets_split_eh/eh/rules.mk              |  2 +-
 keyboards/lets_split_eh/keymaps/default/keymap.c | 24 +++++++++++-------------
 keyboards/lets_split_eh/lets_split_eh.h          |  5 +----
 7 files changed, 23 insertions(+), 52 deletions(-)

(limited to 'keyboards/lets_split_eh')

diff --git a/keyboards/lets_split_eh/config.h b/keyboards/lets_split_eh/config.h
index 655d35e1ab..f07706a834 100644
--- a/keyboards/lets_split_eh/config.h
+++ b/keyboards/lets_split_eh/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
@@ -35,8 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-//#define SOFT_SERIAL_PIN D0
-
-#endif
diff --git a/keyboards/lets_split_eh/eh/config.h b/keyboards/lets_split_eh/eh/config.h
index 59afb39c0f..43e0266502 100644
--- a/keyboards/lets_split_eh/eh/config.h
+++ b/keyboards/lets_split_eh/eh/config.h
@@ -16,13 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef EH_CONFIG_H
-#define EH_CONFIG_H
-
-// To let configuration know this is of type EH, which will force I2C irregardless of user config
-#define EH
-// The 'EH' only uses I2C
-#define USE_I2C
+#pragma once
 
 #include "config_common.h"
 
@@ -40,10 +34,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB LED */
 #define RGB_DI_PIN B2
-#define RGBLED_NUM 6    // Number of LEDs (each hand)
+#define RGBLED_NUM 12    // Number of LEDs (each hand)
+#define RGBLED_SPLIT { 6, 6 }
+#define RGBLIGHT_ANIMATIONS 
 
 /* Split Defines */
 #define SPLIT_HAND_PIN D3
+#define SOFT_SERIAL_PIN D0
 
-#endif
-
+// The 'EH' has previously forced use of I2C so this default has been kept
+// however users can undef to use serial
+#define USE_I2C
diff --git a/keyboards/lets_split_eh/eh/eh.c b/keyboards/lets_split_eh/eh/eh.c
index e748d3ae05..d5a312085d 100644
--- a/keyboards/lets_split_eh/eh/eh.c
+++ b/keyboards/lets_split_eh/eh/eh.c
@@ -1,14 +1 @@
 #include "lets_split_eh.h"
-
-void matrix_init_kb(void) {
-
-    // JTAG disable for PORT F. write JTD bit twice within four cycles.
-    MCUCR |= (1<<JTD);
-    MCUCR |= (1<<JTD);
-	
-	// Undo init of RX LED, we use that port currently
-	// DDRB &= ~(1<<0);
-	
-	matrix_init_user();
-};
-
diff --git a/keyboards/lets_split_eh/eh/eh.h b/keyboards/lets_split_eh/eh/eh.h
index 7dc84fe181..ff37229787 100644
--- a/keyboards/lets_split_eh/eh/eh.h
+++ b/keyboards/lets_split_eh/eh/eh.h
@@ -1,5 +1,4 @@
-#ifndef EH_H
-#define EH_H
+#pragma once
 
 #include "lets_split_eh.h"
 
@@ -23,5 +22,3 @@
 	}
     
 #define LAYOUT_ortho_4x12 LAYOUT
-
-#endif
diff --git a/keyboards/lets_split_eh/eh/rules.mk b/keyboards/lets_split_eh/eh/rules.mk
index 4bac58533e..c0f8760d89 100644
--- a/keyboards/lets_split_eh/eh/rules.mk
+++ b/keyboards/lets_split_eh/eh/rules.mk
@@ -1,4 +1,4 @@
 BOOTLOADER = atmel-dfu
 
 BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/lets_split_eh/keymaps/default/keymap.c b/keyboards/lets_split_eh/keymaps/default/keymap.c
index 1983459f68..fe5ca0c8c8 100644
--- a/keyboards/lets_split_eh/keymaps/default/keymap.c
+++ b/keyboards/lets_split_eh/keymaps/default/keymap.c
@@ -4,11 +4,13 @@
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 3
-#define _RAISE 4
-#define _FUNCTION 15
-#define _ADJUST 16
+enum layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _FUNCTION,
+  _ADJUST,
+};
 
 #define LOWER     MO(_LOWER)
 #define RAISE     MO(_RAISE)
@@ -77,9 +79,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Adjust (Lower + Raise)
  * ,-----------------------------------------------------------------------------------.
- * |Taskmg|      |      |      |      |      |      |      |RGBVAI|RGBSAI|RGBHUI|caltde|
+ * |Taskmg|      |      |      |      |      |      |RGBMOD|RGBVAI|RGBSAI|RGBHUI|caltde|
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |RGBVAD|RGBSAD|RGBHUD|RGBTOG|
+ * |      |      |      |      |      |      |      |RGBRMO|RGBVAD|RGBSAD|RGBHUD|RGBTOG|
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * |      |      |      |      |      |      |      |      |      |      |      |BLSTEP|
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -87,8 +89,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT( \
-  TSKMGR,  _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
-  _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
+  TSKMGR,  _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL, \
+  _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, \
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET    \
 ),
@@ -116,7 +118,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 uint32_t layer_state_set_user(uint32_t state) {
   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
diff --git a/keyboards/lets_split_eh/lets_split_eh.h b/keyboards/lets_split_eh/lets_split_eh.h
index f3d2cd0d06..51828b09ba 100644
--- a/keyboards/lets_split_eh/lets_split_eh.h
+++ b/keyboards/lets_split_eh/lets_split_eh.h
@@ -1,5 +1,4 @@
-#ifndef LETS_SPLIT_EH_H
-#define LETS_SPLIT_EH_H
+#pragma once
 
 #include "quantum.h"
 
@@ -23,5 +22,3 @@
     )
 
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
-
-#endif
-- 
cgit v1.2.3