Apply suggested changes

Author: lucasssvaz

libraries/ESP_NOW/examples/ESP_NOW_Serial/ESP_NOW_Serial.ino

@@ -3,6 +3,7 @@
     Lucas Saavedra Vaz - 2024
     Send data between two ESP32s using the ESP-NOW protocol in one-to-one (unicast) configuration.
     Note that different MAC addresses are used for different interfaces.
+    Set the peer MAC address according to the device that will receive the data.
     To properly visualize the data being sent, set the line ending in the Serial Monitor to "Both NL & CR".
 */
 
@@ -13,41 +14,36 @@
 // 0: AP mode, 1: Station mode
 #define ESPNOW_WIFI_MODE_STATION 0
 
-// Channel to be used by the ESP-NOW protocol from 1 to 13
+// Channel to be used by the ESP-NOW protocol
 #define ESPNOW_WIFI_CHANNEL 1
 
 #if ESPNOW_WIFI_MODE_STATION // ESP-NOW using WiFi Station mode
-#define ESPNOW_WIFI_IF   WIFI_IF_STA
-#define GET_IF_MAC       WiFi.macAddress
-
-// Station mode MAC addresses of the devices in the network
-// Device 1 - F4:12:FA:42:B6:E8
-const MacAddress mac1({0xF4, 0x12, 0xFA, 0x42, 0xB6, 0xE8});
-// Device 2 - F4:12:FA:40:64:4C
-const MacAddress mac2({0xF4, 0x12, 0xFA, 0x40, 0x64, 0x4C});
+    #define ESPNOW_WIFI_IF   WIFI_IF_STA
+    #define GET_IF_MAC       WiFi.macAddress
+
+    // Set the Station MAC address of the device that will receive the data
+    // For example: F4:12:FA:40:64:4C
+    const MacAddress peer_mac({0xF4, 0x12, 0xFA, 0x40, 0x64, 0x4C});
 #else // ESP-NOW using WiFi AP mode
-#define ESPNOW_WIFI_IF   WIFI_IF_AP
-#define GET_IF_MAC       WiFi.softAPmacAddress
-
-// AP mode MAC addresses of the devices in the network
-// Device 1 - F6:12:FA:42:B6:E8
-const MacAddress mac1({0xF6, 0x12, 0xFA, 0x42, 0xB6, 0xE8});
-// Device 2 - F6:12:FA:40:64:4C
-const MacAddress mac2({0xF6, 0x12, 0xFA, 0x40, 0x64, 0x4C});
+    #define ESPNOW_WIFI_IF   WIFI_IF_AP
+    #define GET_IF_MAC       WiFi.softAPmacAddress
+
+    // Set the AP MAC address of the device that will receive the data
+    // For example: F6:12:FA:40:64:4C
+    const MacAddress peer_mac({0xF6, 0x12, 0xFA, 0x40, 0x64, 0x4C});
 #endif
 
-ESP_NOW_Serial_Class *esp_now_serial;
+ESP_NOW_Serial_Class NowSerial(peer_mac, ESPNOW_WIFI_CHANNEL, ESPNOW_WIFI_IF);
 
 void setup() {
-    MacAddress current_mac;
-
     Serial.begin(115200);
 
     Serial.print("WiFi Mode: ");
 
     #if ESPNOW_WIFI_MODE_STATION
     Serial.println("STA");
     WiFi.mode(ESPNOW_WIFI_MODE);
+    // ToDo: Set the channel using WiFi.setChannel() when using Station mode
     esp_wifi_set_channel(ESPNOW_WIFI_CHANNEL, WIFI_SECOND_CHAN_NONE);
     #else
     Serial.println("AP");
@@ -57,46 +53,24 @@ void setup() {
     Serial.print("Channel: ");
     Serial.println(ESPNOW_WIFI_CHANNEL);
 
-    String mac = GET_IF_MAC();
     Serial.print("MAC Address: ");
-    current_mac.fromString(mac);
-    Serial.println(mac);
-
-    WiFi.disconnect();
-
-    if (current_mac == mac1)
-    {
-        Serial.println("I'm the Device 1\n");
-        // Pass the MAC address of the other device to the ESP_NOW_Serial_Class
-        esp_now_serial = new ESP_NOW_Serial_Class(mac2, ESPNOW_WIFI_CHANNEL, ESPNOW_WIFI_IF);
-    }
-    else if (current_mac == mac2)
-    {
-        Serial.println("I'm the Device 2\n");
-        // Pass the MAC address of the other device to the ESP_NOW_Serial_Class
-        esp_now_serial = new ESP_NOW_Serial_Class(mac1, ESPNOW_WIFI_CHANNEL, ESPNOW_WIFI_IF);
-    }
-    else
-    {
-        Serial.println("Unknown MAC address. Please update the mac addresses in the sketch\n");
-        while(1);
-    }
+    Serial.println(GET_IF_MAC());
 
     // Start the ESP-NOW communication
     Serial.println("ESP-NOW communication starting...");
-    esp_now_serial->begin(115200);
+    NowSerial.begin(115200);
     Serial.println("You can now send data between the devices using the Serial Monitor\n");
 }
 
 void loop() {
-    while (esp_now_serial->available() > 0)
+    while (NowSerial.available())
     {
-        Serial.write(esp_now_serial->read());
+        Serial.write(NowSerial.read());
     }
 
-    while (Serial.available() && esp_now_serial->availableForWrite())
+    while (Serial.available() && NowSerial.availableForWrite())
     {
-        if (esp_now_serial->write(Serial.read()) <= 0)
+        if (NowSerial.write(Serial.read()))
         {
             Serial.println("Failed to send data");
             break;

libraries/ESP_NOW/src/ESP32_NOW.h

@@ -20,8 +20,6 @@ class ESP_NOW_Peer {
   size_t send(const uint8_t * data, int len);
 
 public:
-  const MacAddress BROADCAST_ADDR(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
-
   ESP_NOW_Peer(const uint8_t *mac_addr, uint8_t channel=0, wifi_interface_t iface=WIFI_IF_AP, const uint8_t *lmk=NULL);
   virtual ~ESP_NOW_Peer() {}
 
@@ -46,6 +44,8 @@ class ESP_NOW_Peer {
 
 class ESP_NOW_Class : public Print {
 public:
+  const MacAddress BROADCAST_ADDR = MacAddress(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
+
   ESP_NOW_Class();
   ~ESP_NOW_Class();