sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

add gpio for zephyr

Browse Source
This commit is contained in:
Tomasz Duda
2024-01-30 21:02:02 +01:00
parent 990871fa0e
commit 6a5b243359
5 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/components/nrf52/core_zephyr.cpp
View File

@@ -1,13 +1,14 @@
#ifdef USE_NRF52 #ifdef USE_NRF52
#ifdef USE_ZEPHYR #ifdef USE_ZEPHYR
#include <stdlib.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
namespace esphome { namespace esphome {
void yield() { ::k_yield(); } void yield() { ::k_yield(); }
uint32_t millis() { return ::k_ticks_to_ms_floor32(k_uptime_ticks()); } uint32_t millis() { return k_ticks_to_ms_floor32(k_uptime_ticks()); }
void delay(uint32_t ms) { ::k_msleep(ms); } void delay(uint32_t ms) { ::k_msleep(ms); }
uint32_t micros() { return ::k_ticks_to_us_floor32(k_uptime_ticks()); } uint32_t micros() { return k_ticks_to_us_floor32(k_uptime_ticks()); }
void arch_init() { void arch_init() {
// TODO // TODO
@@ -16,6 +17,10 @@ void arch_feed_wdt() {
// TODO // TODO
} }
void arch_restart() {
// TODO
}
void nrf52GetMacAddr(uint8_t *mac) void nrf52GetMacAddr(uint8_t *mac)
{ {
const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR; const uint8_t *src = (const uint8_t *)NRF_FICR->DEVICEADDR;

2
esphome/components/nrf52/gpio.h
View File

@@ -26,12 +26,12 @@ class NRF52GPIOPin : public InternalGPIOPin {
protected: protected:
void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override; void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
uint8_t pin_; uint8_t pin_;
bool inverted_; bool inverted_;
gpio::Flags flags_; gpio::Flags flags_;
#ifdef USE_ZEPHYR #ifdef USE_ZEPHYR
const device * gpio_ = nullptr; const device * gpio_ = nullptr;
bool value_ = false;
#endif #endif
}; };

8
esphome/components/nrf52/gpio_arduino.cpp
View File

@@ -83,7 +83,7 @@ void NRF52GPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::Inter
void NRF52GPIOPin::setup() { pin_mode(flags_); } void NRF52GPIOPin::setup() { pin_mode(flags_); }
void NRF52GPIOPin::pin_mode(gpio::Flags flags) { void NRF52GPIOPin::pin_mode(gpio::Flags flags) {
pinMode(pin_, flags_to_mode(flags, pin_)); // NOLINT pinMode(pin_, flags_to_mode(flags, pin_));
} }
std::string NRF52GPIOPin::dump_summary() const { std::string NRF52GPIOPin::dump_summary() const {
@@ -93,10 +93,10 @@ std::string NRF52GPIOPin::dump_summary() const {
} }
bool NRF52GPIOPin::digital_read() { bool NRF52GPIOPin::digital_read() {
return bool(digitalRead(pin_)) != inverted_; // NOLINT return bool(digitalRead(pin_)) != inverted_;
} }
void NRF52GPIOPin::digital_write(bool value) { void NRF52GPIOPin::digital_write(bool value) {
digitalWrite(pin_, value != inverted_ ? 1 : 0); // NOLINT digitalWrite(pin_, value != inverted_ ? 1 : 0);
} }
void NRF52GPIOPin::detach_interrupt() const { void NRF52GPIOPin::detach_interrupt() const {
detachInterrupt(pin_); detachInterrupt(pin_);
@@ -109,7 +109,7 @@ void NRF52GPIOPin::detach_interrupt() const {
// TODO seems to not work??? // TODO seems to not work???
bool IRAM_ATTR ISRInternalGPIOPin::digital_read() { bool IRAM_ATTR ISRInternalGPIOPin::digital_read() {
auto *arg = reinterpret_cast<nrf52::ISRPinArg *>(arg_); auto *arg = reinterpret_cast<nrf52::ISRPinArg *>(arg_);
return bool(digitalRead(arg->pin)) != arg->inverted; // NOLINT return bool(digitalRead(arg->pin)) != arg->inverted;
} }
} // namespace esphome } // namespace esphome

102
esphome/components/nrf52/gpio_zephyr.cpp
View File

@@ -1,11 +1,7 @@
#ifdef USE_NRF52 #ifdef USE_NRF52
#ifdef USE_ZEPHYR #ifdef USE_ZEPHYR
#include "gpio.h" #include "gpio.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
// #include <functional>
// #include <vector>
// #include <device.h>
#include <zephyr/drivers/gpio.h> #include <zephyr/drivers/gpio.h>
namespace esphome { namespace esphome {
@@ -13,20 +9,29 @@ namespace nrf52 {
static const char *const TAG = "nrf52"; static const char *const TAG = "nrf52";
static int flags_to_mode(gpio::Flags flags, uint8_t pin) { static int flags_to_mode(gpio::Flags flags, uint8_t pin, bool inverted, bool value) {
if (flags == gpio::FLAG_INPUT) { // NOLINT(bugprone-branch-clone) int ret = 0;
return GPIO_INPUT; if (flags & gpio::FLAG_INPUT) {
} else if (flags == gpio::FLAG_OUTPUT) { ret |= GPIO_INPUT;
return GPIO_OUTPUT;
} else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
return GPIO_INPUT | GPIO_PULL_UP;
} else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLDOWN)) {
return GPIO_INPUT | GPIO_PULL_DOWN;
} else if (flags == (gpio::FLAG_OUTPUT | gpio::FLAG_OPEN_DRAIN)) {
return GPIO_OUTPUT | GPIO_OPEN_DRAIN;
} else {
return GPIO_DISCONNECTED;
} }
if (flags & gpio::FLAG_OUTPUT) {
ret |= GPIO_OUTPUT;
if(value != inverted){
ret |= GPIO_OUTPUT_INIT_HIGH;
} else {
ret |= GPIO_OUTPUT_INIT_LOW;
}
}
if (flags & gpio::FLAG_PULLUP) {
ret |= GPIO_PULL_UP;
}
if (flags & gpio::FLAG_PULLDOWN) {
ret |= GPIO_PULL_DOWN;
}
if (flags & gpio::FLAG_OPEN_DRAIN) {
ret |= GPIO_OPEN_DRAIN;
}
return ret;
} }
struct ISRPinArg { struct ISRPinArg {
@@ -34,40 +39,15 @@ struct ISRPinArg {
bool inverted; bool inverted;
}; };
//TODO implement
//TODO test
// void (*irq_cb)(void *);
// void* irq_arg;
// static void pin_irq(void){
// irq_cb(irq_arg);
// }
ISRInternalGPIOPin NRF52GPIOPin::to_isr() const { ISRInternalGPIOPin NRF52GPIOPin::to_isr() const {
auto *arg = new ISRPinArg{}; // NOLINT(cppcoreguidelines-owning-memory) auto *arg = new ISRPinArg{};
arg->pin = pin_; arg->pin = pin_;
arg->inverted = inverted_; arg->inverted = inverted_;
return ISRInternalGPIOPin((void *) arg); return ISRInternalGPIOPin((void *) arg);
} }
void NRF52GPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const { void NRF52GPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const {
// uint32_t mode = ISR_DEFERRED; // TODO
// switch (type) {
// case gpio::INTERRUPT_RISING_EDGE:
// mode |= inverted_ ? FALLING : RISING;
// break;
// case gpio::INTERRUPT_FALLING_EDGE:
// mode |= inverted_ ? RISING : FALLING;
// break;
// case gpio::INTERRUPT_ANY_EDGE:
// mode |= CHANGE;
// break;
// default:
// return;
// }
// irq_cb = func;
// irq_arg = arg;
// attachInterrupt(pin_, pin_irq, mode);
} }
void NRF52GPIOPin::setup() { void NRF52GPIOPin::setup() {
@@ -87,21 +67,20 @@ void NRF52GPIOPin::setup() {
#error "gpio1 is disabled" #error "gpio1 is disabled"
#endif #endif
} }
//TODO why no ready?? if (device_is_ready(gpio)) {
// if (!device_is_ready(gpio)) {
gpio_ = gpio; gpio_ = gpio;
// } else { } else {
// ESP_LOGE(TAG, "gpio %u is not ready.", pin_); ESP_LOGE(TAG, "gpio %u is not ready.", pin_);
// } return;
gpio_ = gpio; }
pin_mode(flags_); pin_mode(flags_);
} }
void NRF52GPIOPin::pin_mode(gpio::Flags flags) { void NRF52GPIOPin::pin_mode(gpio::Flags flags) {
if(nullptr == gpio_) { if(nullptr == gpio_) {
return; return;
} }
gpio_pin_configure(gpio_, pin_, flags_to_mode(flags, pin_)); gpio_pin_configure(gpio_, pin_, flags_to_mode(flags, pin_, inverted_, value_));
} }
std::string NRF52GPIOPin::dump_summary() const { std::string NRF52GPIOPin::dump_summary() const {
@@ -112,31 +91,26 @@ std::string NRF52GPIOPin::dump_summary() const {
bool NRF52GPIOPin::digital_read() { bool NRF52GPIOPin::digital_read() {
if(nullptr == gpio_) { if(nullptr == gpio_) {
//TODO invert ??
return false; return false;
} }
return bool(gpio_pin_get(gpio_, pin_)) != inverted_; // NOLINT return bool(gpio_pin_get(gpio_, pin_) != inverted_);
} }
void NRF52GPIOPin::digital_write(bool value) { void NRF52GPIOPin::digital_write(bool value) {
// make sure that value is not ignored since it can be inverted e.g. on switch side
// that way init state should be correct
value_ = value;
if(nullptr == gpio_) { if(nullptr == gpio_) {
return; return;
} }
gpio_pin_set(gpio_, pin_, value != inverted_ ? 1 : 0); gpio_pin_set(gpio_, pin_, value != inverted_ ? 1 : 0 );
} }
void NRF52GPIOPin::detach_interrupt() const { void NRF52GPIOPin::detach_interrupt() const {
// detachInterrupt(pin_); // TODO
} }
} // namespace nrf52 } // namespace nrf52
// using namespace nrf52;
// TODO seems to not work???
// bool IRAM_ATTR ISRInternalGPIOPin::digital_read() {
// auto *arg = reinterpret_cast<nrf52::ISRPinArg *>(arg_);
// return bool(digitalRead(arg->pin)) != arg->inverted; // NOLINT
// }
} // namespace esphome } // namespace esphome
#endif #endif

1
esphome/core/helpers.h
View File

@@ -7,6 +7,7 @@
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <limits>
#include "esphome/core/optional.h" #include "esphome/core/optional.h"