github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-06-24 13:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mipi_dsi][mipi_rgb][st7701s][rpi_dpi_rgb] Fix clang-tidy findings (#16837)

Browse Source
This commit is contained in:
Jonathan Swoboda
2026-06-05 11:56:48 -04:00
committed by GitHub
parent 80c84d6665
commit b0e1b94c45
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/mipi_dsi/display.py
View File

@@ -65,7 +65,7 @@ DOMAIN = "mipi_dsi"
LOGGER = logging.getLogger(DOMAIN) LOGGER = logging.getLogger(DOMAIN)
MIPI_DSI = mipi_dsi_ns.class_("MIPI_DSI", display.Display, cg.Component) MipiDsi = mipi_dsi_ns.class_("MipiDsi", display.Display, cg.Component)
ColorOrder = display.display_ns.enum("ColorMode") ColorOrder = display.display_ns.enum("ColorMode")
ColorBitness = display.display_ns.enum("ColorBitness") ColorBitness = display.display_ns.enum("ColorBitness")
@@ -114,7 +114,7 @@ def model_schema(config):
schema = display.FULL_DISPLAY_SCHEMA.extend( schema = display.FULL_DISPLAY_SCHEMA.extend(
{ {
model.option(CONF_RESET_PIN, cv.UNDEFINED): pins.gpio_output_pin_schema, model.option(CONF_RESET_PIN, cv.UNDEFINED): pins.gpio_output_pin_schema,
cv.GenerateID(): cv.declare_id(MIPI_DSI), cv.GenerateID(): cv.declare_id(MipiDsi),
cv_dimensions(CONF_DIMENSIONS): dimension_schema( cv_dimensions(CONF_DIMENSIONS): dimension_schema(
model.get_default(CONF_DRAW_ROUNDING, 1) model.get_default(CONF_DRAW_ROUNDING, 1)
), ),

29
esphome/components/mipi_dsi/mipi_dsi.cpp
View File

@@ -9,18 +9,18 @@ namespace esphome::mipi_dsi {
static constexpr size_t MIPI_DSI_MAX_CMD_LOG_BYTES = 64; static constexpr size_t MIPI_DSI_MAX_CMD_LOG_BYTES = 64;
static bool notify_refresh_ready(esp_lcd_panel_handle_t panel, esp_lcd_dpi_panel_event_data_t *edata, void *user_ctx) { static bool notify_refresh_ready(esp_lcd_panel_handle_t panel, esp_lcd_dpi_panel_event_data_t *edata, void *user_ctx) {
auto sem = static_cast<SemaphoreHandle_t>(user_ctx); SemaphoreHandle_t sem = static_cast<SemaphoreHandle_t>(user_ctx);
BaseType_t need_yield = pdFALSE; BaseType_t need_yield = pdFALSE;
xSemaphoreGiveFromISR(sem, &need_yield); xSemaphoreGiveFromISR(sem, &need_yield);
return (need_yield == pdTRUE); return (need_yield == pdTRUE);
} }
void MIPI_DSI::smark_failed(const LogString *message, esp_err_t err) { void MipiDsi::smark_failed(const LogString *message, esp_err_t err) {
ESP_LOGE(TAG, "%s: %s", LOG_STR_ARG(message), esp_err_to_name(err)); ESP_LOGE(TAG, "%s: %s", LOG_STR_ARG(message), esp_err_to_name(err));
this->mark_failed(message); this->mark_failed(message);
} }
void MIPI_DSI::setup() { void MipiDsi::setup() {
ESP_LOGCONFIG(TAG, "Running Setup"); ESP_LOGCONFIG(TAG, "Running Setup");
if (!this->enable_pins_.empty()) { if (!this->enable_pins_.empty()) {
@@ -175,7 +175,7 @@ void MIPI_DSI::setup() {
ESP_LOGCONFIG(TAG, "MIPI DSI setup complete"); ESP_LOGCONFIG(TAG, "MIPI DSI setup complete");
} }
void MIPI_DSI::update() { void MipiDsi::update() {
if (this->auto_clear_enabled_) { if (this->auto_clear_enabled_) {
this->clear(); this->clear();
} }
@@ -202,8 +202,8 @@ void MIPI_DSI::update() {
this->y_high_ = 0; this->y_high_ = 0;
} }
void MIPI_DSI::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order, void MipiDsi::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) { display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) {
if (w <= 0 || h <= 0) if (w <= 0 || h <= 0)
return; return;
// if color mapping is required, pass the buck. // if color mapping is required, pass the buck.
@@ -216,8 +216,8 @@ void MIPI_DSI::draw_pixels_at(int x_start, int y_start, int w, int h, const uint
this->write_to_display_(x_start, y_start, w, h, ptr, x_offset, y_offset, x_pad); this->write_to_display_(x_start, y_start, w, h, ptr, x_offset, y_offset, x_pad);
} }
void MIPI_DSI::write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset, void MipiDsi::write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset,
int x_pad) { int x_pad) {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
auto bytes_per_pixel = 3 - this->color_depth_; auto bytes_per_pixel = 3 - this->color_depth_;
auto stride = (x_offset + w + x_pad) * bytes_per_pixel; auto stride = (x_offset + w + x_pad) * bytes_per_pixel;
@@ -241,7 +241,7 @@ void MIPI_DSI::write_to_display_(int x_start, int y_start, int w, int h, const u
ESP_LOGE(TAG, "lcd_lcd_panel_draw_bitmap failed: %s", esp_err_to_name(err)); ESP_LOGE(TAG, "lcd_lcd_panel_draw_bitmap failed: %s", esp_err_to_name(err));
} }
bool MIPI_DSI::check_buffer_() { bool MipiDsi::check_buffer_() {
if (this->is_failed()) if (this->is_failed())
return false; return false;
if (this->buffer_ != nullptr) if (this->buffer_ != nullptr)
@@ -257,7 +257,7 @@ bool MIPI_DSI::check_buffer_() {
return true; return true;
} }
void MIPI_DSI::draw_pixel_at(int x, int y, Color color) { void MipiDsi::draw_pixel_at(int x, int y, Color color) {
if (!this->get_clipping().inside(x, y)) if (!this->get_clipping().inside(x, y))
return; return;
@@ -280,7 +280,6 @@ void MIPI_DSI::draw_pixel_at(int x, int y, Color color) {
if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) { if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0) {
return; return;
} }
auto pixel = convert_big_endian(display::ColorUtil::color_to_565(color));
if (!this->check_buffer_()) if (!this->check_buffer_())
return; return;
size_t pos = (y * this->width_) + x; size_t pos = (y * this->width_) + x;
@@ -319,7 +318,7 @@ void MIPI_DSI::draw_pixel_at(int x, int y, Color color) {
if (y > this->y_high_) if (y > this->y_high_)
this->y_high_ = y; this->y_high_ = y;
} }
void MIPI_DSI::fill(Color color) { void MipiDsi::fill(Color color) {
if (!this->check_buffer_()) if (!this->check_buffer_())
return; return;
@@ -359,7 +358,7 @@ void MIPI_DSI::fill(Color color) {
} }
} }
int MIPI_DSI::get_width() { int MipiDsi::get_width() {
switch (this->rotation_) { switch (this->rotation_) {
case display::DISPLAY_ROTATION_90_DEGREES: case display::DISPLAY_ROTATION_90_DEGREES:
case display::DISPLAY_ROTATION_270_DEGREES: case display::DISPLAY_ROTATION_270_DEGREES:
@@ -371,7 +370,7 @@ int MIPI_DSI::get_width() {
} }
} }
int MIPI_DSI::get_height() { int MipiDsi::get_height() {
switch (this->rotation_) { switch (this->rotation_) {
case display::DISPLAY_ROTATION_0_DEGREES: case display::DISPLAY_ROTATION_0_DEGREES:
case display::DISPLAY_ROTATION_180_DEGREES: case display::DISPLAY_ROTATION_180_DEGREES:
@@ -385,7 +384,7 @@ int MIPI_DSI::get_height() {
static const uint8_t PIXEL_MODES[] = {0, 16, 18, 24}; static const uint8_t PIXEL_MODES[] = {0, 16, 18, 24};
void MIPI_DSI::dump_config() { void MipiDsi::dump_config() {
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
"MIPI_DSI RGB LCD" "MIPI_DSI RGB LCD"
"\n Model: %s" "\n Model: %s"

4
esphome/components/mipi_dsi/mipi_dsi.h
View File

@@ -35,9 +35,9 @@ const uint8_t MADCTL_MV = 0x20; // row/column swap
const uint8_t MADCTL_XFLIP = 0x02; // Mirror the display horizontally const uint8_t MADCTL_XFLIP = 0x02; // Mirror the display horizontally
const uint8_t MADCTL_YFLIP = 0x01; // Mirror the display vertically const uint8_t MADCTL_YFLIP = 0x01; // Mirror the display vertically
class MIPI_DSI : public display::Display { class MipiDsi : public display::Display {
public: public:
MIPI_DSI(size_t width, size_t height, display::ColorBitness color_depth, uint8_t pixel_mode) MipiDsi(size_t width, size_t height, display::ColorBitness color_depth, uint8_t pixel_mode)
: width_(width), height_(height), color_depth_(color_depth), pixel_mode_(pixel_mode) {} : width_(width), height_(height), color_depth_(color_depth), pixel_mode_(pixel_mode) {}
display::ColorOrder get_color_mode() { return this->color_mode_; } display::ColorOrder get_color_mode() { return this->color_mode_; }
void set_color_mode(display::ColorOrder color_mode) { this->color_mode_ = color_mode; } void set_color_mode(display::ColorOrder color_mode) { this->color_mode_ = color_mode; }

8
esphome/components/mipi_rgb/mipi_rgb.h
View File

@@ -30,9 +30,6 @@ class MipiRgb : public display::Display {
void fill(Color color) override; void fill(Color color) override;
void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order, void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override; display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override;
void write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset,
int x_pad);
bool check_buffer_();
display::ColorOrder get_color_mode() { return this->color_mode_; } display::ColorOrder get_color_mode() { return this->color_mode_; }
void set_color_mode(display::ColorOrder color_mode) { this->color_mode_ = color_mode; } void set_color_mode(display::ColorOrder color_mode) { this->color_mode_ = color_mode; }
@@ -60,12 +57,15 @@ class MipiRgb : public display::Display {
display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; } display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_COLOR; }
int get_width_internal() override { return this->width_; } int get_width_internal() override { return this->width_; }
int get_height_internal() override { return this->height_; } int get_height_internal() override { return this->height_; }
void dump_pins_(uint8_t start, uint8_t end, const char *name, uint8_t offset);
void dump_config() override; void dump_config() override;
void draw_pixel_at(int x, int y, Color color) override; void draw_pixel_at(int x, int y, Color color) override;
// this will be horribly slow. // this will be horribly slow.
protected: protected:
void write_to_display_(int x_start, int y_start, int w, int h, const uint8_t *ptr, int x_offset, int y_offset,
int x_pad);
bool check_buffer_();
void dump_pins_(uint8_t start, uint8_t end, const char *name, uint8_t offset);
void setup_enables_(); void setup_enables_();
void common_setup_(); void common_setup_();
InternalGPIOPin *de_pin_{nullptr}; InternalGPIOPin *de_pin_{nullptr};

5
esphome/components/rpi_dpi_rgb/rpi_dpi_rgb.cpp
View File

@@ -54,8 +54,9 @@ void RpiDpiRgb::draw_pixels_at(int x_start, int y_start, int w, int h, const uin
// if color mapping is required, pass the buck. // if color mapping is required, pass the buck.
// note that endianness is not considered here - it is assumed to match! // note that endianness is not considered here - it is assumed to match!
if (bitness != display::COLOR_BITNESS_565) { if (bitness != display::COLOR_BITNESS_565) {
return display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset, display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset,
x_pad); x_pad);
return;
} }
x_start += this->offset_x_; x_start += this->offset_x_;
y_start += this->offset_y_; y_start += this->offset_y_;

5
esphome/components/st7701s/st7701s.cpp
View File

@@ -57,8 +57,9 @@ void ST7701S::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8
// if color mapping is required, pass the buck. // if color mapping is required, pass the buck.
// note that endianness is not considered here - it is assumed to match! // note that endianness is not considered here - it is assumed to match!
if (bitness != display::COLOR_BITNESS_565) { if (bitness != display::COLOR_BITNESS_565) {
return display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset, display::Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset,
x_pad); x_pad);
return;
} }
x_start += this->offset_x_; x_start += this->offset_x_;
y_start += this->offset_y_; y_start += this->offset_y_;

1
esphome/components/st7701s/st7701s.h
View File

@@ -32,7 +32,6 @@ class ST7701S : public display::Display,
public: public:
void update() override { this->do_update_(); } void update() override { this->do_update_(); }
void setup() override; void setup() override;
void complete_setup_();
void loop() override; void loop() override;
void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order, void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, display::ColorOrder order,
display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override; display::ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override;

6
tests/component_tests/mipi_dsi/test_mipi_dsi_config.py
View File

@@ -124,15 +124,15 @@ def test_code_generation(
main_cpp = generate_main(component_fixture_path("mipi_dsi.yaml")) main_cpp = generate_main(component_fixture_path("mipi_dsi.yaml"))
assert ( assert (
"alignas(mipi_dsi::MIPI_DSI) static unsigned char mipi_dsi__p4_nano__pstorage[sizeof(mipi_dsi::MIPI_DSI)];" "alignas(mipi_dsi::MipiDsi) static unsigned char mipi_dsi__p4_nano__pstorage[sizeof(mipi_dsi::MipiDsi)];"
in main_cpp in main_cpp
) )
assert ( assert (
"static mipi_dsi::MIPI_DSI *const p4_nano = reinterpret_cast<mipi_dsi::MIPI_DSI *>(mipi_dsi__p4_nano__pstorage);" "static mipi_dsi::MipiDsi *const p4_nano = reinterpret_cast<mipi_dsi::MipiDsi *>(mipi_dsi__p4_nano__pstorage);"
in main_cpp in main_cpp
) )
assert ( assert (
"new(p4_nano) mipi_dsi::MIPI_DSI(800, 1280, display::COLOR_BITNESS_565, 16);" "new(p4_nano) mipi_dsi::MipiDsi(800, 1280, display::COLOR_BITNESS_565, 16);"
in main_cpp in main_cpp
) )
assert "set_init_sequence({224, 1, 0, 225, 1, 147, 226, 1," in main_cpp assert "set_init_sequence({224, 1, 0, 225, 1, 147, 226, 1," in main_cpp