Add argument to receive callback to know if a message was broadcasted

Author: lucasssvaz

libraries/ESP_NOW/src/ESP32_NOW.cpp

@@ -104,7 +104,8 @@ static esp_err_t _esp_now_modify_peer(const uint8_t *mac_addr, uint8_t channel,
 }
 
 static void _esp_now_rx_cb(const esp_now_recv_info_t *info, const uint8_t *data, int len){
-    log_v(MACSTR", data lenght : %d", MAC2STR(info->src_addr), len);
+    bool broadcast = memcmp(info->des_addr, ESP_NOW.BROADCAST_ADDR, ESP_NOW_ETH_ALEN) == 0;
+    log_v("%s from " MACSTR ", data lenght : %u", broadcast ? "Broadcast" : "Unicast", MAC2STR(info->src_addr), len);
     log_buf_v(data, len);
     if(!esp_now_is_peer_exist(info->src_addr) && new_cb != NULL){
         log_v("Calling new_cb, peer not found.");
@@ -114,7 +115,7 @@ static void _esp_now_rx_cb(const esp_now_recv_info_t *info, const uint8_t *data,
     //find the peer and call it's callback
     for(uint8_t i=0; i<ESP_NOW_MAX_TOTAL_PEER_NUM; i++){
         if(_esp_now_peers[i] != NULL && memcmp(info->src_addr, _esp_now_peers[i]->addr(), ESP_NOW_ETH_ALEN) == 0){
-            _esp_now_peers[i]->_onReceive(data, len);
+            _esp_now_peers[i]->_onReceive(data, len, broadcast);
             return;
         }
     }

libraries/ESP_NOW/src/ESP32_NOW.h

@@ -3,7 +3,6 @@
 #include "esp_wifi_types.h"
 #include "Print.h"
 #include "esp_now.h"
-#include "MacAddress.h"
 
 class ESP_NOW_Peer {
 private:
@@ -38,13 +37,13 @@ class ESP_NOW_Peer {
   operator bool() const;
 
   //must be implemented by the upper class
-  virtual void _onReceive(const uint8_t * data, size_t len) = 0;
+  virtual void _onReceive(const uint8_t * data, size_t len, bool broadcast) = 0;
   virtual void _onSent(bool success) = 0;
 };
 
 class ESP_NOW_Class : public Print {
 public:
-  const MacAddress BROADCAST_ADDR = MacAddress(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
+  const uint8_t BROADCAST_ADDR[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
   ESP_NOW_Class();
   ~ESP_NOW_Class();

libraries/ESP_NOW/src/ESP32_NOW_Serial.cpp

@@ -140,11 +140,11 @@ void ESP_NOW_Serial_Class::flush(){
 }
 
 //RX callback
-void ESP_NOW_Serial_Class::_onReceive(const uint8_t * data, size_t len){
+void ESP_NOW_Serial_Class::_onReceive(const uint8_t * data, size_t len, bool broadcast){
     if(rx_queue == NULL){
         return;
     }
-    log_v(MACSTR ", data lenght : %u", MAC2STR(addr()), len);
+    log_v("%s from " MACSTR ", data lenght : %u", broadcast ? "Broadcast" : "Unicast", MAC2STR(addr()), len);
     for(uint32_t i=0; i<len; i++){
         if(!xQueueSend(rx_queue, data+i, 0)){
             log_e("RX Overflow!");

libraries/ESP_NOW/src/ESP32_NOW_Serial.h

@@ -39,7 +39,7 @@ class ESP_NOW_Serial_Class : public Stream, public ESP_NOW_Peer {
     size_t write(const uint8_t *buffer, size_t size){ return write(buffer, size, 1000); }
     size_t write(uint8_t data){ return write(&data, 1); }
     //ESP_NOW_Peer
-    void _onReceive(const uint8_t * data, size_t len);
+    void _onReceive(const uint8_t * data, size_t len, bool broadcast);
     void _onSent(bool success);
 };