From ff0728e1ff10a59934212cf58f57b3391300bf4c Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Fri, 19 Oct 2018 22:07:41 +0200 Subject: [PATCH] examples: Make all the examples use the KEYMAPS macro Signed-off-by: Gergely Nagy --- examples/Colormap/Colormap.ino | 5 ++--- examples/Cycle/Cycle.ino | 4 ++-- examples/CycleTimeReport/CycleTimeReport.ino | 4 ++-- .../EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino | 4 ++-- examples/EEPROM-Settings/EEPROM-Settings.ino | 4 ++-- examples/Escape-OneShot/Escape-OneShot.ino | 4 ++-- examples/FingerPainter/FingerPainter.ino | 4 ++-- examples/FocusSerial/FocusSerial.ino | 4 ++-- examples/GhostInTheFirmware/GhostInTheFirmware.ino | 4 ++-- examples/Heatmap/Heatmap.ino | 4 ++-- examples/HostOS/HostOS.ino | 4 ++-- examples/HostPowerManagement/HostPowerManagement.ino | 4 ++-- examples/LED-ActiveModColor/LED-ActiveModColor.ino | 8 +++++--- examples/LED-AlphaSquare/LED-AlphaSquare.ino | 4 ++-- examples/LED-Palette-Theme/LED-Palette-Theme.ino | 5 +++-- examples/LED-Stalker/LED-Stalker.ino | 4 ++-- .../LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino | 4 ++-- examples/LEDEffects/LEDEffects.ino | 4 ++-- examples/Leader/Leader.ino | 4 ++-- examples/MagicCombo/MagicCombo.ino | 4 ++-- examples/OneShot/OneShot.ino | 4 ++-- examples/Redial/Redial.ino | 4 ++-- examples/ShapeShifter/ShapeShifter.ino | 4 ++-- examples/SpaceCadet/SpaceCadet.ino | 4 ++-- examples/Steno/Steno.ino | 4 ++-- examples/Syster/Syster.ino | 4 ++-- examples/TapDance/TapDance.ino | 4 ++-- examples/TopsyTurvy/TopsyTurvy.ino | 4 ++-- examples/TypingBreaks/TypingBreaks.ino | 4 ++-- examples/Unicode/Unicode.ino | 5 ++--- 30 files changed, 64 insertions(+), 63 deletions(-) diff --git a/examples/Colormap/Colormap.ino b/examples/Colormap/Colormap.ino index f5fbad7d..674cbcd0 100644 --- a/examples/Colormap/Colormap.ino +++ b/examples/Colormap/Colormap.ino @@ -22,8 +22,7 @@ #include // *INDENT-OFF* - -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -40,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* diff --git a/examples/Cycle/Cycle.ino b/examples/Cycle/Cycle.ino index 558b2eff..5c6d30ba 100644 --- a/examples/Cycle/Cycle.ino +++ b/examples/Cycle/Cycle.ino @@ -18,7 +18,7 @@ #include #include -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -35,7 +35,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_Cycle), -}; +) void cycleAction(Key previous_key, uint8_t cycle_count) { if (previous_key.raw == Key_E.raw) { diff --git a/examples/CycleTimeReport/CycleTimeReport.ino b/examples/CycleTimeReport/CycleTimeReport.ino index 148878e1..7a6071f2 100644 --- a/examples/CycleTimeReport/CycleTimeReport.ino +++ b/examples/CycleTimeReport/CycleTimeReport.ino @@ -18,7 +18,7 @@ #include #include -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -36,7 +36,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) KALEIDOSCOPE_INIT_PLUGINS(CycleTimeReport); diff --git a/examples/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino b/examples/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino index d65ede6a..fe47d2fe 100644 --- a/examples/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino +++ b/examples/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino @@ -22,7 +22,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (M(0), Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -39,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { diff --git a/examples/EEPROM-Settings/EEPROM-Settings.ino b/examples/EEPROM-Settings/EEPROM-Settings.ino index 0d2b1850..464c31d8 100644 --- a/examples/EEPROM-Settings/EEPROM-Settings.ino +++ b/examples/EEPROM-Settings/EEPROM-Settings.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -36,7 +36,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings); diff --git a/examples/Escape-OneShot/Escape-OneShot.ino b/examples/Escape-OneShot/Escape-OneShot.ino index fd461778..5f6689ca 100644 --- a/examples/Escape-OneShot/Escape-OneShot.ino +++ b/examples/Escape-OneShot/Escape-OneShot.ino @@ -20,7 +20,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -58,7 +58,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { ___, ___, ___, ___, ___ ), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(OneShot, diff --git a/examples/FingerPainter/FingerPainter.ino b/examples/FingerPainter/FingerPainter.ino index 455832c7..c5ea650a 100644 --- a/examples/FingerPainter/FingerPainter.ino +++ b/examples/FingerPainter/FingerPainter.ino @@ -25,7 +25,7 @@ #include "LED-Off.h" // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -42,7 +42,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, diff --git a/examples/FocusSerial/FocusSerial.ino b/examples/FocusSerial/FocusSerial.ino index c83910ca..61113b09 100644 --- a/examples/FocusSerial/FocusSerial.ino +++ b/examples/FocusSerial/FocusSerial.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -36,7 +36,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-OFF* namespace kaleidoscope { diff --git a/examples/GhostInTheFirmware/GhostInTheFirmware.ino b/examples/GhostInTheFirmware/GhostInTheFirmware.ino index cae21b04..e86e0b71 100644 --- a/examples/GhostInTheFirmware/GhostInTheFirmware.ino +++ b/examples/GhostInTheFirmware/GhostInTheFirmware.ino @@ -21,7 +21,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (___, ___, ___, ___, ___, ___, M(0), ___, ___, ___, ___, ___, ___, ___, @@ -38,7 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { ___, ___, ___, ___, ___), -}; + ) // *INDENT-ON* class EventDropper_ : public kaleidoscope::Plugin { diff --git a/examples/Heatmap/Heatmap.ino b/examples/Heatmap/Heatmap.ino index 8be87587..49ee4855 100644 --- a/examples/Heatmap/Heatmap.ino +++ b/examples/Heatmap/Heatmap.ino @@ -21,7 +21,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -38,7 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, diff --git a/examples/HostOS/HostOS.ino b/examples/HostOS/HostOS.ino index 3315c976..eadc0b90 100644 --- a/examples/HostOS/HostOS.ino +++ b/examples/HostOS/HostOS.ino @@ -20,7 +20,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -37,7 +37,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings, HostOS); diff --git a/examples/HostPowerManagement/HostPowerManagement.ino b/examples/HostPowerManagement/HostPowerManagement.ino index 72d6f9df..065d6696 100644 --- a/examples/HostPowerManagement/HostPowerManagement.ino +++ b/examples/HostPowerManagement/HostPowerManagement.ino @@ -21,7 +21,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -40,7 +40,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey ), -}; +) // *INDENT-ON* void hostPowerManagementEventHandler(kaleidoscope::plugin::HostPowerManagement::Event event) { diff --git a/examples/LED-ActiveModColor/LED-ActiveModColor.ino b/examples/LED-ActiveModColor/LED-ActiveModColor.ino index d06abf10..5f3cd0d9 100644 --- a/examples/LED-ActiveModColor/LED-ActiveModColor.ino +++ b/examples/LED-ActiveModColor/LED-ActiveModColor.ino @@ -19,7 +19,8 @@ #include #include -const Key keymaps[][ROWS][COLS] PROGMEM = { +// *INDENT-OFF* +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -32,12 +33,13 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip, Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals, - Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote, + Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote, Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus, Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) +// *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, ActiveModColorEffect); diff --git a/examples/LED-AlphaSquare/LED-AlphaSquare.ino b/examples/LED-AlphaSquare/LED-AlphaSquare.ino index c4a3eb51..7346fd9c 100644 --- a/examples/LED-AlphaSquare/LED-AlphaSquare.ino +++ b/examples/LED-AlphaSquare/LED-AlphaSquare.ino @@ -21,7 +21,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, M(0), @@ -39,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* const macro_t *macroAction(uint8_t macro_index, uint8_t key_state) { diff --git a/examples/LED-Palette-Theme/LED-Palette-Theme.ino b/examples/LED-Palette-Theme/LED-Palette-Theme.ino index 6abc5481..d066ca5d 100644 --- a/examples/LED-Palette-Theme/LED-Palette-Theme.ino +++ b/examples/LED-Palette-Theme/LED-Palette-Theme.ino @@ -20,6 +20,7 @@ #include #include #include + namespace example { class TestLEDMode : public kaleidoscope::LEDMode { @@ -58,7 +59,7 @@ TestLEDMode::onFocusEvent(const char *command) { example::TestLEDMode TestLEDMode; // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -76,7 +77,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(Focus, LEDPaletteTheme, TestLEDMode, EEPROMSettings); diff --git a/examples/LED-Stalker/LED-Stalker.ino b/examples/LED-Stalker/LED-Stalker.ino index 050fcfe8..9306513a 100644 --- a/examples/LED-Stalker/LED-Stalker.ino +++ b/examples/LED-Stalker/LED-Stalker.ino @@ -20,7 +20,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -38,7 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, diff --git a/examples/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino b/examples/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino index a7ad3224..c17fd55a 100644 --- a/examples/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino +++ b/examples/LEDEffect-BootGreeting/LEDEffect-BootGreeting.ino @@ -20,7 +20,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -38,7 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, diff --git a/examples/LEDEffects/LEDEffects.ino b/examples/LEDEffects/LEDEffects.ino index 0c88da2e..84ac5f97 100644 --- a/examples/LEDEffects/LEDEffects.ino +++ b/examples/LEDEffects/LEDEffects.ino @@ -21,7 +21,7 @@ #include "LED-Off.h" // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_LEDEffectNext, Key_1, Key_2, Key_3, Key_4, Key_5, Key_LEDEffectNext, @@ -39,7 +39,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(LEDControl, diff --git a/examples/Leader/Leader.ino b/examples/Leader/Leader.ino index e49869f6..355237ab 100644 --- a/examples/Leader/Leader.ino +++ b/examples/Leader/Leader.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -36,7 +36,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, LEAD(0)), -}; +) // *INDENT-ON* static void leaderTestA(uint8_t seq_index) { diff --git a/examples/MagicCombo/MagicCombo.ino b/examples/MagicCombo/MagicCombo.ino index 7a45ccbb..0bb6606b 100644 --- a/examples/MagicCombo/MagicCombo.ino +++ b/examples/MagicCombo/MagicCombo.ino @@ -30,7 +30,7 @@ void kindOfMagic(uint8_t combo_index) { USE_MAGIC_COMBOS([KIND_OF_MAGIC] = {.action = kindOfMagic, .keys = {R3C6, R3C9}}); // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -48,7 +48,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(MagicCombo, Macros); diff --git a/examples/OneShot/OneShot.ino b/examples/OneShot/OneShot.ino index 59aece6b..c5dfdb87 100644 --- a/examples/OneShot/OneShot.ino +++ b/examples/OneShot/OneShot.ino @@ -25,7 +25,7 @@ enum { }; // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -61,7 +61,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { ___, ___, ___, ___, ___), -}; +) // *INDENT-ON* void macroOneShotAltControl(uint8_t keyState) { diff --git a/examples/Redial/Redial.ino b/examples/Redial/Redial.ino index 293d0996..39428d76 100644 --- a/examples/Redial/Redial.ino +++ b/examples/Redial/Redial.ino @@ -32,7 +32,7 @@ bool kaleidoscope::plugin::Redial::shouldRemember(Key mapped_key) { } // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -50,7 +50,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_Redial), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(Redial); diff --git a/examples/ShapeShifter/ShapeShifter.ino b/examples/ShapeShifter/ShapeShifter.ino index 14631dee..372bcae0 100644 --- a/examples/ShapeShifter/ShapeShifter.ino +++ b/examples/ShapeShifter/ShapeShifter.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_skip, Key_1, Key_2, Key_3, Key_4, Key_5, Key_skip, @@ -37,7 +37,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_NoKey), -}; +) // *INDENT-ON* static const kaleidoscope::plugin::ShapeShifter::dictionary_t shape_shift_dictionary[] PROGMEM = { diff --git a/examples/SpaceCadet/SpaceCadet.ino b/examples/SpaceCadet/SpaceCadet.ino index bd0d7a34..11ff205a 100644 --- a/examples/SpaceCadet/SpaceCadet.ino +++ b/examples/SpaceCadet/SpaceCadet.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_SpaceCadetEnable, @@ -37,7 +37,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(SpaceCadet); diff --git a/examples/Steno/Steno.ino b/examples/Steno/Steno.ino index c5d02cee..82c98ebf 100644 --- a/examples/Steno/Steno.ino +++ b/examples/Steno/Steno.ino @@ -21,7 +21,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED (Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab, @@ -55,7 +55,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { S(E), S(U), XXX, S(RE2), ___), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(GeminiPR); diff --git a/examples/Syster/Syster.ino b/examples/Syster/Syster.ino index 51a5c025..ef8bd3ed 100644 --- a/examples/Syster/Syster.ino +++ b/examples/Syster/Syster.ino @@ -23,7 +23,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -41,7 +41,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, SYSTER), -}; +) // *INDENT-ON* void systerAction(kaleidoscope::plugin::Syster::action_t action, const char *symbol) { diff --git a/examples/TapDance/TapDance.ino b/examples/TapDance/TapDance.ino index 4093b8cb..be108985 100644 --- a/examples/TapDance/TapDance.ino +++ b/examples/TapDance/TapDance.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -37,7 +37,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, TD(1)), -}; +) // *INDENT-ON* static void tapDanceEsc(uint8_t tap_dance_index, uint8_t tap_count, kaleidoscope::TapDance::ActionType tap_dance_action) { diff --git a/examples/TopsyTurvy/TopsyTurvy.ino b/examples/TopsyTurvy/TopsyTurvy.ino index 1e1e52ed..e01babb9 100644 --- a/examples/TopsyTurvy/TopsyTurvy.ino +++ b/examples/TopsyTurvy/TopsyTurvy.ino @@ -19,7 +19,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, TOPSY(1), TOPSY(2), TOPSY(3), TOPSY(4), TOPSY(5), Key_NoKey, @@ -37,7 +37,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(TopsyTurvy); diff --git a/examples/TypingBreaks/TypingBreaks.ino b/examples/TypingBreaks/TypingBreaks.ino index 2aeae008..c031cb77 100644 --- a/examples/TypingBreaks/TypingBreaks.ino +++ b/examples/TypingBreaks/TypingBreaks.ino @@ -20,7 +20,7 @@ #include // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -38,7 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; +) // *INDENT-ON* KALEIDOSCOPE_INIT_PLUGINS(EEPROMSettings, TypingBreaks); diff --git a/examples/Unicode/Unicode.ino b/examples/Unicode/Unicode.ino index 36c44419..a47aea6a 100644 --- a/examples/Unicode/Unicode.ino +++ b/examples/Unicode/Unicode.ino @@ -25,7 +25,7 @@ enum { MACRO_KEYBOARD_EMOJI }; // *INDENT-OFF* -const Key keymaps[][ROWS][COLS] PROGMEM = { +KEYMAPS( [0] = KEYMAP_STACKED ( Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, @@ -43,8 +43,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = { Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_skip), -}; - +) // *INDENT-ON* static void unicode(uint32_t character, uint8_t keyState) {