Skip to content

Commit

Permalink
Renamed Mode "Waves" to "Fireworks" - mixed them up. Waves coming soon.
Browse files Browse the repository at this point in the history
My favorite color for FX_MODE_FIREWORKS : 0xFD8700 (speed and brightness 255)
  • Loading branch information
kitesurfer1404 committed Jun 4, 2016
1 parent eab6861 commit 2acda31
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,5 @@ Effects
* **Running Random** - Random colored pixels running.
* **Larson Scanner** - K.I.T.T.
* **Comet** - Fireing comets from one end.
* **Waves** - Droplets creating waves.
* **Waves Random** - Random colored droplets creating waves.
* **Fireworks** - Firework sparks.
* **Fireworks Random** - Random colored firework sparks.
10 changes: 5 additions & 5 deletions WS2812FX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1063,9 +1063,9 @@ void WS2812FX::mode_comet(void) {


/*
* Droplets creating waves.
* Firework sparks.
*/
void WS2812FX::mode_waves(void) {
void WS2812FX::mode_fireworks(void) {
uint32_t px_rgb = 0;
byte px_r = 0;
byte px_g = 0;
Expand Down Expand Up @@ -1129,9 +1129,9 @@ void WS2812FX::mode_waves(void) {


/*
* Random colored droplets creating waves.
* Random colored firework sparks.
*/
void WS2812FX::mode_waves_random(void) {
void WS2812FX::mode_fireworks_random(void) {
_mode_color = color_wheel(random(256));
mode_waves();
mode_fireworks();
}
16 changes: 8 additions & 8 deletions WS2812FX.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
#define FX_MODE_RUNNING_RANDOM 38
#define FX_MODE_LARSON_SCANNER 39
#define FX_MODE_COMET 40
#define FX_MODE_WAVES 41
#define FX_MODE_WAVES_RANDOM 42
#define FX_MODE_FIREWORKS 41
#define FX_MODE_FIREWORKS_RANDOM 42


class WS2812FX : public Adafruit_NeoPixel {
Expand Down Expand Up @@ -160,8 +160,8 @@ class WS2812FX : public Adafruit_NeoPixel {
_mode[FX_MODE_RUNNING_RANDOM] = &WS2812FX::mode_running_random;
_mode[FX_MODE_LARSON_SCANNER] = &WS2812FX::mode_larson_scanner;
_mode[FX_MODE_COMET] = &WS2812FX::mode_comet;
_mode[FX_MODE_WAVES] = &WS2812FX::mode_waves;
_mode[FX_MODE_WAVES_RANDOM] = &WS2812FX::mode_waves_random;
_mode[FX_MODE_FIREWORKS] = &WS2812FX::mode_fireworks;
_mode[FX_MODE_FIREWORKS_RANDOM] = &WS2812FX::mode_fireworks_random;

_name[FX_MODE_STATIC] = "Static";
_name[FX_MODE_BLINK] = "Blink";
Expand Down Expand Up @@ -204,8 +204,8 @@ class WS2812FX : public Adafruit_NeoPixel {
_name[FX_MODE_RUNNING_RANDOM] = "Running Random";
_name[FX_MODE_LARSON_SCANNER] = "Larson Scanner";
_name[FX_MODE_COMET] = "Comet";
_name[FX_MODE_WAVES] = "Waves";
_name[FX_MODE_WAVES_RANDOM] = "Waves Random";
_name[FX_MODE_FIREWORKS] = "Fireworks";
_name[FX_MODE_FIREWORKS_RANDOM] = "Fireworks Random";

_mode_index = DEFAULT_MODE;
_speed = DEFAULT_SPEED;
Expand Down Expand Up @@ -295,8 +295,8 @@ class WS2812FX : public Adafruit_NeoPixel {
mode_running_random(void),
mode_larson_scanner(void),
mode_comet(void),
mode_waves(void),
mode_waves_random(void);
mode_fireworks(void),
mode_fireworks_random(void);

boolean
_running;
Expand Down
4 changes: 2 additions & 2 deletions keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,5 @@ FX_MODE_RUNNING_RED_BLUE KEYWORD2
FX_MODE_RUNNING_RANDOM KEYWORD2
FX_MODE_LARSON_SCANNER KEYWORD2
FX_MODE_COMET KEYWORD2
FX_MODE_WAVES KEYWORD2
FX_MODE_WAVES_RANDOM KEYWORD2
FX_MODE_FIREWORKS KEYWORD2
FX_MODE_FIREWORKS_RANDOM KEYWORD2

0 comments on commit 2acda31

Please sign in to comment.