RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #12727 from benpicco/color_util

Browse Source 
sys/color: add color_rgb_set_brightness() and color_rgb_shift()
This commit is contained in:
benpicco 2020-01-10 23:27:45 +01:00 committed by GitHub
commit 5f1b09bd2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/include/color.h
View File

@ -127,6 +127,45 @@ static inline void color_rgb_invert(const color_rgb_t *rgb, color_rgb_t *inv_rgb
inv_rgb->b = rgb->b ^ 0xFF;
}
/**
* @brief Shifts a given rgb color to change it's brightness
*
* @pre ((rgb != NULL) && (out != NULL))
*
* @param[in] rgb Input rgb color, that should be shifted. Must be NOT NULL
* @param[out] out Output rgb color, result of the shift. Must be NOT NULL
* @param[in] shift Amount by which the color components should be shifted.
* May be positive (shift to left) or negative (shift to right).
*/
static inline void color_rgb_shift(const color_rgb_t *rgb, color_rgb_t *out, int8_t shift)
{
if (shift > 0) {
out->r = rgb->r << shift;
out->g = rgb->g << shift;
out->b = rgb->b << shift;
} else {
out->r = rgb->r >> -shift;
out->g = rgb->g >> -shift;
out->b = rgb->b >> -shift;
}
}
/**
* @brief Change the brightness of a RGB color by multiplying it with a set factor.
*
* @pre ((rgb != NULL) && (out != NULL))
*
* @param[in] rgb Input rgb color, that should be multiplied. Must be NOT NULL
* @param[out] out Output rgb color. Must be NOT NULL
* @param[in] level New brightness level. 255 = Full Brightness, 0 = Off.
*/
static inline void color_rgb_set_brightness(const color_rgb_t *rgb, color_rgb_t *out, uint8_t level)
{
out->r = ((unsigned)rgb->r * level + 128) >> 8;
out->g = ((unsigned)rgb->g * level + 128) >> 8;
out->b = ((unsigned)rgb->b * level + 128) >> 8;
}
/**
* @brief Calculate the complementary color of a given rgb color.
*

18
tests/driver_ws281x/main.c
View File

@ -73,24 +73,18 @@ int main(void)
puts("Animation: Fading rainbow...");
last_wakeup = xtimer_now();
for (unsigned i = 0; i < RAINBOW_LEN; i++) {
for (unsigned j = 0; j < 100; j++) {
color_rgb_t col = {
.r = (uint8_t)(((unsigned)rainbow[i].r * j + 50) / 100),
.g = (uint8_t)(((unsigned)rainbow[i].g * j + 50) / 100),
.b = (uint8_t)(((unsigned)rainbow[i].b * j + 50) / 100),
};
for (unsigned j = 0; j < 255; j++) {
color_rgb_t col;
color_rgb_set_brightness(&rainbow[i], &col, j);
for (uint16_t k = 0; k < dev.params.numof; k++) {
ws281x_set(&dev, k, col);
}
ws281x_write(&dev);
xtimer_periodic_wakeup(&last_wakeup, 10 * US_PER_MS);
}
for (unsigned j = 100; j > 0; j--) {
color_rgb_t col = {
.r = (uint8_t)(((unsigned)rainbow[i].r * j + 50) / 100),
.g = (uint8_t)(((unsigned)rainbow[i].g * j + 50) / 100),
.b = (uint8_t)(((unsigned)rainbow[i].b * j + 50) / 100),
};
for (unsigned j = 255; j > 0; j--) {
color_rgb_t col;
color_rgb_set_brightness(&rainbow[i], &col, j);
for (uint16_t k = 0; k < dev.params.numof; k++) {
ws281x_set(&dev, k, col);
}