From 116f56ab630ad18536ed9b1968e0e37236016673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20G=C3=B6rner?= Date: Wed, 10 Oct 2018 00:26:41 +0200 Subject: [PATCH] Constify certain variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Where possible, variables definitions were constified to catch unintentional changes. Signed-off-by: Max Görner --- src/Kaleidoscope-Model01-TestMode.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Kaleidoscope-Model01-TestMode.cpp b/src/Kaleidoscope-Model01-TestMode.cpp index c130c740..9689dfb0 100644 --- a/src/Kaleidoscope-Model01-TestMode.cpp +++ b/src/Kaleidoscope-Model01-TestMode.cpp @@ -57,10 +57,10 @@ void TestMode_::set_leds(cRGB color) { } void TestMode_::test_leds(void) { - cRGB red = CRGB(201, 0, 0); - cRGB blue = CRGB(0, 0, 201); - cRGB green = CRGB(0, 201, 0); - cRGB brightWhite = CRGB(160, 160, 160); + constexpr cRGB red = CRGB(201, 0, 0); + constexpr cRGB blue = CRGB(0, 0, 201); + constexpr cRGB green = CRGB(0, 201, 0); + constexpr cRGB brightWhite = CRGB(160, 160, 160); // make all the LEDs bright red set_leds(red); @@ -82,14 +82,14 @@ void TestMode_::test_leds(void) { void TestMode_::handleKeyEvent(side_data_t *side, keydata_t *oldState, keydata_t *newState, uint8_t row, uint8_t col, uint8_t col_offset) { - cRGB red = CRGB(201, 0, 0); - cRGB blue = CRGB(0, 0, 201); - cRGB green = CRGB(0, 201, 0); + constexpr cRGB red = CRGB(201, 0, 0); + constexpr cRGB blue = CRGB(0, 0, 201); + constexpr cRGB green = CRGB(0, 201, 0); - uint8_t keynum = (row * 8) + (col); + const uint8_t keynum = (row * 8) + (col); - uint8_t keyState = ((bitRead(oldState->all, keynum) << 1) | - (bitRead(newState->all, keynum) << 0)); + const uint8_t keyState = ((bitRead(oldState->all, keynum) << 1) | + (bitRead(newState->all, keynum) << 0)); if (keyState == TOGGLED_ON) { if (side->cyclesSinceStateChange[keynum] < CHATTER_CYCLE_LIMIT) { bitSet(side->badKeys, keynum);