Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code robustness improvements plus minor speedup

Browse Source 
* make  XY() and _setPixelColorXY_raw() const (minor speedup)
* segment is a struct not a class: friend class Segment --> friend struct Segment
* fix missing braces around two macros
* use non-throwing "new" where possible
* improve robustness of transition code
This commit is contained in:
Frank
2025-01-07 15:09:29 +01:00
parent 32b22636fa
commit f8a673ce81
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/FX.h
View File

@@ -610,7 +610,7 @@ typedef struct Segment {
uint16_t progress(void) const; //transition progression between 0-65535
// WLEDMM method inlined for speed (its called at each setPixelColor)
inline uint8_t currentBri(uint8_t briNew, bool useCct = false) {
[[gnu::hot]] inline uint8_t currentBri(uint8_t briNew, bool useCct = false) {
uint32_t prog = (transitional && _t) ? progress() : 0xFFFFU;
if (transitional && _t && prog < 0xFFFFU) {
if (useCct) return ((briNew * prog) + _t->_cctT * (0xFFFFU - prog)) >> 16;
@@ -703,7 +703,7 @@ typedef struct Segment {
void deletejMap(); //WLEDMM jMap
#ifndef WLED_DISABLE_2D
inline uint16_t XY(uint_fast16_t x, uint_fast16_t y) const { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
[[gnu::hot]] inline uint16_t XY(uint_fast16_t x, uint_fast16_t y) const { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
uint_fast16_t width = max(uint16_t(1), virtualWidth()); // segment width in logical pixels -- softhack007 avoid div/0
uint_fast16_t height = max(uint16_t(1), virtualHeight()); // segment height in logical pixels -- softhack007 avoid div/0
return (x%width) + (y%height) * width;
@@ -711,7 +711,7 @@ typedef struct Segment {
#ifdef WLEDMM_FASTPATH
// WLEDMM this is a "gateway" function - we either call _fast or fall back to "slow"
inline void setPixelColorXY(int x, int y, uint32_t col) {
[[gnu::hot]] inline void setPixelColorXY(int x, int y, uint32_t col) {
if (!_isSimpleSegment) { // slow path
setPixelColorXY_slow(x, y, col);
} else { // fast path
@@ -724,7 +724,7 @@ typedef struct Segment {
setPixelColorXY_fast(x, y, col, scaled_col, int(_2dWidth), int(_2dHeight)); // call "fast" function
}
}
inline uint32_t getPixelColorXY(int x, int y) const {
[[gnu::hot]] inline uint32_t getPixelColorXY(int x, int y) const {
// minimal sanity checks
if (!_isValid2D) return 0; // not active
if ((unsigned(x) >= _2dWidth) || (unsigned(y) >= _2dHeight)) return 0 ; // check if (x,y) are out-of-range - due to 2's complement, this also catches negative values
@@ -1080,7 +1080,7 @@ class WS2812FX { // 96 bytes
#endif
std::vector<segment> _segments;
friend class Segment;
friend struct Segment;
uint32_t getPixelColorXYRestored(uint16_t x, uint16_t y) const; // WLEDMM gets the original color from the driver (without downscaling by _bri)