Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-24 16:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove some unneeded Peer conversions

Browse source
This commit is contained in:
NP v/d Spek 2024-10-05 23:36:09 +02:00
parent 7931a307b4
commit 03d2c8b837
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,6 +106,7 @@ void ESPNowComponent::setup() {
this->mark_failed(); this->mark_failed();
return; return;
} }
if (this->use_sent_check_) { if (this->use_sent_check_) {
ESP_LOGI(TAG, "send check enabled"); ESP_LOGI(TAG, "send check enabled");
@ -164,10 +165,8 @@ esp_err_t ESPNowComponent::add_peer(uint64_t addr) {
} }
esp_err_t ESPNowComponent::del_peer(uint64_t addr) { esp_err_t ESPNowComponent::del_peer(uint64_t addr) {
uint8_t mac[6]; if (esp_now_is_peer_exist((uint8_t *) &addr))
memcpy((void *) &mac, (void *) &addr, 6); return esp_now_del_peer((uint8_t *) &addr);
if (esp_now_is_peer_exist((uint8_t *) &mac))
return esp_now_del_peer((uint8_t *) &mac);
return ESP_OK; return ESP_OK;
} }
@ -248,13 +247,11 @@ void ESPNowComponent::on_data_received(const uint8_t *addr, const uint8_t *data,
} }
bool ESPNowComponent::send(ESPNowPacket packet) { bool ESPNowComponent::send(ESPNowPacket packet) {
uint8_t *mac = packet.get_peer();
if (this->is_failed()) { if (this->is_failed()) {
ESP_LOGE(TAG, "Cannot send espnow packet, espnow failed to setup"); ESP_LOGE(TAG, "Cannot send espnow packet, espnow failed to setup");
} else if (this->send_queue_full()) { } else if (this->send_queue_full()) {
ESP_LOGE(TAG, "Send Buffer Out of Memory."); ESP_LOGE(TAG, "Send Buffer Out of Memory.");
} else if (!esp_now_is_peer_exist(mac)) { } else if (!esp_now_is_peer_exist(packet.get_peer())) {
ESP_LOGE(TAG, "Peer not registered: 0x%12llx.", packet.peer); ESP_LOGE(TAG, "Peer not registered: 0x%12llx.", packet.peer);
} else if (!packet.is_valid()) { } else if (!packet.is_valid()) {
ESP_LOGE(TAG, "This Packet is invalid: '%012llx' (%d.%d)", packet.peer, packet.get_sequents(), packet.attempts); ESP_LOGE(TAG, "This Packet is invalid: '%012llx' (%d.%d)", packet.peer, packet.get_sequents(), packet.attempts);
@ -264,7 +261,7 @@ bool ESPNowComponent::send(ESPNowPacket packet) {
xQueueSendToBack(this->send_queue_, (void *) &packet, 10); xQueueSendToBack(this->send_queue_, (void *) &packet, 10);
return true; return true;
} else { } else {
esp_err_t err = esp_now_send((uint8_t *) &mac, packet.get_content(), packet.content_size()); esp_err_t err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());
ESP_LOGV(TAG, "Sended '%012llx' (%d.%d) directly%s.", packet.peer, packet.get_sequents(), packet.attempts, ESP_LOGV(TAG, "Sended '%012llx' (%d.%d) directly%s.", packet.peer, packet.get_sequents(), packet.attempts,
(err == ESP_OK) ? "" : " FAILED"); (err == ESP_OK) ? "" : " FAILED");
@ -304,9 +301,8 @@ void ESPNowComponent::runner() {
this->lock(); this->lock();
packet.retry(); packet.retry();
packet.timestamp = millis(); packet.timestamp = millis();
uint8_t *mac = packet.get_peer();
esp_err_t err = esp_now_send(mac, packet.get_content(), packet.content_size()); esp_err_t err = esp_now_send(packet.get_peer(), packet.get_content(), packet.content_size());
if (err == ESP_OK) { if (err == ESP_OK) {
ESP_LOGD(TAG, "Sended '%012llx' (%d.%d) from buffer. Wait for conformation.", packet.peer, ESP_LOGD(TAG, "Sended '%012llx' (%d.%d) from buffer. Wait for conformation.", packet.peer,