Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-28 16:31:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

some CI linting fixes

Browse source
This commit is contained in:
NP v/d Spek 2024-09-23 18:30:45 +02:00
parent ecb3920564
commit 5709f4fb7f
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
esphome/components/espnow/espnow.cpp
View file

@ -39,7 +39,7 @@ std::string format_mac_addr(const uint8_t *mac) {
sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
return buf; return buf;
} }
void show_packet(std::string title, const ESPNowPacketPtr &packet) { void show_packet(const std::string &title, const ESPNowPacketPtr &packet) {
ESP_LOGVV(TAG, "%s packet: M:%s H:%cx%cx%c P:%c%c%c 0x%02x S:%02x C:ox%02x~0x%02x S:%02d V:%s", "test", ESP_LOGVV(TAG, "%s packet: M:%s H:%cx%cx%c P:%c%c%c 0x%02x S:%02x C:ox%02x~0x%02x S:%02d V:%s", "test",
format_mac_addr(packet->peer_as_bytes()).c_str(), packet->content_at(0), packet->content_at(1), format_mac_addr(packet->peer_as_bytes()).c_str(), packet->content_at(0), packet->content_at(1),
packet->content_at(2), packet->content_at(3), packet->content_at(4), packet->content_at(5), packet->content_at(2), packet->content_at(3), packet->content_at(4), packet->content_at(5),
@ -293,7 +293,7 @@ bool ESPNowComponent::write(const ESPNowPacketPtr &packet) {
esp_err_t err = esp_now_send((uint8_t *) &mac, packet->content_bytes(), packet->get_size()); esp_err_t err = esp_now_send((uint8_t *) &mac, packet->content_bytes(), packet->get_size());
ESP_LOGVV(TAG, "S: 0x%04x.%d B: %d%s.", packet->get_sequents(), packet->attempts, this->send_queue_used(), ESP_LOGVV(TAG, "S: 0x%04x.%d B: %d%s.", packet->get_sequents(), packet->attempts, this->send_queue_used(),
(err == ESP_OK) ? "" : " FAILED"); (err == ESP_OK) ? "" : " FAILED");
this->defer([this, packet, err]() { this->on_sent_(std::move(packet), err == ESP_OK); }); this->defer([this, packet, err]() { this->on_sent_(packet, err == ESP_OK); }); // std::move(packet)
return true; return true;
} }
@ -310,13 +310,13 @@ void ESPNowComponent::runner() {
if (!esp_now_is_peer_exist(mac)) { if (!esp_now_is_peer_exist(mac)) {
if (!this->auto_add_peer_) { if (!this->auto_add_peer_) {
this->defer([this, packet]() { this->on_new_peer_(std::move(packet)); }); this->defer([this, packet]() { this->on_new_peer_(packet); });
continue; continue;
} else { } else {
this->add_peer(packet->peer); this->add_peer(packet->peer);
} }
} }
this->defer([this, packet]() { this->on_receive_(std::move(packet)); }); this->defer([this, packet]() { this->on_receive_(packet); });
} }
packet = std::make_shared<ESPNowPacket>(); packet = std::make_shared<ESPNowPacket>();
if (xQueueReceive(this->send_queue_, packet.get(), (TickType_t) 1) == pdTRUE) { if (xQueueReceive(this->send_queue_, packet.get(), (TickType_t) 1) == pdTRUE) {
@ -366,21 +366,15 @@ void ESPNowComponent::on_data_sent(const uint8_t *mac_addr, esp_now_send_status_
ESP_LOGV(TAG, "Confirm sent (0x%04x.%d)", packet->get_sequents(), packet->attempts); ESP_LOGV(TAG, "Confirm sent (0x%04x.%d)", packet->get_sequents(), packet->attempts);
global_esp_now->defer([packet]() { global_esp_now->defer([packet]() {
packet->reload(); packet->reload();
global_esp_now->on_sent_(std::move(packet), true); global_esp_now->on_sent_(packet, true);
auto tmp = std::make_shared<ESPNowPacket>(); auto tmp = std::make_shared<ESPNowPacket>();
xQueueReceive(global_esp_now->send_queue_, tmp.get(), 10 / portTICK_PERIOD_MS); xQueueReceive(global_esp_now->send_queue_, tmp.get(), 10 / portTICK_PERIOD_MS);
global_esp_now->unlock(); global_esp_now->unlock();
}); });
return; return;
} }
global_esp_now->defer([packet]() { global_esp_now->defer([packet]() {
global_esp_now->on_sent_(std::move(packet), false); global_esp_now->on_sent_(packet, false);
auto tmp = std::make_shared<ESPNowPacket>();
xQueueReceive(global_esp_now->send_queue_, tmp.get(), 10 / portTICK_PERIOD_MS);
xQueueSendToFront(global_esp_now->send_queue_, tmp.get(), 10 / portTICK_PERIOD_MS);
global_esp_now->unlock(); global_esp_now->unlock();
}); });
} }

14
esphome/components/espnow/espnow.h
View file

@ -139,7 +139,7 @@ struct ESPNowPacket {
std::shared_ptr<ByteBuffer> payload_buffer_; std::shared_ptr<ByteBuffer> payload_buffer_;
}; };
using ESPNowPacketPtr = std::shared_ptr<ESPNowPacket>; typedef ESPNowPacketPtr = std::shared_ptr<ESPNowPacket>;
class ESPNowComponent; class ESPNowComponent;
@ -184,22 +184,22 @@ class ESPNowDefaultProtocol : public ESPNowProtocol {
void add_on_receive_callback(std::function<void(const ESPNowPacketPtr &)> &&callback) { void add_on_receive_callback(std::function<void(const ESPNowPacketPtr &)> &&callback) {
this->on_receive_.add(std::move(callback)); this->on_receive_.add(std::move(callback));
} }
void on_receive(const ESPNowPacketPtr &packet) override { this->on_receive_.call(std::move(packet)); }; void on_receive(const ESPNowPacketPtr &packet) override { this->on_receive_.call(packet); };
void add_on_sent_callback(std::function<void(const ESPNowPacketPtr &, bool status)> &&callback) { void add_on_sent_callback(std::function<void(const ESPNowPacketPtr &, bool status)> &&callback) {
this->on_sent_.add(std::move(callback)); this->on_sent_.add(std::move(callback));
} }
void on_sent(const ESPNowPacketPtr &packet, bool status) override { this->on_sent_.call(std::move(packet), status); }; void on_sent(const ESPNowPacketPtr &packet, bool status) override { this->on_sent_.call(packet, status); };
void add_on_peer_callback(std::function<void(const ESPNowPacketPtr &)> &&callback) { void add_on_peer_callback(std::function<void(const ESPNowPacketPtr &)> &&callback) {
this->on_new_peer_.add(std::move(callback)); this->on_new_peer_.add(std::move(callback));
} }
void on_new_peer(const ESPNowPacketPtr &packet) override { this->on_new_peer_.call(std::move(packet)); }; void on_new_peer(const ESPNowPacketPtr &packet) override { this->on_new_peer_.call(packet); };
protected: protected:
CallbackManager<void(ESPNowPacketPtr, bool)> on_sent_; CallbackManager<void(const ESPNowPacketPtr &, bool)> on_sent_;
CallbackManager<void(ESPNowPacketPtr)> on_receive_; CallbackManager<void(const ESPNowPacketPtr &)> on_receive_;
CallbackManager<void(ESPNowPacketPtr)> on_new_peer_; CallbackManager<void(const ESPNowPacketPtr &)> on_new_peer_;
}; };
class ESPNowComponent : public Component { class ESPNowComponent : public Component {