mirror of
https://github.com/esphome/esphome.git
synced 2024-11-28 01:34:18 +01:00
move runner() code back in to the freerots task.
This commit is contained in:
NP v/d Spek
parent
2a38e08ba6
commit
0a7cb08e6f
2 changed files with 62 additions and 65 deletions
|
|
@ -27,12 +27,6 @@ static const char *const TAG = "espnow";
|
|||
|
||||
static const size_t SEND_BUFFER_SIZE = 200;
|
||||
|
||||
static void application_task(void *param) {
|
||||
// delegate onto the application
|
||||
ESPNowComponent *application = (ESPNowComponent *) param;
|
||||
application->runner();
|
||||
}
|
||||
|
||||
ESPNowComponent *ESPNowComponent::static_{nullptr}; // NOLINT
|
||||
|
||||
/* ESPNowComponent ********************************************************************** */
|
||||
|
|
@ -142,11 +136,58 @@ void ESPNowComponent::setup() {
|
|||
|
||||
void ESPNowComponent::loop() {
|
||||
if (!this->task_running_) {
|
||||
xTaskCreate(application_task, "espnow_task", 4096, this, tskIDLE_PRIORITY + 1, nullptr);
|
||||
xTaskCreate(espnow_task, "espnow_task", 4096, this, tskIDLE_PRIORITY + 1, nullptr);
|
||||
this->task_running_ = true;
|
||||
}
|
||||
}
|
||||
|
||||
void ESPNowComponent::espnow_task(void *param) {
|
||||
ESPNowComponent *this_espnow = (ESPNowComponent *) param;
|
||||
ESPNowPacket packet; // NOLINT
|
||||
for (;;) {
|
||||
if (xQueueReceive(this_espnow->receive_queue_, (void *) &packet, (TickType_t) 1) == pdTRUE) {
|
||||
uint8_t *mac = packet.get_peer();
|
||||
if (esp_now_is_peer_exist(mac)) {
|
||||
this_espnow->call_on_receive_(packet);
|
||||
} else {
|
||||
if (this_espnow->auto_add_peer_) {
|
||||
this_espnow->add_peer(packet.peer);
|
||||
}
|
||||
this_espnow->call_on_new_peer_(packet);
|
||||
}
|
||||
}
|
||||
if (xQueueReceive(this_espnow->send_queue_, (void *) &packet, (TickType_t) 1) == pdTRUE) {
|
||||
if (packet.attempts > this_espnow->retries_) {
|
||||
ESP_LOGE(TAG, "Dropped '%012llx' (%d.%d). To many retries.", packet.peer, packet.get_sequents(),
|
||||
packet.attempts);
|
||||
this_espnow->unlock();
|
||||
continue;
|
||||
} else if (this_espnow->is_locked()) {
|
||||
if (packet.timestamp + this_espnow->conformation_timeout_ < millis()) {
|
||||
ESP_LOGW(TAG, "TimeOut '%012llx' (%d.%d).", packet.peer, packet.get_sequents(), packet.attempts);
|
||||
this_espnow->unlock();
|
||||
}
|
||||
} else {
|
||||
this_espnow->lock();
|
||||
packet.retry();
|
||||
packet.timestamp = millis();
|
||||
|
||||
esp_err_t err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());
|
||||
|
||||
if (err == ESP_OK) {
|
||||
ESP_LOGD(TAG, "Sended '%012llx' (%d.%d) from buffer. Wait for conformation.", packet.peer,
|
||||
packet.get_sequents(), packet.attempts);
|
||||
} else {
|
||||
ESP_LOGE(TAG, "Sending '%012llx' (%d.%d) FAILED. B: %d.", packet.peer, packet.get_sequents(), packet.attempts,
|
||||
this_espnow->send_queue_used());
|
||||
this_espnow->unlock();
|
||||
}
|
||||
}
|
||||
xQueueSendToFront(this_espnow->send_queue_, (void *) &packet, 10 / portTICK_PERIOD_MS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
esp_err_t ESPNowComponent::add_peer(uint64_t addr) {
|
||||
if (!this->is_ready()) {
|
||||
this->peers_.push_back(addr);
|
||||
|
|
@ -177,7 +218,7 @@ ESPNowDefaultProtocol *ESPNowComponent::get_default_protocol() {
|
|||
return (ESPNowDefaultProtocol *) this->protocols_[ESPNOW_MAIN_PROTOCOL_ID];
|
||||
}
|
||||
|
||||
ESPNowProtocol *ESPNowComponent::get_protocol_component_(uint32_t protocol) {
|
||||
ESPNowProtocol *ESPNowComponent::get_protocol_(uint32_t protocol) {
|
||||
if (this->protocols_[protocol] == nullptr) {
|
||||
ESP_LOGE(TAG, "Protocol for '%06" PRIx32 "' is not registered", protocol);
|
||||
return nullptr;
|
||||
|
|
@ -186,21 +227,21 @@ ESPNowProtocol *ESPNowComponent::get_protocol_component_(uint32_t protocol) {
|
|||
}
|
||||
|
||||
void ESPNowComponent::call_on_receive_(ESPNowPacket &packet) {
|
||||
ESPNowProtocol *protocol = this->get_protocol_component_(packet.get_protocol());
|
||||
ESPNowProtocol *protocol = this->get_protocol_(packet.get_protocol());
|
||||
if (protocol != nullptr) {
|
||||
this->defer([protocol, packet]() { protocol->on_receive(packet); });
|
||||
}
|
||||
}
|
||||
|
||||
void ESPNowComponent::call_on_sent_(ESPNowPacket &packet, bool status) {
|
||||
ESPNowProtocol *protocol = this->get_protocol_component_(packet.get_protocol());
|
||||
ESPNowProtocol *protocol = this->get_protocol_(packet.get_protocol());
|
||||
if (protocol != nullptr) {
|
||||
this->defer([protocol, packet, status]() { protocol->on_sent(packet, status); });
|
||||
}
|
||||
}
|
||||
|
||||
void ESPNowComponent::call_on_new_peer_(ESPNowPacket &packet) {
|
||||
ESPNowProtocol *protocol = this->get_protocol_component_(packet.get_protocol());
|
||||
ESPNowProtocol *protocol = this->get_protocol_(packet.get_protocol());
|
||||
if (protocol != nullptr) {
|
||||
this->defer([protocol, packet]() { protocol->on_new_peer(packet); });
|
||||
}
|
||||
|
|
@ -272,52 +313,6 @@ bool ESPNowComponent::send(ESPNowPacket packet) {
|
|||
return false;
|
||||
}
|
||||
|
||||
void ESPNowComponent::runner() {
|
||||
ESPNowPacket packet; // NOLINT
|
||||
for (;;) {
|
||||
if (xQueueReceive(this->receive_queue_, (void *) &packet, (TickType_t) 1) == pdTRUE) {
|
||||
uint8_t *mac = packet.get_peer();
|
||||
if (esp_now_is_peer_exist(mac)) {
|
||||
this->call_on_receive_(packet);
|
||||
} else {
|
||||
if (this->auto_add_peer_) {
|
||||
this->add_peer(packet.peer);
|
||||
}
|
||||
this->call_on_new_peer_(packet);
|
||||
}
|
||||
}
|
||||
if (xQueueReceive(this->send_queue_, (void *) &packet, (TickType_t) 1) == pdTRUE) {
|
||||
if (packet.attempts > this->retries_) {
|
||||
ESP_LOGE(TAG, "Dropped '%012llx' (%d.%d). To many retries.", packet.peer, packet.get_sequents(),
|
||||
packet.attempts);
|
||||
this->unlock();
|
||||
continue;
|
||||
} else if (this->is_locked()) {
|
||||
if (packet.timestamp + this->conformation_timeout_ < millis()) {
|
||||
ESP_LOGW(TAG, "TimeOut '%012llx' (%d.%d).", packet.peer, packet.get_sequents(), packet.attempts);
|
||||
this->unlock();
|
||||
}
|
||||
} else {
|
||||
this->lock();
|
||||
packet.retry();
|
||||
packet.timestamp = millis();
|
||||
|
||||
esp_err_t err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());
|
||||
|
||||
if (err == ESP_OK) {
|
||||
ESP_LOGD(TAG, "Sended '%012llx' (%d.%d) from buffer. Wait for conformation.", packet.peer,
|
||||
packet.get_sequents(), packet.attempts);
|
||||
} else {
|
||||
ESP_LOGE(TAG, "Sending '%012llx' (%d.%d) FAILED. B: %d.", packet.peer, packet.get_sequents(), packet.attempts,
|
||||
this->send_queue_used());
|
||||
this->unlock();
|
||||
}
|
||||
}
|
||||
xQueueSendToFront(this->send_queue_, (void *) &packet, 10 / portTICK_PERIOD_MS);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ESPNowComponent::on_data_sent(const uint8_t *mac_addr, esp_now_send_status_t status) {
|
||||
ESPNowPacket packet; // NOLINT
|
||||
uint64_t mac64;
|
||||
|
|
@ -341,7 +336,7 @@ void ESPNowComponent::on_data_sent(const uint8_t *mac_addr, esp_now_send_status_
|
|||
/* ESPNowProtocol ********************************************************************** */
|
||||
|
||||
bool ESPNowProtocol::send(uint64_t peer, const uint8_t *data, uint8_t len, uint8_t command) {
|
||||
ESPNowPacket packet(peer, data, len, this->get_protocol_component_id()); // NOLINT
|
||||
ESPNowPacket packet(peer, data, len, this->get_protocol_id()); // NOLINT
|
||||
packet.set_sequents(this->get_next_sequents(packet.peer, packet.get_protocol()));
|
||||
packet.set_command(command);
|
||||
return this->parent_->send(packet);
|
||||
|
|
|
|||
|
|
@ -122,8 +122,9 @@ class ESPNowProtocol : public Parented<ESPNowComponent> {
|
|||
virtual void on_sent(const ESPNowPacket &packet, bool status){};
|
||||
virtual void on_new_peer(const ESPNowPacket &packet){};
|
||||
|
||||
virtual uint32_t get_protocol_component_id() = 0;
|
||||
uint8_t get_next_sequents(uint64_t peer = 0, uint32_t protocol = 0) {
|
||||
virtual uint32_t get_protocol_id() = 0;
|
||||
virtual std::string get_protocol_name() = 0;
|
||||
virtual uint8_t get_next_sequents(uint64_t peer = 0, uint32_t protocol = 0) {
|
||||
if (this->next_sequents_ == 255) {
|
||||
this->next_sequents_ = 0;
|
||||
} else {
|
||||
|
|
@ -147,7 +148,8 @@ class ESPNowProtocol : public Parented<ESPNowComponent> {
|
|||
|
||||
class ESPNowDefaultProtocol : public ESPNowProtocol {
|
||||
public:
|
||||
uint32_t get_protocol_component_id() override { return ESPNOW_MAIN_PROTOCOL_ID; };
|
||||
uint32_t get_protocol_id() override { return ESPNOW_MAIN_PROTOCOL_ID; };
|
||||
std::string get_protocol_name() override { return "Default"; }
|
||||
|
||||
void add_on_receive_callback(std::function<void(const ESPNowPacket)> &&callback) {
|
||||
this->on_receive_.add(std::move(callback));
|
||||
|
|
@ -195,13 +197,11 @@ class ESPNowComponent : public Component {
|
|||
void setup() override;
|
||||
void loop() override;
|
||||
|
||||
void runner();
|
||||
|
||||
bool send(ESPNowPacket packet);
|
||||
|
||||
void register_protocol(ESPNowProtocol *protocol) {
|
||||
protocol->set_parent(this);
|
||||
this->protocols_[protocol->get_protocol_component_id()] = protocol;
|
||||
this->protocols_[protocol->get_protocol_id()] = protocol;
|
||||
}
|
||||
|
||||
esp_err_t add_peer(uint64_t addr);
|
||||
|
|
@ -220,9 +220,11 @@ class ESPNowComponent : public Component {
|
|||
|
||||
void show_packet(const std::string &title, const ESPNowPacket &packet);
|
||||
|
||||
static void espnow_task(void *params);
|
||||
|
||||
protected:
|
||||
bool validate_channel_(uint8_t channel);
|
||||
ESPNowProtocol *get_protocol_component_(uint32_t protocol);
|
||||
ESPNowProtocol *get_protocol_(uint32_t protocol);
|
||||
|
||||
uint64_t own_peer_address_{0};
|
||||
uint8_t wifi_channel_{0};
|
||||
|
|
|
|||
Loading…
Reference in a new issue