Formatting

5 files changed, 111 insertions, 104 deletions

diff --git a/keyboards/crkbd/keymaps/curry/keymap.c b/keyboards/crkbd/keymaps/curry/keymap.c
index 23c7c46c7..7686c420e 100644
--- a/keyboards/crkbd/keymaps/curry/keymap.c
+++ b/keyboards/crkbd/keymaps/curry/keymap.c
@@ -1,61 +1,62 @@
 #include "curry.h"
 
 #define LAYOUT_crkbd_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-  ) \
-  LAYOUT_wrapper( \
-    KC_GESC, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, KC_MINS, \
-    M_LCTL,  K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, M_RALT,  \
-    OS_LSFT, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, OS_RSFT, \
-             KC_GRV, OS_LALT, SP_LWER,     ET_RAIS, KC_BSPC, OS_RGUI                                      \
-  )
+        K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+        K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+        K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+    ) \
+    LAYOUT_wrapper( \
+        KC_GESC, K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, KC_MINS, \
+        M_LCTL,  K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, M_RALT,  \
+        OS_LSFT, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, OS_RSFT, \
+                KC_GRV, OS_LALT, SP_LWER,     ET_RAIS, KC_BSPC, OS_RGUI                                      \
+    )
 #define LAYOUT_crkbd_base_wrapper(...)       LAYOUT_crkbd_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_crkbd_base_wrapper(
-    _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
-    _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
-    _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
-  ),
-
-  [_COLEMAK] = LAYOUT_crkbd_base_wrapper(
-    _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
-    _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
-    _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
-  ),
-
-  [_DVORAK] = LAYOUT_crkbd_base_wrapper(
-    _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
-    _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
-    _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
-  ),
-
-  [_MODS] = LAYOUT_wrapper(
-    _______, ___________________BLANK___________________,       ___________________BLANK___________________, _______,
-    _______, ___________________BLANK___________________,       ___________________BLANK___________________, _______,
-    KC_LSFT, ___________________BLANK___________________,       ___________________BLANK___________________, KC_RSFT,
-                               _______, _______, _______,       _______, _______, _______
-  ),
-  [_LOWER] = LAYOUT_wrapper(
-    _______, _________________LOWER_L1__________________,       _________________LOWER_R1__________________, KC_PIPE,
-    KC_F11,  _________________LOWER_L2__________________,       _________________LOWER_R2__________________, KC_F12,
-    _______, _________________LOWER_L3__________________,       _________________LOWER_R3__________________, _______,
-                               _______, _______, _______,       _______, _______, _______
-  ),
-
-  [_RAISE] = LAYOUT_wrapper( \
-    _______, _________________RAISE_L1__________________,       _________________RAISE_R1__________________, _______,
-    _______, _________________RAISE_L2__________________,       _________________RAISE_R2__________________, KC_BSLS,
-    _______, _________________RAISE_L3__________________,       _________________RAISE_R3__________________, _______,
-                               _______, _______, _______,       _______, _______, _______
-  ),
-
-  [_ADJUST] = LAYOUT_wrapper( \
-    KC_MAKE, _________________ADJUST_L1_________________,       _________________ADJUST_R1_________________, KC_RESET,
-    VRSN,    _________________ADJUST_L2_________________,       _________________ADJUST_R2_________________, EEP_RST,
-    MG_NKRO, _________________ADJUST_L3_________________,       _________________ADJUST_R3_________________, RGB_IDL,
-                               _______, _______, _______,       _______, TG_MODS, _______
-  )
+    [_QWERTY] = LAYOUT_crkbd_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_COLEMAK] = LAYOUT_crkbd_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DVORAK] = LAYOUT_crkbd_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+    [_MODS] = LAYOUT_wrapper(
+        _______, ___________________BLANK___________________,       ___________________BLANK___________________, _______,
+        _______, ___________________BLANK___________________,       ___________________BLANK___________________, _______,
+        KC_LSFT, ___________________BLANK___________________,       ___________________BLANK___________________, KC_RSFT,
+                                   _______, _______, _______,       _______, _______, _______
+    ),
+
+    [_LOWER] = LAYOUT_wrapper(
+        _______, _________________LOWER_L1__________________,       _________________LOWER_R1__________________, KC_PIPE,
+        KC_F11,  _________________LOWER_L2__________________,       _________________LOWER_R2__________________, KC_F12,
+        _______, _________________LOWER_L3__________________,       _________________LOWER_R3__________________, _______,
+                                   _______, _______, _______,       _______, _______, _______
+    ),
+
+    [_RAISE] = LAYOUT_wrapper( \
+        _______, _________________RAISE_L1__________________,       _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,       _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,       _________________RAISE_R3__________________, _______,
+                                   _______, _______, _______,       _______, _______, _______
+    ),
+
+    [_ADJUST] = LAYOUT_wrapper( \
+        KC_MAKE, _________________ADJUST_L1_________________,       _________________ADJUST_R1_________________, KC_RESET,
+        VRSN,    _________________ADJUST_L2_________________,       _________________ADJUST_R2_________________, EEP_RST,
+        MG_NKRO, _________________ADJUST_L3_________________,       _________________ADJUST_R3_________________, RGB_IDL,
+                                   _______, _______, _______,       _______, TG_MODS, _______
+    )
 };
diff --git a/keyboards/crkbd/keymaps/curry/rules.mk b/keyboards/crkbd/keymaps/curry/rules.mk
index 7f77b43f4..483d86bdc 100644
--- a/keyboards/crkbd/keymaps/curry/rules.mk
+++ b/keyboards/crkbd/keymaps/curry/rules.mk
@@ -2,21 +2,22 @@
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE                = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE                 = no  # Mouse keys(+4700)
-EXTRAKEY_ENABLE                 = yes # Audio control and System control(+450)
-CONSOLE_ENABLE                  = no  # Console for debug(+400)
-COMMAND_ENABLE                  = no  # Commands for debug and configuration
-NKRO_ENABLE                     = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE                = no  # Enable keyboard backlight functionality
-MIDI_ENABLE                     = no  # MIDI controls
-AUDIO_ENABLE                    = no  # Audio output on port C6
-UNICODE_ENABLE                  = no  # Unicode
-BLUETOOTH_ENABLE                = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE                 = no  # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE               = no  # Enable one-hand typing
-RGB_MATRIX_ENABLE                       = WS2812
-TAP_DANCE_ENABLE                        = yes      # Enable Tap Dance.
-OLED_DRIVER_ENABLE                      = yes
-BOOTLOADER                                      = atmel-dfu
-SLEEP_LED_ENABLE                        = no    # Breathing sleep LED during USB suspend
+BOOTMAGIC_ENABLE            = no  # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE             = no  # Mouse keys(+4700)
+EXTRAKEY_ENABLE             = yes # Audio control and System control(+450)
+CONSOLE_ENABLE              = no  # Console for debug(+400)
+COMMAND_ENABLE              = no  # Commands for debug and configuration
+NKRO_ENABLE                 = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE            = no  # Enable keyboard backlight functionality
+MIDI_ENABLE                 = no  # MIDI controls
+AUDIO_ENABLE                = no  # Audio output on port C6
+UNICODE_ENABLE              = no  # Unicode
+BLUETOOTH_ENABLE            = no  # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE             = no  # Enable WS2812 RGB underlight.
+SWAP_HANDS_ENABLE           = no  # Enable one-hand typing
+RGB_MATRIX_ENABLE           = WS2812
+TAP_DANCE_ENABLE            = yes      # Enable Tap Dance.
+OLED_DRIVER_ENABLE          = yes
+BOOTLOADER                  = atmel-dfu
+SLEEP_LED_ENABLE            = no    # Breathing sleep LED during USB suspend
+SPLIT_TRANSPORT                         = mirror
diff --git a/keyboards/lily58/keymaps/curry/keymap.c b/keyboards/lily58/keymaps/curry/keymap.c
index 3e2e0ae49..a8183d36f 100644
--- a/keyboards/lily58/keymaps/curry/keymap.c
+++ b/keyboards/lily58/keymaps/curry/keymap.c
@@ -1,18 +1,18 @@
 #include "curry.h"
 
 #define LAYOUT_lily58_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,  \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A  \
-  ) \
-  LAYOUT_wrapper( \
-    KC_ESC,  K01, K02, K03, K04, K05,                    K06, K07, K08, K09, K0A, KC_GRV, \
-    KC_TAB,  K11, K12, K13, K14, K15,                    K16, K17, K18, K19, K1A, KC_BSLS,  \
-    KC_LCTL, K21, K22, K23, K24, K25,                    K26, K27, K28, K29, K2A, KC_QUOT, \
-    OS_LSFT, K31, K32, K33, K34, K35, KC_LBRC, KC_RBRC,  K36, K37, K38, K39, K3A, OS_RSFT, \
-             OS_LGUI, OS_LALT, LOWER, KC_SPC,  KC_ENT,  RAISE, KC_BSPC, OS_RGUI \
-  )
+        K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+        K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+        K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,  \
+        K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A  \
+    ) \
+    LAYOUT_wrapper( \
+        KC_ESC,  K01, K02, K03, K04, K05,                    K06, K07, K08, K09, K0A, KC_GRV, \
+        KC_TAB,  K11, K12, K13, K14, K15,                    K16, K17, K18, K19, K1A, KC_BSLS,  \
+        KC_LCTL, K21, K22, K23, K24, K25,                    K26, K27, K28, K29, K2A, KC_QUOT, \
+        OS_LSFT, K31, K32, K33, K34, K35, KC_LBRC, KC_RBRC,  K36, K37, K38, K39, K3A, OS_RSFT, \
+                OS_LGUI, OS_LALT, LOWER, KC_SPC,  KC_ENT,  RAISE, KC_BSPC, OS_RGUI \
+    )
 #define LAYOUT_lily58_base_wrapper(...) LAYOUT_lily58_base(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/lily58/keymaps/curry/rules.mk b/keyboards/lily58/keymaps/curry/rules.mk
index 4e73f47f4..e19c0f389 100644
--- a/keyboards/lily58/keymaps/curry/rules.mk
+++ b/keyboards/lily58/keymaps/curry/rules.mk
@@ -1,17 +1,21 @@
-BOOTMAGIC_ENABLE                = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE                 = no  # Mouse keys(+4700)
-EXTRAKEY_ENABLE                 = yes # Audio control and System control(+450)
-CONSOLE_ENABLE                  = no  # Console for debug(+400)
-COMMAND_ENABLE                  = no  # Commands for debug and configuration
-NKRO_ENABLE                     = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE                = no  # Enable keyboard backlight functionality
-MIDI_ENABLE                     = no  # MIDI controls
-AUDIO_ENABLE                    = no  # Audio output on port C6
-UNICODE_ENABLE                  = no  # Unicode
-BLUETOOTH_ENABLE                = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE                 = no  # Enable WS2812 RGB underlight.
-SWAP_HANDS_ENABLE               = no  # Enable one-hand typing
-TAP_DANCE_ENABLE                        = yes      # Enable Tap Dance.
-OLED_DRIVER_ENABLE                      = yes
-BOOTLOADER                                      = atmel-dfu
-SPLIT_TRANSPORT                         = mirror
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE            = no  # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE             = no  # Mouse keys(+4700)
+EXTRAKEY_ENABLE             = yes # Audio control and System control(+450)
+CONSOLE_ENABLE              = no  # Console for debug(+400)
+COMMAND_ENABLE              = no  # Commands for debug and configuration
+NKRO_ENABLE                 = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE            = no  # Enable keyboard backlight functionality
+MIDI_ENABLE                 = no  # MIDI controls
+AUDIO_ENABLE                = no  # Audio output on port C6
+UNICODE_ENABLE              = no  # Unicode
+BLUETOOTH_ENABLE            = no  # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE             = no  # Enable WS2812 RGB underlight.
+SWAP_HANDS_ENABLE           = no  # Enable one-hand typing
+TAP_DANCE_ENABLE            = yes      # Enable Tap Dance.
+OLED_DRIVER_ENABLE          = yes
+BOOTLOADER                  = atmel-dfu
+SPLIT_TRANSPORT                         = mirror
diff --git a/users/curry/README.md b/users/curry/README.md
index e61df51b2..70d6262d7 100644
--- a/users/curry/README.md
+++ b/users/curry/README.md
@@ -2,18 +2,19 @@
 
 These is my userspace files, heavily influenced by @drashna's userspace structure.
 
+# Keyboards
+
 Main uses are for corne & lily58, supporting dfu bootloader (elite-c)
 
-# Keyboards
 ## Split Common
 Is compatible with split_common when the previous two keyboards update to them. 
 
-If you want to use these keymaps with split common code, they are on my personal github fork: [CurryFurous/qmk_firmware](https://github.com/CurryFurious/qmk_firmware)
+If you want to use these keymaps with split common code, they are on my personal github fork: [CurryFurious/qmk_firmware](https://github.com/CurryFurious/qmk_firmware)
 
 Referenced PRs: #6260, #5998, #6001
 
 ## Keymaps
-Keymap layout is similar between the two keyboards. Lily 58 has a lot of open keys for custom keys as well. Keymap formatting is set up in the physical layout of the keyboard, so mapping keys should be easier.
+Keymap layout is similar between the two keyboards. Lily58 has a lot of open keys for custom keys as well. Keymap formatting is set up in the physical layout of the keyboard, so mapping keys should be easier.
 
 ## Tap Dances