feedc0de/NeoPixelBus
1
0
Fork 0
forked from Makuna/NeoPixelBus
Code Pull Requests Activity

include data size for feature specific settings locations (#562)

Browse Source 
locations of the data at the end of the stream can now be applied
This commit is contained in:
Michael Miller
2022-04-21 22:52:28 -07:00
committed by GitHub
parent 97364bfc24
commit 7757b6f5b3
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NeoPixelBus.h
View File

@@ -394,7 +394,7 @@ public:
void SetPixelSettings(const typename T_COLOR_FEATURE::SettingsObject& settings) 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(); Dirty();
}; };
@@ -426,13 +426,13 @@ protected:
uint8_t* _pixels() uint8_t* _pixels()
{ {
// get pixels data within the data stream // 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 const uint8_t* _pixels() const
{ {
// get pixels data within the data stream // 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) void _rotateLeft(uint16_t rotationCount, uint16_t first, uint16_t last)

12
src/internal/DotStarColorFeatures.h
View File

@@ -167,16 +167,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }
@@ -188,16 +188,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }

6
src/internal/Lpd6803ColorFeatures.h
View File

@@ -32,16 +32,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }

6
src/internal/Lpd8806ColorFeatures.h
View File

@@ -32,16 +32,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }

24
src/internal/NeoColorFeatures.h
View File

@@ -279,16 +279,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }
@@ -300,16 +300,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }
@@ -321,16 +321,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }
@@ -342,16 +342,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }

6
src/internal/NeoSegmentFeatures.h
View File

@@ -90,16 +90,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }

4
src/internal/NeoTm1814ColorFeatures.h
View File

@@ -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; 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; return pData + SettingsSize;
} }

6
src/internal/NeoTm1914ColorFeatures.h
View File

@@ -50,7 +50,7 @@ public:
typedef NeoTm1914Settings SettingsObject; typedef NeoTm1914Settings SettingsObject;
static const size_t SettingsSize = 6; 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* pSet = pData;
uint8_t mode = 0xff; 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; 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; return pData + SettingsSize;
} }

6
src/internal/P9813ColorFeatures.h
View File

@@ -99,16 +99,16 @@ public:
typedef NeoNoSettings SettingsObject; typedef NeoNoSettings SettingsObject;
static const size_t SettingsSize = 0; 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; 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; return pData;
} }