diff --git a/esphome/components/zephyr/core.cpp b/esphome/components/zephyr/core.cpp index 72ae1d668b..ce8a08f977 100644 --- a/esphome/components/zephyr/core.cpp +++ b/esphome/components/zephyr/core.cpp @@ -4,6 +4,7 @@ #include #include #include "esphome/core/hal.h" +#include "esphome/core/helpers.h" namespace esphome { @@ -39,6 +40,17 @@ uint32_t arch_get_cpu_cycle_count() { return k_cycle_get_32(); } uint32_t arch_get_cpu_freq_hz() { return sys_clock_hw_cycles_per_sec(); } uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; } +Mutex::Mutex() { + auto mutex = new k_mutex(); + this->handle_ = mutex; + k_mutex_init(mutex); +} +Mutex::~Mutex() { delete static_cast(this->handle_); } +void Mutex::lock() { k_mutex_lock(static_cast(this->handle_), K_FOREVER); } +bool Mutex::try_lock() { return k_mutex_lock(static_cast(this->handle_), K_NO_WAIT) == 0; } +void Mutex::unlock() { k_mutex_unlock(static_cast(this->handle_)); } +uint32_t random_uint32() { return rand(); } + } // namespace esphome void setup(); diff --git a/esphome/components/zephyr/helpers.cpp b/esphome/components/zephyr/helpers.cpp deleted file mode 100644 index f57463aabd..0000000000 --- a/esphome/components/zephyr/helpers.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "esphome/core/helpers.h" -#include - -namespace esphome { -Mutex::Mutex() { - auto mutex = new k_mutex(); - this->handle_ = mutex; - k_mutex_init(mutex); -} -Mutex::~Mutex() { delete static_cast(this->handle_); } -void Mutex::lock() { k_mutex_lock(static_cast(this->handle_), K_FOREVER); } -bool Mutex::try_lock() { return k_mutex_lock(static_cast(this->handle_), K_NO_WAIT) == 0; } -void Mutex::unlock() { k_mutex_unlock(static_cast(this->handle_)); } -uint32_t random_uint32() { return rand(); } -} // namespace esphome \ No newline at end of file