Skip to content

Commit 045ec4b

Browse files
TomSawTomSaw
committed
Update src
1 parent afacbd3 commit 045ec4b

File tree

10 files changed

+44
-44
lines changed

10 files changed

+44
-44
lines changed

‎src/modm/board/disco_f469ni/board_display.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class DsiDisplay : public modm::ColorGraphicDisplay
4949
void
5050
clear() final
5151
{
52-
std::fill(buffer, buffer + this->getBufferWidth()*this->getBufferHeight(), this->backgroundColor.color);
52+
std::fill(buffer, buffer + this->getBufferWidth()*this->getBufferHeight(), this->backgroundColor.getValue());
5353
}
5454

5555
void
@@ -62,14 +62,14 @@ class DsiDisplay : public modm::ColorGraphicDisplay
6262
setPixel(int16_t x, int16_t y) final
6363
{
6464
if (x < 0 or 800 <= x or y < 0 or 480 <= y) return;
65-
buffer[y * 800 + x] = this->foregroundColor.color;
65+
buffer[y * 800 + x] = this->foregroundColor.getValue();
6666
}
6767

6868
void
6969
clearPixel(int16_t x, int16_t y) final
7070
{
7171
if (x < 0 or 800 <= x or y < 0 or 480 <= y) return;
72-
buffer[y * 800 + x] = this->backgroundColor.color;
72+
buffer[y * 800 + x] = this->backgroundColor.getValue();
7373
}
7474

7575
modm::color::Rgb565

‎src/modm/driver/color/tcs3414.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ struct tcs3414
123123
};
124124

125125

126-
using Rgb = color::RgbT<uint16_t>;
126+
using Rgb = color::Rgb161616;
127127

128128
struct modm_packed
129129
Data

‎src/modm/driver/display/ili9341_impl.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ void
202202
Ili9341<Interface, Reset, Backlight, BufferSize>::drawHorizontalLine(
203203
glcd::Point start, uint16_t length)
204204
{
205-
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
205+
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.getValue()) };
206206
auto minLength { std::min(std::size_t(length), BufferSize) };
207207
uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
208208
std::fill(buffer16, buffer16+minLength, pixelValue);
@@ -223,7 +223,7 @@ void
223223
Ili9341<Interface, Reset, Backlight, BufferSize>::drawVerticalLine(
224224
glcd::Point start, uint16_t length)
225225
{
226-
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
226+
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.getValue()) };
227227
auto minLength { std::min(std::size_t(length), BufferSize) };
228228
uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
229229
std::fill(buffer16, buffer16+minLength, pixelValue);
@@ -248,7 +248,7 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::fillRectangle(
248248
auto const y { upperLeft.getY() };
249249
std::size_t pixelCount { std::size_t(width) * std::size_t(height) };
250250

251-
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.color) };
251+
uint16_t const pixelValue { modm::toBigEndian(foregroundColor.getValue()) };
252252
auto minLength { std::min(std::size_t(pixelCount), BufferSize) };
253253
uint16_t *buffer16 { reinterpret_cast<uint16_t *>(buffer) };
254254
std::fill(buffer16, buffer16+minLength, pixelValue);
@@ -270,8 +270,8 @@ void
270270
Ili9341<Interface, Reset, Backlight, BufferSize>::fillCircle(
271271
glcd::Point center, uint16_t radius)
272272
{
273-
uint8_t const setColor[] { uint8_t((foregroundColor.color >> 8) & 0xff),
274-
uint8_t(foregroundColor.color & 0xff) };
273+
uint8_t const setColor[] { uint8_t((foregroundColor.getValue() >> 8) & 0xff),
274+
uint8_t(foregroundColor.getValue() & 0xff) };
275275

276276
int16_t f = 1 - radius;
277277
int16_t ddF_x = 0;
@@ -317,10 +317,10 @@ void
317317
Ili9341<Interface, Reset, Backlight, BufferSize>::drawImageRaw(glcd::Point upperLeft,
318318
uint16_t width, uint16_t height, modm::accessor::Flash<uint8_t> data)
319319
{
320-
uint8_t const setColor[] { uint8_t((foregroundColor.color >> 8) & 0xff),
321-
uint8_t(foregroundColor.color & 0xff) };
322-
uint8_t const clearColor[] { uint8_t((backgroundColor.color >> 8) & 0xff),
323-
uint8_t(backgroundColor.color & 0xff) };
320+
uint8_t const setColor[] { uint8_t((foregroundColor.getValue() >> 8) & 0xff),
321+
uint8_t(foregroundColor.getValue() & 0xff) };
322+
uint8_t const clearColor[] { uint8_t((backgroundColor.getValue() >> 8) & 0xff),
323+
uint8_t(backgroundColor.getValue() & 0xff) };
324324

325325
BatchHandle h(*this);
326326

@@ -392,7 +392,7 @@ Ili9341<Interface, Reset, Backlight, BufferSize>::setColoredPixel(
392392
int16_t x, int16_t y, color::Rgb565 const &color)
393393
{
394394
auto const pixelColor { color };
395-
uint8_t const setColor[] { uint8_t((pixelColor.color >> 8) & 0xff), uint8_t(pixelColor.color & 0xff) };
395+
uint8_t const setColor[] { uint8_t((pixelColor.getValue() >> 8) & 0xff), uint8_t(pixelColor.getValue() & 0xff) };
396396

397397
BatchHandle h(*this);
398398

‎src/modm/driver/display/parallel_tft_impl.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ modm::ParallelTft<INTERFACE>::clear()
110110
interface.writeIndex(0x0022);
111111
for (uint32_t i = 0; i < MAX_X * MAX_Y; i++)
112112
{
113-
interface.writeData(backgroundColor.color);
113+
interface.writeData(backgroundColor.getValue());
114114
}
115115
}
116116

@@ -123,7 +123,7 @@ modm::ParallelTft<INTERFACE>::setPixel(int16_t x, int16_t y)
123123
}
124124

125125
writeCursor(x, y);
126-
interface.writeRegister(0x0022, foregroundColor.color);
126+
interface.writeRegister(0x0022, foregroundColor.getValue());
127127
}
128128

129129
template <typename INTERFACE>

‎src/modm/driver/pwm/apa102.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,29 @@ class Apa102
4343
}
4444

4545
bool
46-
setColorBrightness(size_t index, const color::Rgb &color, uint8_t brightness)
46+
setColorBrightness(size_t index, const color::Rgb888 &color, uint8_t brightness)
4747
{
4848
if (index >= LEDs) return false;
49-
uint32_t value = (color.red << 24) | (color.green << 16) |
50-
(color.blue << 8) | (brightness | 0xe0);
49+
uint32_t value = (color.getRed() << 24) | (color.getGreen() << 16) |
50+
(color.getBlue() << 8) | (brightness | 0xe0);
5151
reinterpret_cast<uint32_t*>(data)[1+index] = value;
5252
return true;
5353
}
5454

5555
bool
56-
setColor(size_t index, const color::Rgb &color)
56+
setColor(size_t index, const color::Rgb888 &color)
5757
{
5858
if (index >= LEDs) return false;
5959
// read the brightness value and clear all colors
6060
uint32_t value = reinterpret_cast<const uint32_t*>(data)[1+index] & 0xfful;
6161
// set all colors
62-
value |= (color.red << 24) | (color.green << 16) | (color.blue << 8);
62+
value |= (color.getRed() << 24) | (color.getGreen() << 16) | (color.getBlue() << 8);
6363
// write back entire value
6464
reinterpret_cast<uint32_t*>(data)[1+index] = value;
6565
return true;
6666
}
6767

68-
color::Rgb
68+
color::Rgb888
6969
getColor(size_t index) const
7070
{
7171
if (index >= LEDs) return {};

‎src/modm/driver/pwm/sk6812w.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ class Sk6812w
7272
}
7373

7474
void
75-
setColorBrightness(size_t index, const color::Rgb &color, uint8_t brightness)
75+
setColorBrightness(size_t index, const color::Rgb888 &color, uint8_t brightness)
7676
{
7777
if (index >= LEDs) return;
7878

79-
const uint8_t colors[] = {color.green, color.red, color.blue, brightness};
79+
const uint8_t colors[] = {color.getGreen(), color.getRed(), color.getBlue(), brightness};
8080
for (size_t ii = 0; ii < 4; ii++)
8181
{
8282
const uint32_t c = (spread(colors[ii]) << 12) | spread(colors[ii] >> 4);
@@ -86,11 +86,11 @@ class Sk6812w
8686
}
8787

8888
void
89-
setColor(size_t index, const color::Rgb &color)
89+
setColor(size_t index, const color::Rgb888 &color)
9090
{
9191
if (index >= LEDs) return;
9292

93-
const uint8_t colors[] = {color.green, color.red, color.blue};
93+
const uint8_t colors[] = {color.getGreen(), color.getRed(), color.getBlue()};
9494
for (size_t ii = 0; ii < 3; ii++)
9595
{
9696
const uint32_t c = (spread(colors[ii]) << 12) | spread(colors[ii] >> 4);
@@ -99,7 +99,7 @@ class Sk6812w
9999
}
100100
}
101101

102-
color::Rgb
102+
color::Rgb888
103103
getColor(size_t index) const
104104
{
105105
if (index >= LEDs) return {};

‎src/modm/driver/pwm/ws2812b.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ class Ws2812b
7272
}
7373

7474
void
75-
setColor(size_t index, const color::Rgb &color)
75+
setColor(size_t index, const color::Rgb888 &color)
7676
{
7777
if (index >= LEDs) return;
7878

79-
const uint8_t colors[3] = {color.green, color.red, color.blue};
79+
const uint8_t colors[3] = {color.getGreen(), color.getRed(), color.getBlue()};
8080
for (size_t ii = 0; ii < 3; ii++)
8181
{
8282
const uint32_t c = (spread(colors[ii]) << 12) | spread(colors[ii] >> 4);
@@ -85,7 +85,7 @@ class Ws2812b
8585
}
8686
}
8787

88-
color::Rgb
88+
color::Rgb888
8989
getColor(size_t index) const
9090
{
9191
if (index >= LEDs) return {};

‎src/modm/ui/display/virtual_graphic_display.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ void
3131
modm::VirtualGraphicDisplay::clear()
3232
{
3333
//TODO switch black , white
34-
this->display->setColor(color::Rgb(0, 0, 0));
34+
this->display->setColor(color::Rgb888(0, 0, 0));
3535
this->display->fillRectangle(this->leftUpper, width, height);
36-
this->display->setColor(color::Rgb(255, 255, 255));
36+
this->display->setColor(color::Rgb888(255, 255, 255));
3737
}
3838

3939
void

‎src/modm/ui/led/module.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ modm::ui::Led leds[3] =
188188
// Group them together as one RGB LED
189189
modm::ui::RgbLed rgb(leds[1], leds[0], leds[2]);
190190
// animate to orange within 2 seconds
191-
rgb.fadeTo(modm::ui::Rgb(95, 177, 147), 2000);
191+
rgb.fadeTo(modm::ui::Rgb888(95, 177, 147), 2000);
192192
```
193193

194194

‎src/modm/ui/led/rgb.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@ class RgbLed
3535
Led& green;
3636
Led& blue;
3737

38-
::modm::color::Rgb absolute;
38+
::modm::color::Rgb888 absolute;
3939

4040
public:
4141
RgbLed(Led& red, Led& green, Led& blue):
4242
red(red), green(green), blue(blue) {}
4343

4444
inline void
45-
setColor(::modm::color::Rgb color)
45+
setColor(::modm::color::Rgb888 color)
4646
{
4747
absolute = color;
4848

49-
red.setBrightness(color.red);
50-
green.setBrightness(color.green);
51-
blue.setBrightness(color.blue);
49+
red.setBrightness(color.getRed());
50+
green.setBrightness(color.getGreen());
51+
blue.setBrightness(color.getBlue());
5252
}
5353

54-
inline ::modm::color::Rgb
54+
inline ::modm::color::Rgb888
5555
getColor()
5656
{
57-
return ::modm::color::Rgb(
57+
return ::modm::color::Rgb888(
5858
red.getBrightness(), green.getBrightness(), blue.getBrightness());
5959
}
6060

@@ -65,13 +65,13 @@ class RgbLed
6565
}
6666

6767
inline void
68-
fadeTo(::modm::color::Rgb color, uint16_t time)
68+
fadeTo(::modm::color::Rgb888 color, uint16_t time)
6969
{
7070
absolute = color;
7171

72-
red.fadeTo(absolute.red, time);
73-
green.fadeTo(absolute.green, time);
74-
blue.fadeTo(absolute.blue, time);
72+
red.fadeTo(absolute.getRed(), time);
73+
green.fadeTo(absolute.getGreen(), time);
74+
blue.fadeTo(absolute.getBlue(), time);
7575
}
7676

7777
/// should be called every 1ms or more.

0 commit comments

Comments
 (0)