Skip to content

Commit 0327f94

Browse files
author
Gregory Schmidt
committed
Merge branch 'master' of https://github.com/Aircoookie/WLED into overlayum
2 parents a5de66b + f4b47ed commit 0327f94

File tree

13 files changed

+1065
-1009
lines changed

13 files changed

+1065
-1009
lines changed

wled00/FX.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ class WS2812FX {
619619
}
620620

621621
void
622-
finalizeInit(uint16_t countPixels),
622+
finalizeInit(),
623623
service(void),
624624
blur(uint8_t),
625625
fill(uint32_t),
@@ -636,7 +636,8 @@ class WS2812FX {
636636
trigger(void),
637637
setSegment(uint8_t n, uint16_t start, uint16_t stop, uint8_t grouping = 0, uint8_t spacing = 0),
638638
resetSegments(),
639-
populateDefaultSegments(),
639+
makeAutoSegments(),
640+
fixInvalidSegments(),
640641
setPixelColor(uint16_t n, uint32_t c),
641642
setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0),
642643
show(void),
@@ -650,6 +651,7 @@ class WS2812FX {
650651
gammaCorrectCol = true,
651652
applyToAllSelected = true,
652653
setEffectConfig(uint8_t m, uint8_t s, uint8_t i, uint8_t p),
654+
checkSegmentAlignment(void),
653655
// return true if the strip is being sent pixel updates
654656
isUpdating(void);
655657

@@ -680,6 +682,8 @@ class WS2812FX {
680682
ablMilliampsMax,
681683
currentMilliamps,
682684
triwave16(uint16_t),
685+
getLengthTotal(void),
686+
getLengthPhysical(void),
683687
getFps();
684688

685689
uint32_t
@@ -839,9 +843,6 @@ class WS2812FX {
839843

840844
uint16_t _cumulativeFps = 2;
841845

842-
void load_gradient_palette(uint8_t);
843-
void handle_palette(void);
844-
845846
bool
846847
_triggered;
847848

@@ -875,7 +876,10 @@ class WS2812FX {
875876

876877
void
877878
blendPixelColor(uint16_t n, uint32_t color, uint8_t blend),
878-
startTransition(uint8_t oldBri, uint32_t oldCol, uint16_t dur, uint8_t segn, uint8_t slot);
879+
startTransition(uint8_t oldBri, uint32_t oldCol, uint16_t dur, uint8_t segn, uint8_t slot),
880+
estimateCurrentAndLimitBri(void),
881+
load_gradient_palette(uint8_t),
882+
handle_palette(void);
879883

880884
uint16_t* customMappingTable = nullptr;
881885
uint16_t customMappingSize = 0;

0 commit comments

Comments
 (0)