Update header includes and format code

Signed-off-by: Michael Richters <gedankenexperimenter@gmail.com>
pull/1194/head
Michael Richters 3 years ago
parent d34f63e4eb
commit 396b4220f2
No known key found for this signature in database
GPG Key ID: 1288FD13E4EEF0C0

@ -20,7 +20,7 @@
#include <Arduino.h> // for PSTR, strcmp_P, strncmp_P #include <Arduino.h> // for PSTR, strcmp_P, strncmp_P
#include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings #include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings
#include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial #include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial
#include <stdint.h> // for uint16_t, uint8_t #include <stdint.h> // for uint8_t, uint16_t
#include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_
#include "kaleidoscope/device/device.h" // for VirtualProps::Storage, Base<>::Storage #include "kaleidoscope/device/device.h" // for VirtualProps::Storage, Base<>::Storage

@ -24,6 +24,7 @@
namespace kaleidoscope { namespace kaleidoscope {
namespace plugin { namespace plugin {
class EEPROMSettings : public kaleidoscope::Plugin { class EEPROMSettings : public kaleidoscope::Plugin {
private: private:
struct Settings { struct Settings {
@ -75,6 +76,7 @@ class EEPROMSettings : public kaleidoscope::Plugin {
private: private:
static constexpr uint8_t IGNORE_HARDCODED_LAYER = 0x7e; static constexpr uint8_t IGNORE_HARDCODED_LAYER = 0x7e;
uint16_t next_start_ = sizeof(EEPROMSettings::Settings); uint16_t next_start_ = sizeof(EEPROMSettings::Settings);
bool is_valid_; bool is_valid_;
bool sealed_; bool sealed_;

@ -20,7 +20,6 @@
#include <Arduino.h> // for PSTR, F, __FlashStringHelper, strcmp_P #include <Arduino.h> // for PSTR, F, __FlashStringHelper, strcmp_P
#include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings #include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings
#include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial #include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial
#include <stdint.h> // for uint16_t
#include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_
#include "kaleidoscope/device/device.h" // for VirtualProps::Storage, Base<>::Storage #include "kaleidoscope/device/device.h" // for VirtualProps::Storage, Base<>::Storage

@ -21,7 +21,7 @@
#include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/KeyEvent.h" // for KeyEvent
#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult, EventHandlerResult::E... #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult, EventHandlerResult::E...
#include "kaleidoscope/key_defs.h" // for Key, Key_Escape, Key_NoKey #include "kaleidoscope/key_defs.h" // for Key, Key_NoKey
#include "kaleidoscope/keyswitch_state.h" // for keyIsInjected, keyToggledOn #include "kaleidoscope/keyswitch_state.h" // for keyIsInjected, keyToggledOn
namespace kaleidoscope { namespace kaleidoscope {

@ -22,7 +22,7 @@
#include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/KeyEvent.h" // for KeyEvent
#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult
#include "kaleidoscope/key_defs.h" // for Key #include "kaleidoscope/key_defs.h" // for Key, Key_Escape
#include "kaleidoscope/plugin.h" // for Plugin #include "kaleidoscope/plugin.h" // for Plugin
// DEPRECATED: `OneShotCancelKey` doesn't match our normal naming, and should // DEPRECATED: `OneShotCancelKey` doesn't match our normal naming, and should
@ -50,9 +50,7 @@ class EscapeOneShot : public kaleidoscope::Plugin {
struct Settings { struct Settings {
Key cancel_oneshot_key; Key cancel_oneshot_key;
}; };
Settings settings_ = { Settings settings_ = {.cancel_oneshot_key = Key_Escape};
.cancel_oneshot_key = Key_Escape
};
}; };
class EscapeOneShotConfig : public Plugin { class EscapeOneShotConfig : public Plugin {

@ -19,7 +19,6 @@
#include <Arduino.h> // for PSTR, __FlashStringHelper, F, strcmp_P #include <Arduino.h> // for PSTR, __FlashStringHelper, F, strcmp_P
#include <HardwareSerial.h> // for HardwareSerial #include <HardwareSerial.h> // for HardwareSerial
#include <stdint.h> // for uint8_t
#include <string.h> // for memset #include <string.h> // for memset
#include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_

@ -88,15 +88,15 @@ class MagicCombo : public kaleidoscope::Plugin {
EventHandlerResult afterEachCycle(); EventHandlerResult afterEachCycle();
private: private:
uint16_t start_time_ = 0; uint16_t start_time_ = 0;
uint16_t min_interval_ = 500; uint16_t min_interval_ = 500;
}; };
namespace magiccombo { namespace magiccombo {
extern const MagicCombo::Combo combos[]; extern const MagicCombo::Combo combos[];
extern const uint8_t combos_length; extern const uint8_t combos_length;
} // namespace magiccombo } // namespace magiccombo
} // namespace plugin } // namespace plugin
} // namespace kaleidoscope } // namespace kaleidoscope

@ -18,8 +18,9 @@
#include "kaleidoscope/plugin/PersistentLEDMode.h" #include "kaleidoscope/plugin/PersistentLEDMode.h"
#include <Arduino.h> // for PSTR, strcmp_P, F, __FlashStringHelper
#include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings #include <Kaleidoscope-EEPROM-Settings.h> // for EEPROMSettings
#include <Kaleidoscope-FocusSerial.h> // for Focus #include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial
#include <stdint.h> // for uint8_t, uint16_t #include <stdint.h> // for uint8_t, uint16_t
#include "kaleidoscope/Runtime.h" // for Runtime, Runtime_ #include "kaleidoscope/Runtime.h" // for Runtime, Runtime_

@ -18,7 +18,7 @@
#pragma once #pragma once
#include <stdint.h> // for uint16_t, uint8_t #include <stdint.h> // for uint8_t, uint16_t
#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult
#include "kaleidoscope/plugin.h" // for Plugin #include "kaleidoscope/plugin.h" // for Plugin

@ -162,7 +162,7 @@ EventHandlerResult SpaceCadet::afterEachCycle() {
if (event_queue_.isEmpty()) if (event_queue_.isEmpty())
return EventHandlerResult::OK; return EventHandlerResult::OK;
// Get timeout value for the pending key. // Get timeout value for the pending key.
#ifndef NDEPRECATED #ifndef NDEPRECATED
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

@ -19,7 +19,7 @@
#include <Arduino.h> // for F, __FlashStringHelper #include <Arduino.h> // for F, __FlashStringHelper
#include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial #include <Kaleidoscope-FocusSerial.h> // for Focus, FocusSerial
#include <stdint.h> // for int8_t, uint8_t #include <stdint.h> // for int8_t
#include "kaleidoscope/KeyAddr.h" // for KeyAddr #include "kaleidoscope/KeyAddr.h" // for KeyAddr
#include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/KeyEvent.h" // for KeyEvent

@ -18,7 +18,7 @@
#pragma once #pragma once
#include <Kaleidoscope-Ranges.h> // for SYSTER #include <Kaleidoscope-Ranges.h> // for SYSTER
#include <stdint.h> // for int8_t, uint8_t #include <stdint.h> // for uint8_t, int8_t
#include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/KeyEvent.h" // for KeyEvent
#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult

@ -38,7 +38,7 @@ namespace plugin {
// --- config --- // --- config ---
#ifndef NDEPRECATED #ifndef NDEPRECATED
uint16_t TapDance::time_out = 200; uint16_t TapDance::time_out = 200;
#endif #endif
// --- api --- // --- api ---

@ -21,7 +21,7 @@
#include <stdint.h> // for uint16_t, uint32_t #include <stdint.h> // for uint16_t, uint32_t
#include "kaleidoscope/KeyEvent.h" // for KeyEvent #include "kaleidoscope/KeyEvent.h" // for KeyEvent
#include "kaleidoscope/device/device.h" // for cRGB #include "kaleidoscope/device/device.h" // for cRGB, CRGB
#include "kaleidoscope/event_handler_result.h" // for EventHandlerResult #include "kaleidoscope/event_handler_result.h" // for EventHandlerResult
#include "kaleidoscope/key_defs.h" // for Key #include "kaleidoscope/key_defs.h" // for Key
#include "kaleidoscope/plugin.h" // for Plugin #include "kaleidoscope/plugin.h" // for Plugin

Loading…
Cancel
Save