Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for broken max macro #361

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for broken max macro #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/WS2812FX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ bool WS2812FX::service() {
SET_FRAME;
doShow = true;
uint16_t delay = (MODE_PTR(_seg->mode))();
_seg_rt->next_time = now + max(delay, SPEED_MIN);
_seg_rt->next_time = now + ws2812fx_max(delay, SPEED_MIN);
_seg_rt->counter_mode_call++;
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/WS2812FX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,8 @@
#include <Adafruit_NeoPixel.h>
#endif

// include max macro for ESP boards
#ifndef max
#define max(a,b) \
({ __typeof__ (a) _a = (a); \
__typeof__ (b) _b = (b); \
_a > _b ? _a : _b; })
#ifndef ws2812fx_max
#define ws2812fx_max(a, b) ((a) > (b) ? (a) : (b))
#endif

#define DEFAULT_BRIGHTNESS (uint8_t)50
Expand Down
4 changes: 2 additions & 2 deletions src/modes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ uint16_t WS2812FX::mode_theater_chase_rainbow(void) {
*/
uint16_t WS2812FX::mode_running_lights(void) {
uint8_t size = 1 << SIZE_OPTION;
uint8_t sineIncr = max((uint8_t)1, (256 / _seg_len) * size);
uint8_t sineIncr = ws2812fx_max((uint8_t)1, (256 / _seg_len) * size);
for(uint16_t i=0; i < _seg_len; i++) {
int lum = (int)sine8(((i + _seg_rt->counter_mode_step) * sineIncr));
uint32_t color = color_blend(_seg->colors[0], _seg->colors[1], lum);
Expand Down Expand Up @@ -865,7 +865,7 @@ uint16_t WS2812FX::mode_rainbow_fireworks(void) {

// occasionally create a random red pixel
if(random8(4) == 0) {
uint16_t index = _seg->start + 6 + random16(max((uint8_t)1, _seg_len - 12));
uint16_t index = _seg->start + 6 + random16(ws2812fx_max((uint8_t)1, _seg_len - 12));
setRawPixelColor(index, RED); // set the raw pixel color (ignore global brightness)
SET_CYCLE;
}
Expand Down
8 changes: 4 additions & 4 deletions src/modes_funcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,15 @@ uint16_t WS2812FX::fireworks(uint32_t color) {

uint8_t size = 2 << SIZE_OPTION;
if(!_triggered) {
for(uint16_t i=0; i<max((uint8_t)1, _seg_len/20); i++) {
for(uint16_t i=0; i<ws2812fx_max((uint8_t)1, _seg_len/20); i++) {
if(random8(10) == 0) {
uint16_t index = _seg->start + random16(_seg_len - size + 1);
fill(color, index, size);
SET_CYCLE;
}
}
} else {
for(uint16_t i=0; i<max((uint8_t)1, _seg_len/10); i++) {
for(uint16_t i=0; i<ws2812fx_max((uint8_t)1, _seg_len/10); i++) {
uint16_t index = _seg->start + random16(_seg_len - size + 1);
fill(color, index, size);
SET_CYCLE;
Expand All @@ -412,10 +412,10 @@ uint16_t WS2812FX::fire_flicker(int rev_intensity) {
byte r = (_seg->colors[0] >> 16) & 0xFF;
byte g = (_seg->colors[0] >> 8) & 0xFF;
byte b = (_seg->colors[0] & 0xFF);
byte lum = max(w, max(r, max(g, b))) / rev_intensity;
byte lum = ws2812fx_max(w, ws2812fx_max(r, ws2812fx_max(g, b))) / rev_intensity;
for(uint16_t i=_seg->start; i <= _seg->stop; i++) {
int flicker = random8(lum);
setPixelColor(i, max(r - flicker, 0), max(g - flicker, 0), max(b - flicker, 0), max(w - flicker, 0));
setPixelColor(i, ws2812fx_max(r - flicker, 0), ws2812fx_max(g - flicker, 0), ws2812fx_max(b - flicker, 0), ws2812fx_max(w - flicker, 0));
}

SET_CYCLE;
Expand Down