Merge remote-tracking branch 'qmk/master' into merge-2024-09-07

keyboards/maple_computing/lets_split_eh/config.h

@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Split Defines */
-#define SPLIT_HAND_PIN D3
-
 // The 'EH' has previously forced use of I2C so this default has been kept
 // however users can undef to use serial
 #define USE_I2C

keyboards/maple_computing/lets_split_eh/eh/rules.mk

@@ -1,2 +0,0 @@
-# Disable unsupported hardware
-AUDIO_SUPPORTED = no

keyboards/maple_computing/lets_split_eh/keyboard.json

@@ -19,6 +19,7 @@
     "rgblight": {
         "led_count": 12,
         "split_count": [6, 6],
+        "sleep": true,
         "animations": {
             "breathing": true,
             "rainbow_mood": true,
@@ -37,12 +38,17 @@
     },
     "split": {
         "enabled": true,
-        "soft_serial_pin": "D0"
+        "handedness": {
+            "pin": "D3"
+        },
+        "serial": {
+            "pin": "D0"
+        }
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "features": {
-        "bootmagic": false,
+        "bootmagic": true,
         "mousekey": false,
         "extrakey": true,
         "nkro": true,

keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c

@@ -89,8 +89,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  TSKMGR,  _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  _______, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
+  TSKMGR,  _______, _______, _______, _______, _______, _______, UG_NEXT, UG_VALU, UG_SATU, UG_HUEU, CALTDEL,
+  _______, _______, _______, _______, _______, _______, _______, UG_PREV, UG_VALD, UG_SATD, UG_HUED, UG_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),

keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c

@@ -98,8 +98,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
-  TSKMGR,  _______, _______, _______, _______, _______, KC_DEL,  _______, RGB_VAI, RGB_SAI, RGB_HUI, CALTDEL,
-  _______, _______, _______, _______, _______, _______, _______, DVORAK,  RGB_VAD, RGB_SAD, RGB_HUD, RGB_TOG,
+  TSKMGR,  _______, _______, _______, _______, _______, KC_DEL,  _______, UG_VALU, UG_SATU, UG_HUEU, CALTDEL,
+  _______, _______, _______, _______, _______, _______, _______, DVORAK,  UG_VALD, UG_SATD, UG_HUED, UG_TOGG,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP,
   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT
 ),

keyboards/maple_computing/lets_split_eh/readme.md

@@ -8,6 +8,6 @@ Keyboard Maintainer: [Christopher Poole (That-Canadian)](https://github.com/That
 
 Make example for this keyboard (after setting up your build environment):
 
-    make maple_computing/lets_split_eh/eh:default
+    make maple_computing/lets_split_eh:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.

keyboards/maple_computing/lets_split_eh/rules.mk

@@ -1 +1,2 @@
-DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
+# Disable unsupported hardware
+AUDIO_SUPPORTED = no