Update examples

modm-io · Jan 12, 2022 · 4bb51f8 · 4bb51f8
1 parent 045ec4b
commit 4bb51f8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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) )
@@ -137,7 +137,7 @@ static inline void touch(framebuffer_t buffer)
 
 static inline void setPixel(int x, int y, uint8_t color)
 {
-#define DRAW(x, y) displayBuffer[(y) * 800 + (x)] = GET_TRAIL_COLOR(color).color;
+#define DRAW(x, y) displayBuffer[(y) * 800 + (x)] = GET_TRAIL_COLOR(color).getValue();
 #if SCALE >= 8
 	// >:v x:y
 	// 0 |        |
@@ -148,7 +148,7 @@ static inline void setPixel(int x, int y, uint8_t color)
 	// 5 | x    x |
 	// 6 |  xxxx  |
 	// 7 |        |
-GET_TRAIL_COLOR(color).color;
+GET_TRAIL_COLOR(color).getValue();
 	// 1
 	DRAW(x+2, y+1);
 	DRAW(x+3, y+1);

diff --git 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
@@ -139,7 +139,7 @@ struct tcs3472
 	addr(uint8_t version=5)
 	{ return version < 5 ? 0x39 : 0x29; }
 
-	using Rgb = color::RgbT<uint16_t>;
+	using Rgb = color::Rgb161616;
 
 	struct modm_packed
 	Data