sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-02-07 21:51:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into nvds-new-espnow

Browse Source
This commit is contained in:
NP v/d Spek 2024-11-25 10:52:05 +01:00 committed by GitHub
commit 7534e39cc4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esphome/components/audio/audio.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstddef>
#include <cstdint> #include <cstdint>
#include <stddef.h>
namespace esphome { namespace esphome {
namespace audio { namespace audio {

6
esphome/components/opentherm/opentherm.cpp
View File

@ -29,7 +29,7 @@ using std::to_string;
static const char *const TAG = "opentherm"; static const char *const TAG = "opentherm";
#ifdef ESP8266 #ifdef ESP8266
OpenTherm *OpenTherm::instance_ = nullptr; OpenTherm *OpenTherm::instance = nullptr;
#endif #endif
OpenTherm::OpenTherm(InternalGPIOPin *in_pin, InternalGPIOPin *out_pin, int32_t device_timeout) OpenTherm::OpenTherm(InternalGPIOPin *in_pin, InternalGPIOPin *out_pin, int32_t device_timeout)
@ -53,7 +53,7 @@ OpenTherm::OpenTherm(InternalGPIOPin *in_pin, InternalGPIOPin *out_pin, int32_t
bool OpenTherm::initialize() { bool OpenTherm::initialize() {
#ifdef ESP8266 #ifdef ESP8266
OpenTherm::instance_ = this; OpenTherm::instance = this;
#endif #endif
this->in_pin_->pin_mode(gpio::FLAG_INPUT); this->in_pin_->pin_mode(gpio::FLAG_INPUT);
this->out_pin_->pin_mode(gpio::FLAG_OUTPUT); this->out_pin_->pin_mode(gpio::FLAG_OUTPUT);
@ -216,7 +216,7 @@ bool IRAM_ATTR OpenTherm::timer_isr(OpenTherm *arg) {
} }
#ifdef ESP8266 #ifdef ESP8266
void IRAM_ATTR OpenTherm::esp8266_timer_isr() { OpenTherm::timer_isr(OpenTherm::instance_); } void IRAM_ATTR OpenTherm::esp8266_timer_isr() { OpenTherm::timer_isr(OpenTherm::instance); }
#endif #endif
void IRAM_ATTR OpenTherm::bit_read_(uint8_t value) { void IRAM_ATTR OpenTherm::bit_read_(uint8_t value) {

2
esphome/components/opentherm/opentherm.h
View File

@ -371,7 +371,7 @@ class OpenTherm {
#ifdef ESP8266 #ifdef ESP8266
// ESP8266 timer can accept callback with no parameters, so we have this hack to save a static instance of OpenTherm // ESP8266 timer can accept callback with no parameters, so we have this hack to save a static instance of OpenTherm
static OpenTherm *instance_; static OpenTherm *instance;
#endif #endif
}; };