diff --git a/examples/arduino_nano/color/main.cpp b/examples/arduino_nano/color/main.cpp index 80d7cd9d52..a6a79cb688 100644 --- a/examples/arduino_nano/color/main.cpp +++ b/examples/arduino_nano/color/main.cpp @@ -65,7 +65,7 @@ class Sensorthread : public modm::pt::Protothread if (PT_CALL(sensor.readColor())) { const auto rgb = data.getColor(); - MODM_LOG_INFO << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv(rgb) << modm::endl; + MODM_LOG_INFO << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv888(rgb) << modm::endl; } } diff --git a/examples/nucleo_f446re/color/main.cpp b/examples/nucleo_f446re/color/main.cpp index ac80a406ce..228c3c73b1 100644 --- a/examples/nucleo_f446re/color/main.cpp +++ b/examples/nucleo_f446re/color/main.cpp @@ -64,7 +64,7 @@ class ThreadOne : public modm::pt::Protothread if (PT_CALL(sensor.readColor())) { const auto rgb = data.getColor(); - MODM_LOG_INFO << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv(rgb) << modm::endl; + MODM_LOG_INFO << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv888(rgb) << modm::endl; } timeout.restart(500ms); PT_WAIT_UNTIL(timeout.isExpired()); diff --git a/examples/stm32f469_discovery/game_of_life/main.cpp b/examples/stm32f469_discovery/game_of_life/main.cpp index 662edac1bb..ed58237b16 100644 --- a/examples/stm32f469_discovery/game_of_life/main.cpp +++ b/examples/stm32f469_discovery/game_of_life/main.cpp @@ -72,7 +72,7 @@ uint16_t * displayBuffer; #define TRAIL_LENGTH ((1 << TRAIL_POWER) + 1) constexpr uint8_t alive = (1 << TRAIL_POWER); -#define COLOR_SHADE(red, green, blue, fraction) modm::color::Rgb(\ +#define COLOR_SHADE(red, green, blue, fraction) modm::color::Rgb888(\ uint8_t(uint32_t(red) * (fraction) / TRAIL_LENGTH), \ uint8_t(uint32_t(green) * (fraction) / TRAIL_LENGTH), \ uint8_t(uint32_t(blue) * (fraction) / TRAIL_LENGTH) ) diff --git a/examples/stm32f4_discovery/colour_tcs3414/main.cpp b/examples/stm32f4_discovery/colour_tcs3414/main.cpp index c8cc5a5e65..f28d40f70c 100644 --- a/examples/stm32f4_discovery/colour_tcs3414/main.cpp +++ b/examples/stm32f4_discovery/colour_tcs3414/main.cpp @@ -99,7 +99,7 @@ class ThreadOne : public modm::pt::Protothread { if (PT_CALL(sensor.readColor())) { const auto rgb = data.getColor(); - stream << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv(rgb) << modm::endl; + stream << "RGB: " << rgb << "\tHSV: " << modm::color::Hsv888(rgb) << modm::endl; } timeout.restart(500ms); PT_WAIT_UNTIL(timeout.isExpired()); diff --git a/src/modm/driver/color/tcs3472.hpp b/src/modm/driver/color/tcs3472.hpp index 1a20c34ba7..2e6af1593d 100644 --- a/src/modm/driver/color/tcs3472.hpp +++ b/src/modm/driver/color/tcs3472.hpp @@ -139,7 +139,7 @@ struct tcs3472 addr(uint8_t version=5) { return version < 5 ? 0x39 : 0x29; } - using Rgb = color::RgbT; + using Rgb = color::Rgb161616; struct modm_packed Data