Fix examples

Author: gmag11

examples/advancedespnow/advancedespnow.cpp

@@ -18,39 +18,31 @@ static uint8_t receiver[] = { 0x12, 0x34, 0x56, 0x78, 0x90, 0x12 };
 //#define DEST_ADDR ESPNOW_BROADCAST_ADDRESS 
 
 bool sent = true;
-bool received = false;
 
 const unsigned int SEND_MSG_MSEC = 2000;
 
-//------------ SET ACCORDING YOUR BOARD -----------
-static const int LED_PIN = 5;
-static const int LED_ON = LOW;
-//-------------------------------------------------
-
 void dataSent (uint8_t* address, uint8_t status) {
     sent = true;
-    //Serial.printf ("Message sent to " MACSTR ", status: %d\n", MAC2STR (address), status);
+    Serial.printf ("Message sent to " MACSTR ", status: %d\n", MAC2STR (address), status);
 }
 
-void dataReceived (uint8_t* address, uint8_t* data, uint8_t len, signed int rssi) {
-    digitalWrite (LED_PIN, LED_ON);
+void dataReceived (uint8_t* address, uint8_t* data, uint8_t len, signed int rssi, bool broadcast) {
     Serial.print ("Received: ");
     Serial.printf ("%.*s\n", len, data);
     Serial.printf ("RSSI: %d dBm\n", rssi);
     Serial.printf ("From: " MACSTR "\n", MAC2STR (address));
-    digitalWrite (LED_PIN, !LED_ON);
+    Serial.printf ("%s\n", broadcast ? "Broadcast" : "Unicast");
 }
 
 void setup () {
     Serial.begin (115200);
     WiFi.mode (WIFI_MODE_STA);
-    pinMode (LED_PIN, OUTPUT);
-    digitalWrite (LED_PIN, !LED_ON);
 #if defined ESP32
     WiFi.disconnect (false, true);
 #elif defined ESP8266
     WiFi.disconnect (false);
 #endif //ESP32
+
     Serial.printf ("Connected to %s in channel %d\n", WiFi.SSID ().c_str (), WiFi.channel ());
     Serial.printf ("IP address: %s\n", WiFi.localIP ().toString ().c_str ());
     Serial.printf ("MAC address: %s\n", WiFi.macAddress ().c_str ());
@@ -63,14 +55,15 @@ void loop () {
     static time_t lastSend = 0;
     static unsigned int counter = 0;
 
+     // Sent flag is needed to wait for the message to be actually sent. Avoids messages dropping, maximizing throughput.
     if (sent && ((millis () - lastSend) > SEND_MSG_MSEC)) {
         lastSend = millis ();
-        String message = String (msg);// +" " + String (counter++);
+        String message = String (msg) + " " + String (counter++);
         sent = false;
         if (!quickEspNow.send (DEST_ADDR, (uint8_t*)message.c_str (), message.length ())) {
-            //Serial.printf (">>>>>>>>>> %ld: Message sent\n", micros());
+            Serial.printf (">>>>>>>>>> Message sent\n");
         } else {
-            Serial.printf (">>>>>>>>>> %ld: Message not sent\n", micros ());
+            Serial.printf (">>>>>>>>>> Message not sent\n");
             sent = true;
         }
 

examples/wifi_ap_and_espnow/wifi_ap_and_espnow.cpp

@@ -1,14 +1,22 @@
 #include <Arduino.h>
+#if defined ESP32
 #include <WiFi.h>
-#include <QuickEspNow.h>
 #include <esp_wifi.h>
+#elif defined ESP8266
+#include <ESP8266WiFi.h>
+#define WIFI_MODE_STA WIFI_STA 
+#define WIFI_MODE_AP WIFI_AP
+#else
+#error "Unsupported platform"
+#endif //ESP32
+#include <QuickEspNow.h>
 
 static const String msg = "Hello esp-now from TTGO";
-static uint8_t addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-static uint8_t addr_t_display[] = { 0x08, 0x3a, 0xf2, 0x69, 0xc4, 0x04 };
-static uint8_t addr_ttgo[] = { 0xb4, 0xe6, 0x2d, 0x9d, 0xab, 0x15 };
-static uint8_t addr_ttgo_ap[] = { 0xb4, 0xe6, 0x2d, 0x9d, 0xab, 0x16 };
-static uint8_t addr_m5[] = { 0x4c, 0x75, 0x25, 0xac, 0xc8, 0x50 };
+
+static uint8_t receiver[] = { 0x12, 0x34, 0x56, 0x78, 0x90, 0x12 };
+
+#define DEST_ADDR receiver
+//#define DEST_ADDR ESPNOW_BROADCAST_ADDRESS 
 
 static const uint8_t CHANNEL = 1;
 
@@ -61,12 +69,12 @@ void setup () {
 
 void loop () {
     static time_t lastSend = 60000;
-    static uint counter = 0;
+    static unsigned int counter = 0;
 
     if (millis () - lastSend >= 1000) {
         lastSend = millis ();
         String message = String (msg) + " " + String (counter++);
-        if (!quickEspNow.send (addr_m5, (uint8_t*)message.c_str (), message.length ())) {
+        if (!quickEspNow.send (DEST_ADDR, (uint8_t*)message.c_str (), message.length ())) {
             //Serial.printf (">>>>>>>>>> %ld: Message sent\n", micros());
         } else {
             Serial.printf (">>>>>>>>>> %ld: Message not sent\n", micros ());

examples/wifi_sta_and_espnow/wifi_sta_and_espnow.cpp

@@ -1,7 +1,14 @@
 #include <Arduino.h>
+#if defined ESP32
 #include <WiFi.h>
-#include <QuickEspNow.h>
 #include <esp_wifi.h>
+#elif defined ESP8266
+#include <ESP8266WiFi.h>
+#define WIFI_MODE_STA WIFI_STA 
+#else
+#error "Unsupported platform"
+#endif //ESP32
+#include <QuickEspNow.h>
 
 static const String msg = "Hello esp-now!";
 
@@ -36,7 +43,7 @@ void setup () {
 
 void loop() { 
     static time_t lastSend = 60000;
-    static uint counter = 0;
+    static unsigned int counter = 0;
 
     if (millis () - lastSend >= 1000) {
         lastSend = millis ();