Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-21 16:27:44 +01:00
Code Issues Projects Releases Wiki Activity

[online_image] Bugfix: Use std::string instead of const char * (#7556)

Browse Source
This commit is contained in:
Clyde Stubbs 2024-10-08 03:47:07 +11:00 committed by GitHub
parent 1d91601094
commit b8630363e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/online_image/__init__.py
View File

@ -125,7 +125,7 @@ async def online_image_action_to_code(config, action_id, template_arg, args):
var = cg.new_Pvariable(action_id, template_arg, paren)
if CONF_URL in config:
template_ = await cg.templatable(config[CONF_URL], args, cg.const_char_ptr)
template_ = await cg.templatable(config[CONF_URL], args, cg.std_string)
cg.add(var.set_url(template_))
return var

3
esphome/components/online_image/online_image.h
View File

@ -157,7 +157,7 @@ class OnlineImage : public PollingComponent,
template<typename... Ts> class OnlineImageSetUrlAction : public Action<Ts...> {
public:
OnlineImageSetUrlAction(OnlineImage *parent) : parent_(parent) {}
TEMPLATABLE_VALUE(const char *, url)
TEMPLATABLE_VALUE(std::string, url)
void play(Ts... x) override {
this->parent_->set_url(this->url_.value(x...));
this->parent_->update();
@ -170,7 +170,6 @@ template<typename... Ts> class OnlineImageSetUrlAction : public Action<Ts...> {
template<typename... Ts> class OnlineImageReleaseAction : public Action<Ts...> {
public:
OnlineImageReleaseAction(OnlineImage *parent) : parent_(parent) {}
TEMPLATABLE_VALUE(const char *, url)
void play(Ts... x) override { this->parent_->release(); }
protected:

4
tests/components/online_image/common-esp32.yaml
View File

@ -4,13 +4,13 @@ spi:
- id: spi_main_lcd
clk_pin: 16
mosi_pin: 17
miso_pin: 15
miso_pin: 18
display:
- platform: ili9xxx
id: main_lcd
model: ili9342
cs_pin: 12
cs_pin: 20
dc_pin: 13
reset_pin: 21
invert_colors: true

8
tests/components/online_image/common.yaml
View File

@ -34,4 +34,12 @@ time:
- online_image.set_url:
id: online_rgba_image
url: http://www.example.org/example.png
- online_image.set_url:
id: online_rgba_image
url: !lambda |-
return "http://www.example.org/example.png";
- online_image.set_url:
id: online_rgba_image
url: !lambda |-
return str_sprintf("http://homeassistant.local:8123");