adafruit-mirror/arduino-esp32
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(ESP-NOW): Remove all peers on ESP_NOW.end() (#10102)

Browse source 
* fix(esp-now): Remove all peers on ESP_NOW.end()

* ci(pre-commit): Apply automatic fixes

---------

Co-authored-by: pre-commit-ci-lite[bot] <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com>
This commit is contained in:
Jan Procházka 2024-08-02 10:21:32 +02:00 committed by GitHub
parent 23b84e5bdd
commit 5aaa49e76d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/ESP_NOW/src/ESP32_NOW.cpp
View file

@ -190,13 +190,19 @@ bool ESP_NOW_Class::end() {
if (!_esp_now_has_begun) { if (!_esp_now_has_begun) {
return true; return true;
} }
//remove all peers? //remove all peers
for (uint8_t i = 0; i < ESP_NOW_MAX_TOTAL_PEER_NUM; i++) {
if (_esp_now_peers[i] != NULL) {
removePeer(*_esp_now_peers[i]);
}
}
esp_err_t err = esp_now_deinit(); esp_err_t err = esp_now_deinit();
if (err != ESP_OK) { if (err != ESP_OK) {
log_e("esp_now_deinit failed! 0x%x", err); log_e("esp_now_deinit failed! 0x%x", err);
return false; return false;
} }
_esp_now_has_begun = false; _esp_now_has_begun = false;
//clear the peer list
memset(_esp_now_peers, 0, sizeof(ESP_NOW_Peer *) * ESP_NOW_MAX_TOTAL_PEER_NUM); memset(_esp_now_peers, 0, sizeof(ESP_NOW_Peer *) * ESP_NOW_MAX_TOTAL_PEER_NUM);
return true; return true;
} }
@ -262,6 +268,10 @@ void ESP_NOW_Class::onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const
new_arg = arg; new_arg = arg;
} }
bool ESP_NOW_Class::removePeer(ESP_NOW_Peer &peer) {
return peer.remove();
}
ESP_NOW_Class ESP_NOW; ESP_NOW_Class ESP_NOW;
/* /*

47
libraries/ESP_NOW/src/ESP32_NOW.h
View file

@ -6,6 +6,31 @@
#include "esp32-hal-log.h" #include "esp32-hal-log.h"
#include "esp_mac.h" #include "esp_mac.h"
class ESP_NOW_Peer; //forward declaration for friend function
class ESP_NOW_Class : public Print {
public:
const uint8_t BROADCAST_ADDR[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
ESP_NOW_Class();
~ESP_NOW_Class();
bool begin(const uint8_t *pmk = NULL /* 16 bytes */);
bool end();
int getTotalPeerCount();
int getEncryptedPeerCount();
int availableForWrite();
size_t write(const uint8_t *data, size_t len);
size_t write(uint8_t data) {
return write(&data, 1);
}
void onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const uint8_t *data, int len, void *arg), void *arg);
bool removePeer(ESP_NOW_Peer &peer);
};
class ESP_NOW_Peer { class ESP_NOW_Peer {
private: private:
uint8_t mac[6]; uint8_t mac[6];
@ -47,28 +72,8 @@ public:
virtual void onSent(bool success) { virtual void onSent(bool success) {
log_i("Message transmission to peer " MACSTR " %s", MAC2STR(mac), success ? "successful" : "failed"); log_i("Message transmission to peer " MACSTR " %s", MAC2STR(mac), success ? "successful" : "failed");
} }
};
class ESP_NOW_Class : public Print { friend bool ESP_NOW_Class::removePeer(ESP_NOW_Peer &);
public:
const uint8_t BROADCAST_ADDR[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
ESP_NOW_Class();
~ESP_NOW_Class();
bool begin(const uint8_t *pmk = NULL /* 16 bytes */);
bool end();
int getTotalPeerCount();
int getEncryptedPeerCount();
int availableForWrite();
size_t write(const uint8_t *data, size_t len);
size_t write(uint8_t data) {
return write(&data, 1);
}
void onNewPeer(void (*cb)(const esp_now_recv_info_t *info, const uint8_t *data, int len, void *arg), void *arg);
}; };
extern ESP_NOW_Class ESP_NOW; extern ESP_NOW_Class ESP_NOW;