From 7757b6f5b305518214513a07ed099242d61550ed Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Thu, 21 Apr 2022 22:52:28 -0700 Subject: [PATCH] include data size for feature specific settings locations (#562) locations of the data at the end of the stream can now be applied --- src/NeoPixelBus.h | 6 +++--- src/internal/DotStarColorFeatures.h | 12 ++++++------ src/internal/Lpd6803ColorFeatures.h | 6 +++--- src/internal/Lpd8806ColorFeatures.h | 6 +++--- src/internal/NeoColorFeatures.h | 24 ++++++++++++------------ src/internal/NeoSegmentFeatures.h | 6 +++--- src/internal/NeoTm1814ColorFeatures.h | 4 ++-- src/internal/NeoTm1914ColorFeatures.h | 6 +++--- src/internal/P9813ColorFeatures.h | 6 +++--- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/NeoPixelBus.h b/src/NeoPixelBus.h index 3ec08b4..e3ebbc0 100644 --- a/src/NeoPixelBus.h +++ b/src/NeoPixelBus.h @@ -394,7 +394,7 @@ public: void SetPixelSettings(const typename T_COLOR_FEATURE::SettingsObject& settings) { - T_COLOR_FEATURE::applySettings(_method.getData(), settings); + T_COLOR_FEATURE::applySettings(_method.getData(), _method.getDataSize(), settings); Dirty(); }; @@ -426,13 +426,13 @@ protected: uint8_t* _pixels() { // get pixels data within the data stream - return T_COLOR_FEATURE::pixels(_method.getData()); + return T_COLOR_FEATURE::pixels(_method.getData(), _method.getDataSize()); } const uint8_t* _pixels() const { // get pixels data within the data stream - return T_COLOR_FEATURE::pixels(_method.getData()); + return T_COLOR_FEATURE::pixels(_method.getData(), _method.getDataSize()); } void _rotateLeft(uint16_t rotationCount, uint16_t first, uint16_t last) diff --git a/src/internal/DotStarColorFeatures.h b/src/internal/DotStarColorFeatures.h index 918a12e..2ffe993 100644 --- a/src/internal/DotStarColorFeatures.h +++ b/src/internal/DotStarColorFeatures.h @@ -167,16 +167,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } @@ -188,16 +188,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } diff --git a/src/internal/Lpd6803ColorFeatures.h b/src/internal/Lpd6803ColorFeatures.h index 7099350..fdc4347 100644 --- a/src/internal/Lpd6803ColorFeatures.h +++ b/src/internal/Lpd6803ColorFeatures.h @@ -32,16 +32,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } diff --git a/src/internal/Lpd8806ColorFeatures.h b/src/internal/Lpd8806ColorFeatures.h index 6ffb4d0..62142ed 100644 --- a/src/internal/Lpd8806ColorFeatures.h +++ b/src/internal/Lpd8806ColorFeatures.h @@ -32,16 +32,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } diff --git a/src/internal/NeoColorFeatures.h b/src/internal/NeoColorFeatures.h index 623f442..5c6a0f5 100644 --- a/src/internal/NeoColorFeatures.h +++ b/src/internal/NeoColorFeatures.h @@ -279,16 +279,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } @@ -300,16 +300,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } @@ -321,16 +321,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } @@ -342,16 +342,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } diff --git a/src/internal/NeoSegmentFeatures.h b/src/internal/NeoSegmentFeatures.h index 0198a83..43ccad9 100644 --- a/src/internal/NeoSegmentFeatures.h +++ b/src/internal/NeoSegmentFeatures.h @@ -90,16 +90,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } diff --git a/src/internal/NeoTm1814ColorFeatures.h b/src/internal/NeoTm1814ColorFeatures.h index d19a51d..699b6ce 100644 --- a/src/internal/NeoTm1814ColorFeatures.h +++ b/src/internal/NeoTm1814ColorFeatures.h @@ -76,12 +76,12 @@ public: } } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData + SettingsSize; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData + SettingsSize; } diff --git a/src/internal/NeoTm1914ColorFeatures.h b/src/internal/NeoTm1914ColorFeatures.h index d99572e..25fdd50 100644 --- a/src/internal/NeoTm1914ColorFeatures.h +++ b/src/internal/NeoTm1914ColorFeatures.h @@ -50,7 +50,7 @@ public: typedef NeoTm1914Settings SettingsObject; static const size_t SettingsSize = 6; - static void applySettings(uint8_t* pData, const SettingsObject& settings) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { uint8_t* pSet = pData; uint8_t mode = 0xff; @@ -84,12 +84,12 @@ public: } } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData + SettingsSize; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData + SettingsSize; } diff --git a/src/internal/P9813ColorFeatures.h b/src/internal/P9813ColorFeatures.h index 2212e1f..de0423c 100644 --- a/src/internal/P9813ColorFeatures.h +++ b/src/internal/P9813ColorFeatures.h @@ -99,16 +99,16 @@ public: typedef NeoNoSettings SettingsObject; static const size_t SettingsSize = 0; - static void applySettings(uint8_t*, const SettingsObject&) + static void applySettings([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData, [[maybe_unused]] const SettingsObject& settings) { } - static uint8_t* pixels(uint8_t* pData) + static uint8_t* pixels([[maybe_unused]] uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; } - static const uint8_t* pixels(const uint8_t* pData) + static const uint8_t* pixels([[maybe_unused]] const uint8_t* pData, [[maybe_unused]] size_t sizeData) { return pData; }