Skip to content

Commit 6b9c84f

Browse files
authored
fix(bsp): Fix bsp components which forgot to convert scale between display brightness and bsp brightness -.- (#499)
1 parent 02a41be commit 6b9c84f

File tree

9 files changed

+27
-18
lines changed

9 files changed

+27
-18
lines changed

components/esp-box/src/video.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ bool EspBox::initialize_display(size_t pixel_buffer_size) {
118118
.rotation_callback = DisplayDriver::rotate,
119119
.rotation = rotation},
120120
Display<Pixel>::OledConfig{
121-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
122-
.get_brightness_callback = [this]() { return this->brightness(); }},
121+
.set_brightness_callback =
122+
[this](float brightness) { this->brightness(brightness / 100.0f); },
123+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
123124
Display<Pixel>::DynamicMemoryConfig{
124125
.pixel_buffer_size = pixel_buffer_size,
125126
.double_buffered = true,

components/matouch-rotary-display/src/matouch-rotary-display.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,9 @@ bool MatouchRotaryDisplay::initialize_display(size_t pixel_buffer_size) {
313313
.rotation_callback = DisplayDriver::rotate,
314314
.rotation = rotation},
315315
Display<Pixel>::OledConfig{
316-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
317-
.get_brightness_callback = [this]() { return this->brightness(); }},
316+
.set_brightness_callback =
317+
[this](float brightness) { this->brightness(brightness / 100.0f); },
318+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
318319
Display<Pixel>::DynamicMemoryConfig{
319320
.pixel_buffer_size = pixel_buffer_size,
320321
.double_buffered = true,

components/seeed-studio-round-display/src/seeed-studio-round-display.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,9 @@ bool SsRoundDisplay::initialize_display(size_t pixel_buffer_size) {
273273
.rotation_callback = DisplayDriver::rotate,
274274
.rotation = rotation},
275275
Display<Pixel>::OledConfig{
276-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
277-
.get_brightness_callback = [this]() { return this->brightness(); }},
276+
.set_brightness_callback =
277+
[this](float brightness) { this->brightness(brightness / 100.0f); },
278+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
278279
Display<Pixel>::DynamicMemoryConfig{
279280
.pixel_buffer_size = pixel_buffer_size,
280281
.double_buffered = true,

components/t-deck/src/t-deck.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,9 @@ bool TDeck::initialize_display(size_t pixel_buffer_size) {
368368
.rotation_callback = DisplayDriver::rotate,
369369
.rotation = rotation},
370370
Display<Pixel>::OledConfig{
371-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
372-
.get_brightness_callback = [this]() { return this->brightness(); }},
371+
.set_brightness_callback =
372+
[this](float brightness) { this->brightness(brightness / 100.0f); },
373+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
373374
Display<Pixel>::DynamicMemoryConfig{
374375
.pixel_buffer_size = pixel_buffer_size,
375376
.double_buffered = true,

components/t-dongle-s3/src/t-dongle-s3.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,9 @@ bool TDongleS3::initialize_display(size_t pixel_buffer_size) {
228228
.rotation_callback = DisplayDriver::rotate,
229229
.rotation = rotation},
230230
Display<Pixel>::OledConfig{
231-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
232-
.get_brightness_callback = [this]() { return this->brightness(); }},
231+
.set_brightness_callback =
232+
[this](float brightness) { this->brightness(brightness / 100.0f); },
233+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
233234
Display<Pixel>::DynamicMemoryConfig{
234235
.pixel_buffer_size = pixel_buffer_size,
235236
.double_buffered = true,

components/wrover-kit/src/wrover-kit.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ bool WroverKit::initialize_display(size_t pixel_buffer_size) {
120120
.rotation_callback = DisplayDriver::rotate,
121121
.rotation = rotation},
122122
Display<Pixel>::OledConfig{
123-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
124-
.get_brightness_callback = [this]() { return this->brightness(); }},
123+
.set_brightness_callback =
124+
[this](float brightness) { this->brightness(brightness / 100.0f); },
125+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
125126
Display<Pixel>::DynamicMemoryConfig{
126127
.pixel_buffer_size = pixel_buffer_size,
127128
.double_buffered = true,

components/ws-s3-geek/src/ws-s3-geek.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,9 @@ bool WsS3Geek::initialize_display(size_t pixel_buffer_size) {
154154
.rotation_callback = DisplayDriver::rotate,
155155
.rotation = rotation},
156156
Display<Pixel>::OledConfig{
157-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
158-
.get_brightness_callback = [this]() { return this->brightness(); }},
157+
.set_brightness_callback =
158+
[this](float brightness) { this->brightness(brightness / 100.0f); },
159+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
159160
Display<Pixel>::DynamicMemoryConfig{
160161
.pixel_buffer_size = pixel_buffer_size,
161162
.double_buffered = true,

components/ws-s3-lcd-1-47/src/ws-s3-lcd-1-47.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ bool WsS3Lcd147::initialize_display(size_t pixel_buffer_size) {
153153
.rotation_callback = DisplayDriver::rotate,
154154
.rotation = rotation},
155155
Display<Pixel>::OledConfig{
156-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
157-
.get_brightness_callback = [this]() { return this->brightness(); }},
156+
.set_brightness_callback =
157+
[this](float brightness) { this->brightness(brightness / 100.0f); },
158+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f; }},
158159
Display<Pixel>::DynamicMemoryConfig{
159160
.pixel_buffer_size = pixel_buffer_size,
160161
.double_buffered = true,

components/ws-s3-touch/src/video.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ bool WsS3Touch::initialize_display(size_t pixel_buffer_size) {
127127
.rotation_callback = DisplayDriver::rotate,
128128
.rotation = rotation},
129129
Display<Pixel>::OledConfig{
130-
.set_brightness_callback = [this](float brightness) { this->brightness(brightness); },
131-
.get_brightness_callback = [this]() { return this->brightness(); }},
130+
.set_brightness_callback =
131+
[this](float brightness) { this->brightness(brightness * 100.0f); },
132+
.get_brightness_callback = [this]() { return this->brightness() / 100.0f / 100.0f; }},
132133
Display<Pixel>::DynamicMemoryConfig{
133134
.pixel_buffer_size = pixel_buffer_size,
134135
.double_buffered = false,

0 commit comments

Comments
 (0)