Merge pull request #960 from gedankenexperimenter/c/astyle-continuation-indent

Astyle indentation
pull/929/head
Jesse Vincent 4 years ago committed by GitHub
commit e253470ad7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -210,8 +210,8 @@ void RaiseLEDDriver::setCrgbAt(uint8_t i, cRGB crgb) {
cRGB oldColor = RaiseHands::leftHand.led_data.leds[sled_num]; cRGB oldColor = RaiseHands::leftHand.led_data.leds[sled_num];
RaiseHands::leftHand.led_data.leds[sled_num] = crgb; RaiseHands::leftHand.led_data.leds[sled_num] = crgb;
isLEDChangedLeft[uint8_t(sled_num / 8)] |= !(oldColor.r == crgb.r && isLEDChangedLeft[uint8_t(sled_num / 8)] |= !(oldColor.r == crgb.r &&
oldColor.g == crgb.g && oldColor.g == crgb.g &&
oldColor.b == crgb.b); oldColor.b == crgb.b);
} else if (sled_num < 2 * LEDS_PER_HAND) { } else if (sled_num < 2 * LEDS_PER_HAND) {
cRGB oldColor = RaiseHands::rightHand.led_data.leds[sled_num - LEDS_PER_HAND]; cRGB oldColor = RaiseHands::rightHand.led_data.leds[sled_num - LEDS_PER_HAND];
RaiseHands::rightHand.led_data.leds[sled_num - LEDS_PER_HAND] = crgb; RaiseHands::rightHand.led_data.leds[sled_num - LEDS_PER_HAND] = crgb;

@ -58,7 +58,7 @@ EventHandlerResult ColormapEffect::onLayerChange() {
EventHandlerResult ColormapEffect::onFocusEvent(const char *command) { EventHandlerResult ColormapEffect::onFocusEvent(const char *command) {
return ::LEDPaletteTheme.themeFocusEvent(command, PSTR("colormap.map"), return ::LEDPaletteTheme.themeFocusEvent(command, PSTR("colormap.map"),
map_base_, max_layers_); map_base_, max_layers_);
} }
} }

@ -18,9 +18,9 @@
#include <Kaleidoscope-LEDEffects.h> #include <Kaleidoscope-LEDEffects.h>
kaleidoscope::plugin::TriColor JukeboxEffect(CRGB(0xc8, 0xe8, 0xee), /* TM */ kaleidoscope::plugin::TriColor JukeboxEffect(CRGB(0xc8, 0xe8, 0xee), /* TM */
CRGB(0xc3, 0xee, 0x8c), /* VCO */ CRGB(0xc3, 0xee, 0x8c), /* VCO */
CRGB(0x21, 0x38, 0xd7)); /* RN */ CRGB(0x21, 0x38, 0xd7)); /* RN */
kaleidoscope::plugin::TriColor JukeboxAlternateEffect(CRGB(0xc8, 0xe8, 0xee), /* TM */ kaleidoscope::plugin::TriColor JukeboxAlternateEffect(CRGB(0xc8, 0xe8, 0xee), /* TM */
CRGB(0x21, 0x38, 0xd7), /* RN */ CRGB(0x21, 0x38, 0xd7), /* RN */
CRGB(0xc3, 0xee, 0x8c)); /* VCO */ CRGB(0xc3, 0xee, 0x8c)); /* VCO */

@ -26,9 +26,9 @@ namespace symbols {
/* λ */ /* λ */
static constexpr uint16_t Lambda = SYM4x4(1, 0, 0, 0, static constexpr uint16_t Lambda = SYM4x4(1, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,
0, 1, 1, 0, 0, 1, 1, 0,
1, 0, 0, 1); 1, 0, 0, 1);
} }
} }
} }

@ -141,9 +141,9 @@ EventHandlerResult LEDPaletteTheme::onFocusEvent(const char *command) {
} }
EventHandlerResult LEDPaletteTheme::themeFocusEvent(const char *command, EventHandlerResult LEDPaletteTheme::themeFocusEvent(const char *command,
const char *expected_command, const char *expected_command,
uint16_t theme_base, uint16_t theme_base,
uint8_t max_themes) { uint8_t max_themes) {
if (!Runtime.has_leds) if (!Runtime.has_leds)
return EventHandlerResult::OK; return EventHandlerResult::OK;

@ -18,4 +18,4 @@
#include <Kaleidoscope-LEDEffects.h> #include <Kaleidoscope-LEDEffects.h>
kaleidoscope::plugin::TriColor MiamiEffect(CRGB(0x4e, 0xd6, 0xd6), /* Cyan */ kaleidoscope::plugin::TriColor MiamiEffect(CRGB(0x4e, 0xd6, 0xd6), /* Cyan */
CRGB(0xaf, 0x67, 0xfa)); /* Magenta */ CRGB(0xaf, 0x67, 0xfa)); /* Magenta */

@ -200,7 +200,7 @@ EventHandlerResult TapDance::afterEachCycle() {
} }
__attribute__((weak)) void tapDanceAction(uint8_t tap_dance_index, KeyAddr key_addr, uint8_t tap_count, __attribute__((weak)) void tapDanceAction(uint8_t tap_dance_index, KeyAddr key_addr, uint8_t tap_count,
kaleidoscope::plugin::TapDance::ActionType tap_dance_action) { kaleidoscope::plugin::TapDance::ActionType tap_dance_action) {
} }
kaleidoscope::plugin::TapDance TapDance; kaleidoscope::plugin::TapDance TapDance;

@ -356,7 +356,7 @@ class LEDModeManager {
static kaleidoscope::plugin::LEDMode *getLEDMode(uint8_t mode_id); static kaleidoscope::plugin::LEDMode *getLEDMode(uint8_t mode_id);
static void retreiveLEDModeFactoryFromPROGMEM(uint8_t mode_id, static void retreiveLEDModeFactoryFromPROGMEM(uint8_t mode_id,
LEDModeFactory &fac); LEDModeFactory &fac);
static void setupPersistentLEDModes(); static void setupPersistentLEDModes();

Loading…
Cancel
Save