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

make astyle

Browse Source
pull/389/head
Jesse Vincent 8 years ago
parent 0fc32dbd94
commit f4b49c30b6
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046
3 changed files with 154 additions and 154 deletions
Show Stats Download Patch File Download Diff File

42
examples/LED-Palette-Theme/LED-Palette-Theme.ino
Unescape View File

@ -25,11 +25,11 @@
namespace Example { namespace Example {
class TestLEDMode : public LEDMode { class TestLEDMode : public LEDMode {
public: public:
TestLEDMode () {}; TestLEDMode() {};
virtual void begin (void) final; virtual void begin(void) final;
virtual void update (void) final; virtual void update(void) final;
static bool focusHook (const char *command); static bool focusHook(const char *command);
private: private:
static uint16_t mapBase; static uint16_t mapBase;
@ -38,19 +38,19 @@ class TestLEDMode : public LEDMode {
uint16_t TestLEDMode::mapBase; uint16_t TestLEDMode::mapBase;
void void
TestLEDMode::begin (void) { TestLEDMode::begin(void) {
LEDMode::begin (); LEDMode::begin();
mapBase = LEDPaletteTheme.reserveThemes (1); mapBase = LEDPaletteTheme.reserveThemes(1);
} }
void void
TestLEDMode::update (void) { TestLEDMode::update(void) {
LEDPaletteTheme.update (mapBase, 0); LEDPaletteTheme.update(mapBase, 0);
} }
bool bool
TestLEDMode::focusHook (const char *command) { TestLEDMode::focusHook(const char *command) {
return LEDPaletteTheme.themeFocusHandler (command, PSTR ("testLedMode.map"), return LEDPaletteTheme.themeFocusHandler(command, PSTR("testLedMode.map"),
mapBase, 1); mapBase, 1);
} }
}; };
@ -78,18 +78,18 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
), ),
}; };
void setup () { void setup() {
Serial.begin (9600); Serial.begin(9600);
Kaleidoscope.use (&Focus, &LEDPaletteTheme, &TestLEDMode, &EEPROMSettings, NULL); Kaleidoscope.use(&Focus, &LEDPaletteTheme, &TestLEDMode, &EEPROMSettings, NULL);
Kaleidoscope.setup (); Kaleidoscope.setup();
EEPROMSettings.seal (); EEPROMSettings.seal();
TestLEDMode.activate (); TestLEDMode.activate();
Focus.addHook (FOCUS_HOOK_LEDPALETTETHEME); Focus.addHook(FOCUS_HOOK_LEDPALETTETHEME);
Focus.addHook (FOCUS_HOOK(TestLEDMode.focusHook, "testLEDMode.map")); Focus.addHook(FOCUS_HOOK(TestLEDMode.focusHook, "testLEDMode.map"));
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

86
src/Kaleidoscope/LED-Palette-Theme.cpp
Unescape View File

@ -26,41 +26,41 @@ namespace KaleidoscopePlugins {
uint16_t LEDPaletteTheme::paletteBase; uint16_t LEDPaletteTheme::paletteBase;
uint8_t LEDPaletteTheme::transparentIndex = 15; uint8_t LEDPaletteTheme::transparentIndex = 15;
LEDPaletteTheme::LEDPaletteTheme (void) { LEDPaletteTheme::LEDPaletteTheme(void) {
} }
void void
LEDPaletteTheme::begin (void) { LEDPaletteTheme::begin(void) {
USE_PLUGINS (&::EEPROMSettings); USE_PLUGINS(&::EEPROMSettings);
if (!paletteBase) if (!paletteBase)
paletteBase = ::EEPROMSettings.requestSlice (16 * sizeof (cRGB)); paletteBase = ::EEPROMSettings.requestSlice(16 * sizeof(cRGB));
} }
uint16_t uint16_t
LEDPaletteTheme::reserveThemes (uint8_t maxThemes) { LEDPaletteTheme::reserveThemes(uint8_t maxThemes) {
return ::EEPROMSettings.requestSlice (maxThemes * ROWS * COLS / 2); return ::EEPROMSettings.requestSlice(maxThemes * ROWS * COLS / 2);
} }
void void
LEDPaletteTheme::update (uint16_t themeBase, uint8_t theme) { LEDPaletteTheme::update(uint16_t themeBase, uint8_t theme) {
uint16_t mapBase = themeBase + (theme * ROWS * COLS / 2); uint16_t mapBase = themeBase + (theme * ROWS * COLS / 2);
for (uint16_t loc = 0; loc < ROWS * COLS; loc++) { for (uint16_t loc = 0; loc < ROWS * COLS; loc++) {
cRGB color; cRGB color;
if (!lookupColor (mapBase, loc, &color)) if (!lookupColor(mapBase, loc, &color))
continue; continue;
LEDControl.led_set_crgb_at (loc, color); LEDControl.led_set_crgb_at(loc, color);
} }
} }
const uint8_t const uint8_t
LEDPaletteTheme::lookupColorIndex (uint16_t mapBase, uint16_t loc) { LEDPaletteTheme::lookupColorIndex(uint16_t mapBase, uint16_t loc) {
uint8_t colorIndex; uint8_t colorIndex;
colorIndex = EEPROM.read (mapBase + loc / 2); colorIndex = EEPROM.read(mapBase + loc / 2);
if (loc % 2) if (loc % 2)
colorIndex &= ~0xf0; colorIndex &= ~0xf0;
else else
@ -70,30 +70,30 @@ LEDPaletteTheme::lookupColorIndex (uint16_t mapBase, uint16_t loc) {
} }
const bool const bool
LEDPaletteTheme::lookupColor (uint16_t mapBase, uint16_t loc, cRGB *color) { LEDPaletteTheme::lookupColor(uint16_t mapBase, uint16_t loc, cRGB *color) {
uint8_t colorIndex = lookupColorIndex (mapBase, loc); uint8_t colorIndex = lookupColorIndex(mapBase, loc);
if (colorIndex == transparentIndex) if (colorIndex == transparentIndex)
return false; return false;
EEPROM.get (paletteBase + colorIndex * sizeof (cRGB), *color); EEPROM.get(paletteBase + colorIndex * sizeof(cRGB), *color);
return true; return true;
} }
const cRGB const cRGB
LEDPaletteTheme::lookupColor (uint8_t index) { LEDPaletteTheme::lookupColor(uint8_t index) {
cRGB color; cRGB color;
EEPROM.get (paletteBase + index * sizeof (cRGB), color); EEPROM.get(paletteBase + index * sizeof(cRGB), color);
return color; return color;
} }
void void
LEDPaletteTheme::updateColor (uint16_t mapBase, uint16_t loc, uint8_t index) { LEDPaletteTheme::updateColor(uint16_t mapBase, uint16_t loc, uint8_t index) {
uint8_t indexes; uint8_t indexes;
indexes = EEPROM.read (mapBase + loc / 2); indexes = EEPROM.read(mapBase + loc / 2);
if (loc % 2) { if (loc % 2) {
uint8_t other = indexes >> 4; uint8_t other = indexes >> 4;
indexes = (other << 4) + index; indexes = (other << 4) + index;
@ -101,23 +101,23 @@ LEDPaletteTheme::updateColor (uint16_t mapBase, uint16_t loc, uint8_t index) {
uint8_t other = indexes & ~0xf0; uint8_t other = indexes & ~0xf0;
indexes = (index << 4) + other; indexes = (index << 4) + other;
} }
EEPROM.update (mapBase + loc / 2, indexes); EEPROM.update(mapBase + loc / 2, indexes);
} }
bool bool
LEDPaletteTheme::paletteFocusHook (const char *command) { LEDPaletteTheme::paletteFocusHook(const char *command) {
if (strcmp_P (command, PSTR ("palette")) != 0) if (strcmp_P(command, PSTR("palette")) != 0)
return false; return false;
if (Serial.peek () == '\n') { if (Serial.peek() == '\n') {
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {
cRGB color; cRGB color;
EEPROM.get (paletteBase + i * sizeof (color), color); EEPROM.get(paletteBase + i * sizeof(color), color);
::Focus.printColor (color.r, color.g, color.b); ::Focus.printColor(color.r, color.g, color.b);
::Focus.printSpace (); ::Focus.printSpace();
} }
Serial.println (); Serial.println();
return true; return true;
} }
@ -125,11 +125,11 @@ LEDPaletteTheme::paletteFocusHook (const char *command) {
while (i < 16 && Serial.peek() != '\n') { while (i < 16 && Serial.peek() != '\n') {
cRGB color; cRGB color;
color.r = Serial.parseInt (); color.r = Serial.parseInt();
color.g = Serial.parseInt (); color.g = Serial.parseInt();
color.b = Serial.parseInt (); color.b = Serial.parseInt();
EEPROM.put (paletteBase + i * sizeof (color), color); EEPROM.put(paletteBase + i * sizeof(color), color);
i++; i++;
} }
@ -137,34 +137,34 @@ LEDPaletteTheme::paletteFocusHook (const char *command) {
} }
bool bool
LEDPaletteTheme::themeFocusHandler (const char *command, const char *expectedCommand, LEDPaletteTheme::themeFocusHandler(const char *command, const char *expectedCommand,
uint16_t themeBase, uint8_t maxThemes) { uint16_t themeBase, uint8_t maxThemes) {
if (strcmp_P (command, expectedCommand) != 0) if (strcmp_P(command, expectedCommand) != 0)
return false; return false;
uint16_t maxIndex = (maxThemes * ROWS * COLS) / 2; uint16_t maxIndex = (maxThemes * ROWS * COLS) / 2;
if (Serial.peek () == '\n') { if (Serial.peek() == '\n') {
for (uint16_t loc = 0; loc < maxIndex; loc++) { for (uint16_t loc = 0; loc < maxIndex; loc++) {
uint8_t indexes = EEPROM.read (themeBase + loc); uint8_t indexes = EEPROM.read(themeBase + loc);
::Focus.printNumber (indexes >> 4); ::Focus.printNumber(indexes >> 4);
::Focus.printSpace (); ::Focus.printSpace();
::Focus.printNumber (indexes & ~0xf0); ::Focus.printNumber(indexes & ~0xf0);
::Focus.printSpace (); ::Focus.printSpace();
} }
Serial.println (); Serial.println();
return true; return true;
} }
uint16_t loc = 0; uint16_t loc = 0;
while ((Serial.peek () != '\n') && (loc < maxIndex)) { while ((Serial.peek() != '\n') && (loc < maxIndex)) {
uint8_t idx1 = Serial.parseInt (); uint8_t idx1 = Serial.parseInt();
uint8_t idx2 = Serial.parseInt (); uint8_t idx2 = Serial.parseInt();
uint8_t indexes = (idx1 << 4) + idx2; uint8_t indexes = (idx1 << 4) + idx2;
EEPROM.update (themeBase + loc, indexes); EEPROM.update(themeBase + loc, indexes);
loc++; loc++;
} }

20
src/Kaleidoscope/LED-Palette-Theme.h
Unescape View File

@ -24,20 +24,20 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class LEDPaletteTheme : public KaleidoscopePlugin { class LEDPaletteTheme : public KaleidoscopePlugin {
public: public:
LEDPaletteTheme (void); LEDPaletteTheme(void);
virtual void begin (void) final; virtual void begin(void) final;
static uint16_t reserveThemes (uint8_t maxThemes); static uint16_t reserveThemes(uint8_t maxThemes);
static void update (uint16_t themeBase, uint8_t theme); static void update(uint16_t themeBase, uint8_t theme);
static const uint8_t lookupColorIndex (uint16_t mapBase, uint16_t loc); static const uint8_t lookupColorIndex(uint16_t mapBase, uint16_t loc);
static const cRGB lookupColor (uint8_t index); static const cRGB lookupColor(uint8_t index);
static const bool lookupColor (uint16_t mapBase, uint16_t loc, cRGB *color); static const bool lookupColor(uint16_t mapBase, uint16_t loc, cRGB *color);
static void updateColor (uint16_t mapBase, uint16_t loc, uint8_t index); static void updateColor(uint16_t mapBase, uint16_t loc, uint8_t index);
static bool paletteFocusHook (const char *command); static bool paletteFocusHook(const char *command);
static bool themeFocusHandler (const char *command, const char *expectedCommand, static bool themeFocusHandler(const char *command, const char *expectedCommand,
uint16_t themeBase, uint8_t maxThemes); uint16_t themeBase, uint8_t maxThemes);
static uint8_t transparentIndex; static uint8_t transparentIndex;

Write Preview
Loading…
Cancel
Save