From 4ab3126e8e773d0e526c8f67a43081e529801bc2 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Sun, 5 Jun 2022 07:24:33 +0200 Subject: [PATCH] =?UTF-8?q?Run=20the=20code=20through=20Kaleidoscope?= =?UTF-8?q?=E2=80=99s=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LayerBasedTheme.cpp | 33 +++++++++---------- LayerBasedTheme.h | 15 +++++---- Model100.ino | 78 +++++++++++++++++++++------------------------ 3 files changed, 62 insertions(+), 64 deletions(-) diff --git a/LayerBasedTheme.cpp b/LayerBasedTheme.cpp index 8754342..7a51034 100644 --- a/LayerBasedTheme.cpp +++ b/LayerBasedTheme.cpp @@ -5,26 +5,27 @@ namespace kaleidoscope { namespace plugin { - EventHandlerResult LayerBasedTheme::onLayerChange() { - uint8_t current_layer = Layer.mostRecent(); - uint8_t current_mode =::LEDControl.get_mode_index(); - uint8_t new_mode; +EventHandlerResult LayerBasedTheme::onLayerChange() { + uint8_t current_layer = Layer.mostRecent(); + uint8_t current_mode = ::LEDControl.get_mode_index(); + uint8_t new_mode; - if (current_layer <= 3) { - new_mode = 2; - } else { - new_mode = 3; - } + if (current_layer <= 3) { + new_mode = 2; + } else { + new_mode = 3; + } - if (new_mode != current_mode) { - ::LEDControl.set_mode(new_mode); - } + if (new_mode != current_mode) { + ::LEDControl.set_mode(new_mode); + } - return EventHandlerResult::OK; - } + return EventHandlerResult::OK; +} - LayerBasedTheme::TransientLEDMode::TransientLEDMode(const LayerBasedTheme *parent) - : parent_(parent) {}; +LayerBasedTheme::TransientLEDMode::TransientLEDMode( + const LayerBasedTheme *parent) + : parent_(parent){}; } // namespace plugin } // namespace kaleidoscope diff --git a/LayerBasedTheme.h b/LayerBasedTheme.h index 5cfe2e7..9ce7bcb 100644 --- a/LayerBasedTheme.h +++ b/LayerBasedTheme.h @@ -3,24 +3,25 @@ #include "kaleidoscope/event_handler_result.h" #include "kaleidoscope/plugin.h" #include "kaleidoscope/plugin/AccessTransientLEDMode.h" -#include "kaleidoscope/plugin/LEDModeInterface.h" #include "kaleidoscope/plugin/LEDMode.h" +#include "kaleidoscope/plugin/LEDModeInterface.h" namespace kaleidoscope { namespace plugin { class LayerBasedTheme : public Plugin, - public LEDModeInterface, - public AccessTransientLEDMode { - public: + public LEDModeInterface, + public AccessTransientLEDMode { +public: LayerBasedTheme(void) {} EventHandlerResult onLayerChange(); class TransientLEDMode : public LEDMode { - public: - explicit TransientLEDMode(const LayerBasedTheme *parent); + public: + explicit TransientLEDMode(const LayerBasedTheme *parent); + private: - const LayerBasedTheme *parent_; + const LayerBasedTheme *parent_; }; }; } // namespace plugin diff --git a/Model100.ino b/Model100.ino index c916e09..ecca23a 100644 --- a/Model100.ino +++ b/Model100.ino @@ -6,23 +6,22 @@ #define BUILD_INFORMATION "locally built on " __DATE__ " at " __TIME__ #endif - -#include "Kaleidoscope.h" -#include "Kaleidoscope-EEPROM-Settings.h" +#include "Kaleidoscope-Colormap.h" #include "Kaleidoscope-EEPROM-Keymap.h" +#include "Kaleidoscope-EEPROM-Settings.h" #include "Kaleidoscope-FocusSerial.h" -#include "Kaleidoscope-MouseKeys.h" -#include "Kaleidoscope-Macros.h" +#include "Kaleidoscope-HardwareTestMode.h" +#include "Kaleidoscope-HostPowerManagement.h" +#include "Kaleidoscope-LED-Palette-Theme.h" +#include "Kaleidoscope-LED-Stalker.h" #include "Kaleidoscope-LEDControl.h" #include "Kaleidoscope-LEDEffect-BootGreeting.h" #include "Kaleidoscope-LEDEffect-Rainbow.h" -#include "Kaleidoscope-LED-Stalker.h" -#include "Kaleidoscope-LED-Palette-Theme.h" -#include "Kaleidoscope-Colormap.h" -#include "Kaleidoscope-HardwareTestMode.h" -#include "Kaleidoscope-HostPowerManagement.h" +#include "Kaleidoscope-Macros.h" #include "Kaleidoscope-MagicCombo.h" +#include "Kaleidoscope-MouseKeys.h" #include "Kaleidoscope-USB-Quirks.h" +#include "Kaleidoscope.h" #include "LayerBasedTheme.h" @@ -31,30 +30,30 @@ enum { MACRO_ANY, }; - /** The Model 100's key layouts are defined as 'keymaps'. - * - * Each keymap is defined as a list using the 'KEYMAP_STACKED' macro, built - * of first the left hand's layout, followed by the right hand's layout. - * - * Keymaps typically consist mostly of `Key_` definitions. There are many, many keys - * defined as part of the USB HID Keyboard specification. You can find the names - * (if not yet the explanations) for all the standard `Key_` defintions offered by - * Kaleidoscope in these files: - * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/keyboard.h - * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/consumerctl.h - * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/sysctl.h - * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/keymaps.h - * - * Additional things that should be documented here include - * using ___ to let keypresses fall through to the previously active layer - * using XXX to mark a keyswitch as 'blocked' on this layer - * using ShiftToLayer() and LockLayer() keys to change the active keymap. - * keeping NUM and FN consistent and accessible on all layers - * - * A key defined as 'ShiftToLayer(FUNCTION)' will switch to FUNCTION while held. - * Similarly, a key defined as 'LockLayer(FUNCTION)' will switch to FUNCTION when tapped. - */ + * + * Each keymap is defined as a list using the 'KEYMAP_STACKED' macro, built + * of first the left hand's layout, followed by the right hand's layout. + * + * Keymaps typically consist mostly of `Key_` definitions. There are many, many + * keys defined as part of the USB HID Keyboard specification. You can find the + * names (if not yet the explanations) for all the standard `Key_` defintions + * offered by Kaleidoscope in these files: + * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/keyboard.h + * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/consumerctl.h + * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/sysctl.h + * https://github.com/keyboardio/Kaleidoscope/blob/master/src/kaleidoscope/key_defs/keymaps.h + * + * Additional things that should be documented here include + * using ___ to let keypresses fall through to the previously active layer + * using XXX to mark a keyswitch as 'blocked' on this layer + * using ShiftToLayer() and LockLayer() keys to change the active keymap. + * keeping NUM and FN consistent and accessible on all layers + * + * A key defined as 'ShiftToLayer(FUNCTION)' will switch to FUNCTION while held. + * Similarly, a key defined as 'LockLayer(FUNCTION)' will switch to FUNCTION + * when tapped. + */ enum { PRIMARY, @@ -68,7 +67,6 @@ enum { ONEHAND_RIGHT, }; - /* This comment temporarily turns off astyle's indent enforcement * so we can make the keymaps actually resemble the physical key layout better */ @@ -242,8 +240,8 @@ const macro_t *macroAction(uint8_t macro_id, KeyEvent &event) { return MACRO_NONE; } - -void toggleLedsOnSuspendResume(kaleidoscope::plugin::HostPowerManagement::Event event) { +void toggleLedsOnSuspendResume( + kaleidoscope::plugin::HostPowerManagement::Event event) { switch (event) { case kaleidoscope::plugin::HostPowerManagement::Suspend: LEDControl.disable(); @@ -256,14 +254,12 @@ void toggleLedsOnSuspendResume(kaleidoscope::plugin::HostPowerManagement::Event } } -void hostPowerManagementEventHandler(kaleidoscope::plugin::HostPowerManagement::Event event) { +void hostPowerManagementEventHandler( + kaleidoscope::plugin::HostPowerManagement::Event event) { toggleLedsOnSuspendResume(event); } -enum { - COMBO_TOGGLE_NKRO_MODE, - COMBO_ENTER_TEST_MODE -}; +enum { COMBO_TOGGLE_NKRO_MODE, COMBO_ENTER_TEST_MODE }; static void toggleKeyboardProtocol(uint8_t combo_index) { USBQuirks.toggleKeyboardProtocol();