make astyle

pull/389/head
Jesse Vincent 8 years ago
parent 8e3f0ac20e
commit 0489fd9196
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -20,16 +20,16 @@
#include <Kaleidoscope-Heatmap.h> #include <Kaleidoscope-Heatmap.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
uint8_t Heatmap::heatmap[ROWS][COLS]; uint8_t Heatmap::heatmap[ROWS][COLS];
uint16_t Heatmap::totalKeys; uint16_t Heatmap::totalKeys;
uint8_t Heatmap::highestCount; uint8_t Heatmap::highestCount;
uint16_t Heatmap::updateDelay = 500; uint16_t Heatmap::updateDelay = 500;
uint32_t Heatmap::endTime; uint32_t Heatmap::endTime;
const float Heatmap::heatColors[][3] = {{0.0, 0.0, 0.0}, {0.1, 1, 0.1}, {1, 1, 0.1}, {1, 0.1, 0.1}}; const float Heatmap::heatColors[][3] = {{0.0, 0.0, 0.0}, {0.1, 1, 0.1}, {1, 1, 0.1}, {1, 0.1, 0.1}};
void void
Heatmap::shiftStats (void) { Heatmap::shiftStats (void) {
highestCount = totalKeys = 0; highestCount = totalKeys = 0;
for (uint8_t r = 0; r < ROWS; r++) { for (uint8_t r = 0; r < ROWS; r++) {
for (uint8_t c = 0; c < COLS; c++) { for (uint8_t c = 0; c < COLS; c++) {
@ -39,10 +39,10 @@ namespace KaleidoscopePlugins {
highestCount = heatmap[r][c]; highestCount = heatmap[r][c];
} }
} }
} }
cRGB cRGB
Heatmap::computeColor (float v) { Heatmap::computeColor (float v) {
float fb = 0; float fb = 0;
uint8_t idx1, idx2; uint8_t idx1, idx2;
@ -62,20 +62,20 @@ namespace KaleidoscopePlugins {
uint8_t b = (int)(((heatColors[idx2][2] - heatColors[idx1][2]) * fb + heatColors[idx1][2]) * 255); uint8_t b = (int)(((heatColors[idx2][2] - heatColors[idx1][2]) * fb + heatColors[idx1][2]) * 255);
return {b, g, r}; return {b, g, r};
} }
Heatmap::Heatmap (void) { Heatmap::Heatmap (void) {
} }
void void
Heatmap::begin (void) { Heatmap::begin (void) {
LEDControl.mode_add (this); LEDControl.mode_add (this);
event_handler_hook_use (this->eventHook); event_handler_hook_use (this->eventHook);
loop_hook_use (this->loopHook); loop_hook_use (this->loopHook);
} }
Key Key
Heatmap::eventHook (Key mappedKey, byte row, byte col, uint8_t keyState) { Heatmap::eventHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
// if it is a synthetic key, skip it. // if it is a synthetic key, skip it.
if (keyState & INJECTED) if (keyState & INJECTED)
return mappedKey; return mappedKey;
@ -90,16 +90,16 @@ namespace KaleidoscopePlugins {
highestCount = heatmap[row][col]; highestCount = heatmap[row][col];
return mappedKey; return mappedKey;
} }
void void
Heatmap::loopHook (bool postClear) { Heatmap::loopHook (bool postClear) {
if (highestCount > 191 || totalKeys > 16000) if (highestCount > 191 || totalKeys > 16000)
shiftStats(); shiftStats();
} }
void void
Heatmap::update (void) { Heatmap::update (void) {
if (endTime && (millis () > endTime)) if (endTime && (millis () > endTime))
return; return;
@ -112,7 +112,7 @@ namespace KaleidoscopePlugins {
LEDControl.led_set_crgb_at (r, c, computeColor (v)); LEDControl.led_set_crgb_at (r, c, computeColor (v));
} }
} }
} }
}; };
KaleidoscopePlugins::Heatmap HeatmapEffect; KaleidoscopePlugins::Heatmap HeatmapEffect;

@ -22,7 +22,7 @@
#include <Kaleidoscope-LEDControl.h> #include <Kaleidoscope-LEDControl.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class Heatmap : public LEDMode { class Heatmap : public LEDMode {
public: public:
Heatmap (void); Heatmap (void);
@ -44,7 +44,7 @@ namespace KaleidoscopePlugins {
static Key eventHook (Key mappedKey, byte row, byte col, uint8_t keyState); static Key eventHook (Key mappedKey, byte row, byte col, uint8_t keyState);
static void loopHook (bool postClear); static void loopHook (bool postClear);
}; };
}; };
extern KaleidoscopePlugins::Heatmap HeatmapEffect; extern KaleidoscopePlugins::Heatmap HeatmapEffect;

Loading…
Cancel
Save