alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9 from MaxG87/silence_warning

Browse Source 
Silence warning
pull/365/head
Jesse Vincent 6 years ago committed by GitHub
parent 77704187a4 116f56ab63
commit 88d3ed3780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File

29
src/Kaleidoscope-Model01-TestMode.cpp
Unescape View File

@ -19,11 +19,11 @@
#include "Kaleidoscope-LEDEffect-Rainbow.h" #include "Kaleidoscope-LEDEffect-Rainbow.h"
#define CHATTER_CYCLE_LIMIT 30 constexpr uint8_t CHATTER_CYCLE_LIMIT = 30;
#define TOGGLED_OFF 2 constexpr uint8_t TOGGLED_OFF = 2;
#define TOGGLED_ON 1 constexpr uint8_t TOGGLED_ON = 1;
#define HELD 3 constexpr uint8_t HELD = 3;
#define RELEASED 0 constexpr uint8_t RELEASED = 0;
kaleidoscope::EventHandlerResult TestMode_::beforeReportingState() { kaleidoscope::EventHandlerResult TestMode_::beforeReportingState() {
@ -57,11 +57,10 @@ void TestMode_::set_leds(cRGB color) {
} }
void TestMode_::test_leds(void) { void TestMode_::test_leds(void) {
cRGB red = CRGB(201, 0, 0); constexpr cRGB red = CRGB(201, 0, 0);
cRGB blue = CRGB(0, 0, 201); constexpr cRGB blue = CRGB(0, 0, 201);
cRGB green = CRGB(0, 201, 0); constexpr cRGB green = CRGB(0, 201, 0);
cRGB white = CRGB(50, 50, 50); constexpr cRGB brightWhite = CRGB(160, 160, 160);
cRGB brightWhite = CRGB(160, 160, 160);
// make all the LEDs bright red // make all the LEDs bright red
set_leds(red); set_leds(red);
@ -83,13 +82,13 @@ 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) { 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); constexpr cRGB red = CRGB(201, 0, 0);
cRGB blue = CRGB(0, 0, 201); constexpr cRGB blue = CRGB(0, 0, 201);
cRGB green = CRGB(0, 201, 0); 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) | const uint8_t keyState = ((bitRead(oldState->all, keynum) << 1) |
(bitRead(newState->all, keynum) << 0)); (bitRead(newState->all, keynum) << 0));
if (keyState == TOGGLED_ON) { if (keyState == TOGGLED_ON) {
if (side->cyclesSinceStateChange[keynum] < CHATTER_CYCLE_LIMIT) { if (side->cyclesSinceStateChange[keynum] < CHATTER_CYCLE_LIMIT) {

Write Preview
Loading…
Cancel
Save