Replace `astyle` comments with `clang-format` equivalents in examples

This applies to turning off formatting of keymaps. There were a few files that were missing these comments, so those were added where necessary, as well. Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
2 years ago · 56c12996ad
parent da03cbeccb
commit 56c12996ad
62 changed files with 124 additions and 125 deletions
--- a/examples/Basic/Basic.ino
+++ b/examples/Basic/Basic.ino
@ -17,7 +17,7 @@

 #include "Kaleidoscope.h"

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
   Key_NoKey
  ),
 )
-/* *INDENT-ON* */
+// clang-format on

 void setup() {
  Kaleidoscope.setup();
--- a/examples/Devices/EZ/ErgoDox/ErgoDox.ino
+++ b/examples/Devices/EZ/ErgoDox/ErgoDox.ino
@ -19,7 +19,7 @@

 #include "Kaleidoscope.h"

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -46,7 +46,7 @@ KEYMAPS(
      Key_PageDown, Key_Tab, Key_Enter
  ),
 )
-/* *INDENT-ON* */
+// clang-format on

 void setup() {
  Kaleidoscope.setup();
--- a/examples/Devices/KBDFans/KBD4x/KBD4x.ino
+++ b/examples/Devices/KBDFans/KBD4x/KBD4x.ino
@ -31,7 +31,7 @@ enum {

 #define MO(n) ShiftToLayer(n)

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(

 /* Qwerty
@ -71,7 +71,7 @@ KEYMAPS(
  ,___          ,___   ,___   ,___   ,___       ,___      ,___   ,___   ,___   ,___   ,___
 )
 );
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(Macros);

--- a/examples/Devices/Keyboardio/Atreus/Atreus.ino
+++ b/examples/Devices/Keyboardio/Atreus/Atreus.ino
@ -57,7 +57,7 @@ enum {
  UPPER
 };

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [QWERTY] = KEYMAP_STACKED
  (
@ -98,7 +98,7 @@ KEYMAPS(
      ,___      ,___           ,MoveToLayer(QWERTY) ,Key_PrintScreen ,Key_ScrollLock ,Consumer_PlaySlashPause
   )
 )
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(
  EEPROMSettings,
--- a/examples/Devices/Keyboardio/Imago/Imago.ino
+++ b/examples/Devices/Keyboardio/Imago/Imago.ino
@ -54,7 +54,7 @@ enum {  _QWERTY,
     };


-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(

 [_QWERTY] = KEYMAP(
@ -67,7 +67,7 @@ Key_F5,	Key_LeftControl,Key_LeftAlt,	Key_LeftGui, 	Key_Backspace,     Key_LeftAr


 ));
-/* *INDENT-ON* */
+// clang-format on



--- a/examples/Devices/Keyboardio/Model01/Model01.ino
+++ b/examples/Devices/Keyboardio/Model01/Model01.ino
@ -32,7 +32,7 @@

 #define NUMPAD_KEYMAP 2

-
+// clang-format off
 #define GENERIC_FN2  KEYMAP_STACKED ( \
         ___,      Key_F1,        Key_F2,      Key_F3,     Key_F4,          Key_F5,          XXX,            \
        Key_Tab,  Key_mouseBtnM, Key_mouseUp, ___,        Key_mouseWarpNW, Key_mouseWarpNE, Consumer_ScanNextTrack, \
@ -49,9 +49,6 @@
        ___\
 )

-
-
-
 #define NUMPAD KEYMAP  (\
         ___, ___, ___, ___, ___, ___, ___,                           ___, ___, Key_Keypad7, Key_Keypad8,   Key_Keypad9,        Key_KeypadSubtract, ___, \
        ___, ___, ___, ___, ___, ___, ___,                            ___, ___, Key_Keypad4, Key_Keypad5,   Key_Keypad6,        Key_KeypadAdd,  ___, \
@ -75,7 +72,7 @@ KEYMAPS(
  GENERIC_FN2,
  NUMPAD
 )
-
+// clang-format on

 static kaleidoscope::plugin::LEDSolidColor solidRed(60, 0, 0);
 static kaleidoscope::plugin::LEDSolidColor solidOrange(60, 20, 0);
--- a/examples/Devices/Keyboardio/Model100/Model100.ino
+++ b/examples/Devices/Keyboardio/Model100/Model100.ino
@ -168,7 +168,7 @@ enum { PRIMARY, NUMPAD, FUNCTION }; // layers
 /* This comment temporarily turns off astyle's indent enforcement
 *   so we can make the keymaps actually resemble the physical key layout better
 */
-// *INDENT-OFF*
+// clang-format off

 KEYMAPS(

@ -279,7 +279,7 @@ KEYMAPS(
 ) // KEYMAPS(

 /* Re-enable astyle's indent enforcement */
-// *INDENT-ON*
+// clang-format on

 /** versionInfoMacro handles the 'firmware version info' macro
 *  When a key bound to the macro is pressed, this macro
--- a/examples/Devices/OLKB/Planck/Planck.ino
+++ b/examples/Devices/OLKB/Planck/Planck.ino
@ -30,7 +30,7 @@ enum {  _QWERTY,
     };


-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(

 /* Qwerty
@ -161,7 +161,7 @@ KEYMAPS(
 //    ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___
 //)
 );
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(Macros);

--- a/examples/Devices/SOFTHRUF/Splitography/Splitography.ino
+++ b/examples/Devices/SOFTHRUF/Splitography/Splitography.ino
@ -24,7 +24,7 @@ enum {
  _STENO,
 };

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(

 /* Steno (GeminiPR)
@ -45,7 +45,7 @@ KEYMAPS(
                               ,S(A)  ,S(O)     ,S(E)   ,S(U)
  )
 );
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(GeminiPR);

--- a/examples/Devices/Technomancy/Atreus/Atreus.ino
+++ b/examples/Devices/Technomancy/Atreus/Atreus.ino
@ -37,7 +37,7 @@ enum {
 #define Key_Star LSHIFT(Key_8)
 #define Key_Plus LSHIFT(Key_Equals)

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [QWERTY] = KEYMAP_STACKED
  (
@ -78,7 +78,7 @@ KEYMAPS(
      ,___      ,___           ,M(QWERTY),Key_PrintScreen ,Key_ScrollLock ,Consumer_PlaySlashPause
   )
 )
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(Macros);

--- a/examples/Devices/gHeavy/ButterStick/ButterStick.ino
+++ b/examples/Devices/gHeavy/ButterStick/ButterStick.ino
@ -24,14 +24,14 @@ enum {
 };


-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
    [_DEFAULT] = KEYMAP(
      Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Y, Key_U, Key_I, Key_O, Key_P,
      Key_A, Key_S, Key_D, Key_F, Key_G, Key_H, Key_J, Key_K, Key_L, Key_Semicolon
    )
 );
-/* *INDENT-ON* */
+// clang-format on

 void setup() {
  Kaleidoscope.setup();
--- a/examples/Devices/gHeavy/FaunchPad/FaunchPad.ino
+++ b/examples/Devices/gHeavy/FaunchPad/FaunchPad.ino
@ -24,13 +24,13 @@ enum {
 };


-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
    [_DEFAULT] = KEYMAP(
      Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Y, Key_U, Key_I
    )
 );
-/* *INDENT-ON* */
+// clang-format on

 void setup() {
  Kaleidoscope.setup();
--- a/examples/Features/AppSwitcher/AppSwitcher.ino
+++ b/examples/Features/AppSwitcher/AppSwitcher.ino
@ -22,7 +22,7 @@

 #include "AppSwitcher.h"

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -43,7 +43,7 @@ KEYMAPS(
   AppSwitcher_Prev
   ),
 )
-/* *INDENT-ON* */
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(HostOS,
                          AppSwitcher);
--- a/examples/Features/CycleTimeReport/CycleTimeReport.ino
+++ b/examples/Features/CycleTimeReport/CycleTimeReport.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-CycleTimeReport.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(CycleTimeReport);

--- a/examples/Features/EEPROM/DynamicMacros/DynamicMacros.ino
+++ b/examples/Features/EEPROM/DynamicMacros/DynamicMacros.ino
@ -21,7 +21,7 @@
 #include <Kaleidoscope-DynamicMacros.h>
 #include <Kaleidoscope-FocusSerial.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -40,7 +40,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(
  EEPROMSettings,
--- a/examples/Features/EEPROM/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino
+++ b/examples/Features/EEPROM/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino
@ -21,7 +21,7 @@
 #include <Kaleidoscope-EEPROM-Keymap-Programmer.h>
 #include <Kaleidoscope-Macros.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (M(0),              Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -40,7 +40,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
  if (macro_id == 0 && keyToggledOff(event.state)) {
--- a/examples/Features/EEPROM/EEPROM-Keymap/EEPROM-Keymap.ino
+++ b/examples/Features/EEPROM/EEPROM-Keymap/EEPROM-Keymap.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-EEPROM-Keymap.h>
 #include <Kaleidoscope-FocusSerial.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -38,7 +38,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMKeymap, Focus);

--- a/examples/Features/EEPROM/EEPROM-Settings/EEPROM-Settings.ino
+++ b/examples/Features/EEPROM/EEPROM-Settings/EEPROM-Settings.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-EEPROM-Settings.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -37,7 +37,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings);

--- a/examples/Features/FocusSerial/FocusSerial.ino
+++ b/examples/Features/FocusSerial/FocusSerial.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-FocusSerial.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -37,7 +37,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-OFF*
+// clang-format on

 namespace kaleidoscope {
 class FocusTestCommand : public Plugin {
--- a/examples/Features/GhostInTheFirmware/GhostInTheFirmware.ino
+++ b/examples/Features/GhostInTheFirmware/GhostInTheFirmware.ino
@ -27,7 +27,7 @@
 // will type out the letters from A to N, but the right palm key can be used to
 // toggle the custom EventDropper plugin to suppress USB output.

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (___, ___, ___, ___, ___, ___, ___,
@ -46,7 +46,7 @@ KEYMAPS(
   ___, ___, ___, ___,
   M(1)),
        )
-// *INDENT-ON*
+// clang-format on

 namespace kaleidoscope {
 namespace plugin {
--- a/examples/Features/HostOS/HostOS.ino
+++ b/examples/Features/HostOS/HostOS.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include <Kaleidoscope-HostOS.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,    Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -38,7 +38,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings, HostOS);

--- a/examples/Features/HostPowerManagement/HostPowerManagement.ino
+++ b/examples/Features/HostPowerManagement/HostPowerManagement.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-HostPowerManagement.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -41,7 +41,7 @@ KEYMAPS(
    Key_NoKey
  ),
 )
-// *INDENT-ON*
+// clang-format on

 void hostPowerManagementEventHandler(kaleidoscope::plugin::HostPowerManagement::Event event) {
  switch (event) {
--- a/examples/Features/Layers/Layers.ino
+++ b/examples/Features/Layers/Layers.ino
@ -21,7 +21,7 @@

 enum { PRIMARY, NUMPAD, FUNCTION }; // layers

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [PRIMARY] = KEYMAP_STACKED
  (___,          Key_1, Key_2, Key_3, Key_4, Key_5, XXX,
@ -68,7 +68,7 @@ KEYMAPS(
   ___, ___, Key_Enter, ___,
   ___)
 )
-// *INDENT-OFF*
+// clang-format on

 namespace kaleidoscope {
 class LayerDumper: public Plugin {
--- a/examples/Features/ShiftBlocker/ShiftBlocker.ino
+++ b/examples/Features/ShiftBlocker/ShiftBlocker.ino
@ -18,7 +18,7 @@
 #include "Kaleidoscope.h"
 #include "Kaleidoscope-Macros.h"

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -39,7 +39,7 @@ KEYMAPS(
   M(0)
   ),
 )
-/* *INDENT-ON* */
+// clang-format on

 namespace kaleidoscope {
 namespace plugin {
--- a/examples/Features/Steno/Steno.ino
+++ b/examples/Features/Steno/Steno.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-Steno.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -56,7 +56,7 @@ KEYMAPS(
   S(E), S(U), XXX, S(RE2),
   ___),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(GeminiPR);

--- a/examples/Features/TypingBreaks/TypingBreaks.ino
+++ b/examples/Features/TypingBreaks/TypingBreaks.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include <Kaleidoscope-TypingBreaks.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -39,7 +39,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings, TypingBreaks);

--- a/examples/Internal/Sketch_Exploration/Sketch_Exploration.ino
+++ b/examples/Internal/Sketch_Exploration/Sketch_Exploration.ino
@ -21,7 +21,7 @@
 // This example demonstrates how a plugin can gather information about
 // the keymap at compile time, e.g. to adapt its behavior, safe resources, ...

-/* *INDENT-OFF* */
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -42,7 +42,7 @@ KEYMAPS(
   Key_NoKey
  ),
 )
-/* *INDENT-ON* */
+// clang-format on

 using namespace kaleidoscope::sketch_exploration; // NOLINT(build/namespaces)

--- a/examples/Keystrokes/AutoShift/AutoShift.ino
+++ b/examples/Keystrokes/AutoShift/AutoShift.ino
@ -12,7 +12,7 @@ enum {
  TOGGLE_AUTOSHIFT,
 };

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -33,7 +33,7 @@ KEYMAPS(
      XXX
   ),
 )
-// *INDENT-ON*
+// clang-format on

 // Defining a macro (on the "any" key: see above) to turn AutoShift on and off
 const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
--- a/examples/Keystrokes/CharShift/CharShift.ino
+++ b/examples/Keystrokes/CharShift/CharShift.ino
@ -4,7 +4,7 @@

 #include <Kaleidoscope-CharShift.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -25,7 +25,7 @@ KEYMAPS(
      XXX
   ),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(CharShift);

--- a/examples/Keystrokes/Cycle/Cycle.ino
+++ b/examples/Keystrokes/Cycle/Cycle.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-Cycle.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,    Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -37,7 +37,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_Cycle),
 )
-// *INDENT-ON*
+// clang-format on

 void cycleAction(Key previous_key, uint8_t cycle_count) {
  if (previous_key == Key_E) {
--- a/examples/Keystrokes/DynamicTapDance/DynamicTapDance.ino
+++ b/examples/Keystrokes/DynamicTapDance/DynamicTapDance.ino
@ -22,7 +22,7 @@
 #include <Kaleidoscope-TapDance.h>
 #include <Kaleidoscope-DynamicTapDance.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -42,7 +42,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, TD(2),
    TD(1)),
 )
-// *INDENT-ON*
+// clang-format on

 enum {
  TD_TAB_ESC,
--- a/examples/Keystrokes/Escape-OneShot/Escape-OneShot.ino
+++ b/examples/Keystrokes/Escape-OneShot/Escape-OneShot.ino
@ -21,7 +21,7 @@
 #include <Kaleidoscope-Escape-OneShot.h>
 #include <Kaleidoscope-FocusSerial.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -61,7 +61,7 @@ KEYMAPS(
    ___
  ),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings,
                          Focus,
--- a/examples/Keystrokes/Leader/Leader.ino
+++ b/examples/Keystrokes/Leader/Leader.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-Leader.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -37,7 +37,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   LEAD(0)),
 )
-// *INDENT-ON*
+// clang-format on

 auto &serial_port = Kaleidoscope.serialPort();

--- a/examples/Keystrokes/LeaderPrefix/LeaderPrefix.ino
+++ b/examples/Keystrokes/LeaderPrefix/LeaderPrefix.ino
@ -24,7 +24,7 @@
 #include "kaleidoscope/LiveKeys.h"
 #include "kaleidoscope/plugin.h"

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,    Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -43,7 +43,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   LEAD(0)),
 )
-// *INDENT-ON*
+// clang-format on

 namespace kaleidoscope {
 namespace plugin {
--- a/examples/Keystrokes/Macros/Macros.ino
+++ b/examples/Keystrokes/Macros/Macros.ino
@ -24,7 +24,7 @@ enum {
  TOGGLE_ONESHOT,
 };

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (___, M(1), M(2), M(3), M(4), M(5), ___,
@ -61,7 +61,7 @@ KEYMAPS(
    ___, ___, ___, ___,
    ___),
 )
-// *INDENT-ON*
+// clang-format on

 // Example macro for typing a string of characters.
 void macroTypeString(KeyEvent &event) {
--- a/examples/Keystrokes/MagicCombo/MagicCombo.ino
+++ b/examples/Keystrokes/MagicCombo/MagicCombo.ino
@ -29,7 +29,7 @@ void kindOfMagic(uint8_t combo_index) {

 USE_MAGIC_COMBOS([KIND_OF_MAGIC] = {.action = kindOfMagic, .keys = {R3C6, R3C9}});

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -49,7 +49,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(MagicCombo, Macros);

--- a/examples/Keystrokes/OneShot/OneShot.ino
+++ b/examples/Keystrokes/OneShot/OneShot.ino
@ -24,7 +24,7 @@ enum {
  TOGGLE_ONESHOT,
 };

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -62,7 +62,7 @@ KEYMAPS(
    ___, ___, ___, ___,
    ___),
 )
-// *INDENT-ON*
+// clang-format on

 void macroToggleOneShot() {
  OneShot.toggleAutoOneShot();
--- a/examples/Keystrokes/OneShotMetaKeys/OneShotMetaKeys.ino
+++ b/examples/Keystrokes/OneShotMetaKeys/OneShotMetaKeys.ino
@ -25,7 +25,7 @@ enum {
  TOGGLE_ONESHOT,
 };

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -63,7 +63,7 @@ KEYMAPS(
    ___, ___, ___, ___,
    ___),
 )
-// *INDENT-ON*
+// clang-format on

 void macroToggleOneShot() {
  OneShot.toggleAutoOneShot();
--- a/examples/Keystrokes/Qukeys/Qukeys.ino
+++ b/examples/Keystrokes/Qukeys/Qukeys.ino
@ -11,7 +11,7 @@ enum { MACRO_TOGGLE_QUKEYS };
 // for the home row on the right side of the keymap (and one of the palm keys)
 // below.

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -51,7 +51,7 @@ KEYMAPS(
      ___
   ),
 )
-// *INDENT-ON*
+// clang-format on

 // Defining a macro (on the "any" key: see above) to toggle Qukeys on and off
 const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
--- a/examples/Keystrokes/Redial/Redial.ino
+++ b/examples/Keystrokes/Redial/Redial.ino
@ -25,7 +25,7 @@ bool kaleidoscope::plugin::Redial::shouldRemember(Key mapped_key) {
  return false;
 }

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -45,7 +45,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_Redial),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(Redial);

--- a/examples/Keystrokes/ShapeShifter/ShapeShifter.ino
+++ b/examples/Keystrokes/ShapeShifter/ShapeShifter.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-ShapeShifter.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 static const kaleidoscope::plugin::ShapeShifter::dictionary_t shape_shift_dictionary[] PROGMEM = {
  {Key_1, Key_2},
--- a/examples/Keystrokes/SpaceCadet/SpaceCadet.ino
+++ b/examples/Keystrokes/SpaceCadet/SpaceCadet.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-SpaceCadet.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(SpaceCadet);

--- a/examples/Keystrokes/Syster/Syster.ino
+++ b/examples/Keystrokes/Syster/Syster.ino
@ -21,7 +21,7 @@
 #include <Kaleidoscope-Syster.h>
 #include <Kaleidoscope-Unicode.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -41,7 +41,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    SYSTER),
 )
-// *INDENT-ON*
+// clang-format on

 void systerAction(kaleidoscope::plugin::Syster::action_t action, const char *symbol) {
  switch (action) {
--- a/examples/Keystrokes/TapDance/TapDance.ino
+++ b/examples/Keystrokes/TapDance/TapDance.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-TapDance.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    TD(1)),
 )
-// *INDENT-ON*
+// clang-format on

 static void tapDanceEsc(uint8_t tap_dance_index, uint8_t tap_count, kaleidoscope::plugin::TapDance::ActionType tap_dance_action) {
  tapDanceActionKeys(tap_count, tap_dance_action, Key_Escape, Key_Tab);
--- a/examples/Keystrokes/TopsyTurvy/TopsyTurvy.ino
+++ b/examples/Keystrokes/TopsyTurvy/TopsyTurvy.ino
@ -18,7 +18,7 @@
 #include <Kaleidoscope.h>
 #include <Kaleidoscope-TopsyTurvy.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -38,7 +38,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(TopsyTurvy);

--- a/examples/Keystrokes/Turbo/Turbo.ino
+++ b/examples/Keystrokes/Turbo/Turbo.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-Turbo.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
@ -38,7 +38,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl, Turbo);

--- a/examples/Keystrokes/Unicode/Unicode.ino
+++ b/examples/Keystrokes/Unicode/Unicode.ino
@ -23,7 +23,7 @@

 enum { MACRO_KEYBOARD_EMOJI };

-// *INDENT-OFF*
+// clang-format off

 KEYMAPS(
  [0] = KEYMAP_STACKED
@ -44,7 +44,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 static void unicode(uint32_t character, uint8_t keyState) {
  if (keyToggledOn(keyState)) {
--- a/examples/Keystrokes/WinKeyToggle/WinKeyToggle.ino
+++ b/examples/Keystrokes/WinKeyToggle/WinKeyToggle.ino
@ -32,7 +32,7 @@ USE_MAGIC_COMBOS([WINKEYTOGGLE] = {
  .keys = {R3C6, R3C9}
 });

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -52,7 +52,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(MagicCombo, WinKeyToggle);

--- a/examples/LEDs/Colormap/Colormap.ino
+++ b/examples/LEDs/Colormap/Colormap.ino
@ -22,7 +22,7 @@
 #include <Kaleidoscope-LED-Palette-Theme.h>
 #include <Kaleidoscope-LEDControl.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext,
@ -42,7 +42,7 @@ KEYMAPS(
   Key_NoKey),
 )

-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings,
                          LEDPaletteTheme,
--- a/examples/LEDs/FingerPainter/FingerPainter.ino
+++ b/examples/LEDs/FingerPainter/FingerPainter.ino
@ -22,7 +22,7 @@
 #include <Kaleidoscope-FingerPainter.h>
 #include <Kaleidoscope-FocusSerial.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_NoKey,         Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext,
@ -41,7 +41,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          LEDOff,
--- a/examples/LEDs/Heatmap/Heatmap.ino
+++ b/examples/LEDs/Heatmap/Heatmap.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-Heatmap.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext,
@ -39,7 +39,7 @@ KEYMAPS(
   Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
   Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          HeatmapEffect);
--- a/examples/LEDs/IdleLEDs/IdleLEDs.ino
+++ b/examples/LEDs/IdleLEDs/IdleLEDs.ino
@ -22,7 +22,7 @@
 #include <Kaleidoscope-FocusSerial.h>
 #include <Kaleidoscope-IdleLEDs.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -42,7 +42,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          EEPROMSettings,
--- a/examples/LEDs/LED-ActiveLayerColor/LED-ActiveLayerColor.ino
+++ b/examples/LEDs/LED-ActiveLayerColor/LED-ActiveLayerColor.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LED-ActiveLayerColor.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -58,7 +58,7 @@ KEYMAPS(
    ShiftToLayer(0)
  )
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          LEDActiveLayerColorEffect);
--- a/examples/LEDs/LED-ActiveModColor/LED-ActiveModColor.ino
+++ b/examples/LEDs/LED-ActiveModColor/LED-ActiveModColor.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope-LED-ActiveModColor.h>
 #include <Kaleidoscope-OneShot.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -40,7 +40,7 @@ KEYMAPS(
    OSM(RightShift), OSM(RightAlt), Key_Spacebar, OSM(RightControl),
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 // OneShot is included to illustrate the different colors highlighting sticky
 // and one-shot keys.  LEDOff is included because we need an LED mode active to
--- a/examples/LEDs/LED-AlphaSquare/LED-AlphaSquare.ino
+++ b/examples/LEDs/LED-AlphaSquare/LED-AlphaSquare.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope-LED-AlphaSquare.h>
 #include <Kaleidoscope-Macros.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -40,7 +40,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_skip),
 )
-// *INDENT-ON*
+// clang-format on

 const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) {
  if (!keyToggledOn(event.state))
--- a/examples/LEDs/LED-Brightness/LED-Brightness.ino
+++ b/examples/LEDs/LED-Brightness/LED-Brightness.ino
@ -20,7 +20,7 @@
 #include <Kaleidoscope-LEDEffect-Rainbow.h>
 #include <Kaleidoscope-Macros.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -40,7 +40,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    M(1)),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          Macros,
--- a/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino
+++ b/examples/LEDs/LED-Palette-Theme/LED-Palette-Theme.ino
@ -58,7 +58,7 @@ TestLEDMode::onFocusEvent(const char *command) {

 example::TestLEDMode TestLEDMode;

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -78,7 +78,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(Focus, LEDPaletteTheme, TestLEDMode, EEPROMSettings);

--- a/examples/LEDs/LED-Stalker/LED-Stalker.ino
+++ b/examples/LEDs/LED-Stalker/LED-Stalker.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LED-Stalker.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -39,7 +39,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          LEDOff,
--- a/examples/LEDs/LED-Wavepool/LED-Wavepool.ino
+++ b/examples/LEDs/LED-Wavepool/LED-Wavepool.ino
@ -20,6 +20,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LED-Wavepool.h>

+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
        (
@ -46,6 +47,7 @@ KALEIDOSCOPE_INIT_PLUGINS(
  LEDOff,
  WavepoolEffect
 );
+// clang-format on

 void setup() {
  Kaleidoscope.setup();
--- a/examples/LEDs/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino
+++ b/examples/LEDs/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LEDEffect-BootGreeting.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -39,7 +39,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          BootGreetingEffect,
--- a/examples/LEDs/LEDEffects/LEDEffects.ino
+++ b/examples/LEDs/LEDEffects/LEDEffects.ino
@ -19,7 +19,7 @@
 #include <Kaleidoscope-LEDControl.h>
 #include <Kaleidoscope-LEDEffects.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -39,7 +39,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          LEDOff,
--- a/examples/LEDs/PersistentLEDMode/PersistentLEDMode.ino
+++ b/examples/LEDs/PersistentLEDMode/PersistentLEDMode.ino
@ -24,7 +24,7 @@
 #include <Kaleidoscope-LEDEffect-Chase.h>
 #include <Kaleidoscope-PersistentLEDMode.h>

-// *INDENT-OFF*
+// clang-format off
 KEYMAPS(
  [0] = KEYMAP_STACKED
  (
@ -44,7 +44,7 @@ KEYMAPS(
    Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
    Key_NoKey),
 )
-// *INDENT-ON*
+// clang-format on

 KALEIDOSCOPE_INIT_PLUGINS(LEDControl,
                          EEPROMSettings,