simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Intergated changes of original projects

Browse Source
This commit is contained in:
BPoH_Voodoo
2018-03-03 10:13:58 +01:00
parent e1857746f8
commit 23ddc2e86f
4 changed files with 54 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/WS2812FX.h
+9 -2
View File
@@ -50,6 +50,8 @@
#define BRIGHTNESS_MIN 0
#define BRIGHTNESS_MAX 255
#define MAX_NUM_SEGMENTS 10
#define NUM_COLORS 4 /* number of colors per segment */
#define SEGMENT _segments[_segment_index]
@@ -70,7 +72,7 @@
#define ORANGE 0x00FF3000
#define ULTRAWHITE 0xFFFFFFFF
#define MODE_COUNT 56
#define MODE_COUNT 57
#define FX_MODE_STATIC 0
#define FX_MODE_BLINK 1
@@ -128,6 +130,7 @@
#define FX_MODE_BICOLOR_CHASE 53
#define FX_MODE_TRICOLOR_CHASE 54
#define FX_MODE_ICU 55
#define FX_MODE_CUSTOM 56
class WS2812FX : public Adafruit_NeoPixel {
@@ -219,6 +222,7 @@ class WS2812FX : public Adafruit_NeoPixel {
_mode[FX_MODE_RUNNING_LIGHTS] = &WS2812FX::mode_running_lights;
_mode[FX_MODE_ICU] = &WS2812FX::mode_icu;
#endif
_mode[FX_MODE_CUSTOM] = &WS2812FX::mode_custom;
_name[FX_MODE_STATIC] = F("Static");
_name[FX_MODE_BLINK] = F("Blink");
@@ -276,6 +280,7 @@ class WS2812FX : public Adafruit_NeoPixel {
_name[FX_MODE_BICOLOR_CHASE] = F("Bicolor Chase");
_name[FX_MODE_TRICOLOR_CHASE] = F("Tricolor Chase");
_name[FX_MODE_ICU] = F("ICU");
_name[FX_MODE_CUSTOM] = F("Custom");
_brightness = DEFAULT_BRIGHTNESS;
_running = false;
@@ -294,6 +299,7 @@ class WS2812FX : public Adafruit_NeoPixel {
start(void),
stop(void),
setMode(uint8_t m),
setCustomMode(uint16_t (*p)()),
setSpeed(uint16_t s),
increaseSpeed(uint8_t s),
decreaseSpeed(uint8_t s),
@@ -405,7 +411,8 @@ class WS2812FX : public Adafruit_NeoPixel {
tricolor_chase(uint32_t, uint32_t, uint32_t),
mode_bicolor_chase(void),
mode_tricolor_chase(void),
mode_icu(void);
mode_icu(void),
mode_custom(void);
boolean
_running,