mirror of
https://github.com/esphome/esphome.git
synced 2026-10-06 19:06:37 +00:00
Merge remote-tracking branch 'upstream/dev' into integration
This commit is contained in:
@@ -4,6 +4,11 @@ gp8403:
|
||||
voltage: 5V
|
||||
- id: gp8403_10v
|
||||
i2c_id: i2c_bus
|
||||
model: GP8403
|
||||
voltage: 10V
|
||||
- id: gp8413
|
||||
i2c_id: i2c_bus
|
||||
model: GP8413
|
||||
voltage: 10V
|
||||
|
||||
output:
|
||||
@@ -15,3 +20,7 @@ output:
|
||||
gp8403_id: gp8403_10v
|
||||
id: gp8403_output_1
|
||||
channel: 1
|
||||
- platform: gp8403
|
||||
gp8403_id: gp8413
|
||||
id: gp8413_output_2
|
||||
channel: 1
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
display:
|
||||
- platform: sdl
|
||||
id: image_display
|
||||
auto_clear_enabled: false
|
||||
dimensions:
|
||||
width: 480
|
||||
|
||||
@@ -191,7 +191,7 @@ lvgl:
|
||||
args: ['lv_event_code_name_for(event->code).c_str()']
|
||||
skip: true
|
||||
layout:
|
||||
type: flex
|
||||
type: Flex
|
||||
pad_row: 4
|
||||
pad_column: 4px
|
||||
flex_align_main: center
|
||||
@@ -863,7 +863,7 @@ lvgl:
|
||||
width: 100%
|
||||
pad_all: 8
|
||||
layout:
|
||||
type: grid
|
||||
type: GRid
|
||||
grid_row_align: end
|
||||
grid_rows: [25px, fr(1), content]
|
||||
grid_columns: [40, fr(1), fr(1)]
|
||||
@@ -1014,7 +1014,7 @@ lvgl:
|
||||
r_mod: -20
|
||||
opa: 0%
|
||||
- id: page3
|
||||
layout: horizontal
|
||||
layout: Horizontal
|
||||
widgets:
|
||||
- keyboard:
|
||||
id: lv_keyboard
|
||||
|
||||
@@ -13,11 +13,14 @@ display:
|
||||
|
||||
binary_sensor:
|
||||
- platform: sdl
|
||||
sdl_id: sdl_display
|
||||
id: key_up
|
||||
key: SDLK_UP
|
||||
- platform: sdl
|
||||
sdl_id: sdl_display
|
||||
id: key_down
|
||||
key: SDLK_DOWN
|
||||
- platform: sdl
|
||||
sdl_id: sdl_display
|
||||
id: key_enter
|
||||
key: SDLK_RETURN
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ template<typename... Ts> class EnableAction : public Action<Ts...> {
|
||||
public:
|
||||
EnableAction(LoopTestComponent *parent) : parent_(parent) {}
|
||||
|
||||
void play(Ts... x) override { this->parent_->service_enable(); }
|
||||
void play(const Ts &...x) override { this->parent_->service_enable(); }
|
||||
|
||||
protected:
|
||||
LoopTestComponent *parent_;
|
||||
@@ -49,7 +49,7 @@ template<typename... Ts> class DisableAction : public Action<Ts...> {
|
||||
public:
|
||||
DisableAction(LoopTestComponent *parent) : parent_(parent) {}
|
||||
|
||||
void play(Ts... x) override { this->parent_->service_disable(); }
|
||||
void play(const Ts &...x) override { this->parent_->service_disable(); }
|
||||
|
||||
protected:
|
||||
LoopTestComponent *parent_;
|
||||
|
||||
Reference in New Issue
Block a user