Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-12 08:24:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

More clang/ling fixes

Browse source
This commit is contained in:
Michael Davidson 2023-12-17 21:39:09 +11:00
parent 8cb27b5b78
commit f749d26353
No known key found for this signature in database
GPG key ID: B8D1A99712B8B0EB
7 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
esphome/components/graphical_layout/__init__.py
View file

@ -23,6 +23,7 @@ CONF_ITEM_TYPE = "type"
BASE_ITEM_SCHEMA = cv.Schema({}) BASE_ITEM_SCHEMA = cv.Schema({})
def item_type_schema(value): def item_type_schema(value):
return ITEM_TYPE_SCHEMA(value) return ITEM_TYPE_SCHEMA(value)
@ -32,7 +33,9 @@ ITEM_TYPE_SCHEMA = cv.typed_schema(
text_panel.CONF_TYPE: BASE_ITEM_SCHEMA.extend( text_panel.CONF_TYPE: BASE_ITEM_SCHEMA.extend(
{ {
cv.GenerateID(): cv.declare_id(text_panel.TextPanel), cv.GenerateID(): cv.declare_id(text_panel.TextPanel),
cv.Optional(text_panel.CONF_ITEM_PADDING, default=0): cv.templatable(cv.int_), cv.Optional(text_panel.CONF_ITEM_PADDING, default=0): cv.templatable(
cv.int_
),
cv.Required(text_panel.CONF_FONT): cv.use_id(font.Font), cv.Required(text_panel.CONF_FONT): cv.use_id(font.Font),
cv.Optional(text_panel.CONF_FOREGROUND_COLOR): cv.use_id( cv.Optional(text_panel.CONF_FOREGROUND_COLOR): cv.use_id(
color.ColorStruct color.ColorStruct
@ -64,7 +67,7 @@ ITEM_TYPE_SCHEMA = cv.typed_schema(
cv.ensure_list(item_type_schema), cv.Length(min=1) cv.ensure_list(item_type_schema), cv.Length(min=1)
), ),
} }
) ),
} }
) )

1
esphome/components/graphical_layout/graphical_layout.cpp
View file

@ -3,7 +3,6 @@
#include "esphome/components/display/display.h" #include "esphome/components/display/display.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
namespace esphome { namespace esphome {
namespace graphical_layout { namespace graphical_layout {

26
esphome/components/graphical_layout/graphical_layout.h
View file

@ -16,22 +16,22 @@ namespace graphical_layout {
/** Component used for rendering the layout*/ /** Component used for rendering the layout*/
class RootLayoutComponent : public Component { class RootLayoutComponent : public Component {
public: public:
void setup() override; void setup() override;
void dump_config() override; void dump_config() override;
/** Render the graphical layout to the screen /** Render the graphical layout to the screen
* *
* param[in] display: Display that will be rendered to * param[in] display: Display that will be rendered to
* param[in] x: x coordinate to render at * param[in] x: x coordinate to render at
* param[in] y: y coorindate to render at * param[in] y: y coorindate to render at
*/ */
void render_at(display::Display *display, int x, int y); void render_at(display::Display *display, int x, int y);
void set_layout_root(LayoutItem *layout) { this->layout_root_ = layout; }; void set_layout_root(LayoutItem *layout) { this->layout_root_ = layout; };
protected: protected:
LayoutItem *layout_root_{nullptr}; LayoutItem *layout_root_{nullptr};
}; };
} // namespace graphical_layout } // namespace graphical_layout

14
esphome/components/graphical_layout/horizontal_stack.h
View file

@ -10,15 +10,15 @@ namespace graphical_layout {
* The HorizontalStack is a UI element which will render a series of items left-to-right across a display * The HorizontalStack is a UI element which will render a series of items left-to-right across a display
*/ */
class HorizontalStack : public ContainerLayoutItem { class HorizontalStack : public ContainerLayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); const display::Rect measure_item(display::Display *display);
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds);
void dump_config(int indent_depth, int additional_level_depth); void dump_config(int indent_depth, int additional_level_depth);
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
protected: protected:
int item_padding_{0}; int item_padding_{0};
}; };
} }

30
esphome/components/graphical_layout/text_panel.h
View file

@ -12,24 +12,24 @@ const Color COLOR_OFF(0, 0, 0, 0);
/** The TextPanel is a UI item that renders a single line of text to a display */ /** The TextPanel is a UI item that renders a single line of text to a display */
class TextPanel : public LayoutItem { class TextPanel : public LayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); const display::Rect measure_item(display::Display *display);
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds);
void dump_config(int indent_depth, int additional_level_depth); void dump_config(int indent_depth, int additional_level_depth);
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
void set_text(std::string text) { this->text_ = text; }; void set_text(std::string text) { this->text_ = text; };
void set_font(display::BaseFont *font) { this->font_ = font; }; void set_font(display::BaseFont *font) { this->font_ = font; };
void set_foreground_color(Color foreground_color) { this->foreground_color_ = foreground_color; }; void set_foreground_color(Color foreground_color) { this->foreground_color_ = foreground_color; };
void set_background_color(Color background_color) { this->background_color_ = background_color; }; void set_background_color(Color background_color) { this->background_color_ = background_color; };
protected: protected:
int item_padding_{0}; int item_padding_{0};
std::string text_{}; std::string text_{};
display::BaseFont *font_{nullptr}; display::BaseFont *font_{nullptr};
Color foreground_color_{COLOR_ON}; Color foreground_color_{COLOR_ON};
Color background_color_{COLOR_OFF}; Color background_color_{COLOR_OFF};
}; };
} }

1
esphome/components/graphical_layout/text_panel.py
View file

@ -1,5 +1,4 @@
import esphome.codegen as cg import esphome.codegen as cg
from esphome.components import font, color
from esphome.const import CONF_ID from esphome.const import CONF_ID
graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout") graphical_layout_ns = cg.esphome_ns.namespace("graphical_layout")

14
esphome/components/graphical_layout/vertical_stack.h
View file

@ -10,15 +10,15 @@ namespace graphical_layout {
/** The HorizontalStack is a UI element which will render a series of items top to bottom down a display /** The HorizontalStack is a UI element which will render a series of items top to bottom down a display
*/ */
class VerticalStack : public ContainerLayoutItem { class VerticalStack : public ContainerLayoutItem {
public: public:
const display::Rect measure_item(display::Display *display); const display::Rect measure_item(display::Display *display);
void render(display::Display *display, display::Rect bounds); void render(display::Display *display, display::Rect bounds);
void dump_config(int indent_depth, int additional_level_depth); void dump_config(int indent_depth, int additional_level_depth);
void set_item_padding(int item_padding) { this->item_padding_ = item_padding; }; void set_item_padding(int item_padding) { this->item_padding_ = item_padding; };
protected: protected:
int item_padding_{0}; int item_padding_{0};
}; };
} }