Merge pull request #68 from hpsaturn/devel

Devel

Author: hpsaturn

.github/workflows/devel.yml

@@ -33,4 +33,4 @@ jobs:
           pio pkg update
       - name: PlatformIO Build Test
         run: |
-          pio run -e freenove-tank -e makerfabs-multi-receiver -e xiao-camera3
+          pio run -e freenove-tank -e makerfabs-multi-receiver -e xiao-camera3 -e wifiraw-80211tx-sender

.github/workflows/platformio.yml

@@ -33,4 +33,4 @@ jobs:
           pio pkg update
       - name: PlatformIO Build Test
         run: |
-          pio run -e freenove-tank -e m5stickCplus-joystick-tank -e custom-camera-sender -e m5cores3-espnow-receiver -e makerfabs-multi-receiver -e xiao-camera3
+          pio run -e freenove-tank -e m5stickCplus-joystick-tank -e custom-camera-sender -e m5cores3-espnow-receiver -e makerfabs-multi-receiver -e xiao-camera3 -e wifiraw-80211tx-sender -e wifiraw-80211tx-receiver

.gitignore

@@ -45,3 +45,7 @@ releases
 releases/binaries/
 releases/installer/
 examples/lib/espcamlib
+.history
+.local
+.cache
+.platformio

README.md

@@ -22,6 +22,7 @@ The latest version brings numerous enhancements and is currently highly stable.
 - One transmitter to multiple receivers using the internal ESPNow broadcasting feature (1:N mode).
 - Peer-to-peer (P2P) connections utilizing MAC address targeting (1:1 mode).
 - Multi-sender mode with one receiver (N:1 mode).
+- **NEW:** [80211tx()](#wifi-raw-80211tx-mode-experimental) WiFi raw ESPNow alternative (Beta).
 
 [![ESPNowCam broadcast camera mode](https://raw.githubusercontent.com/hpsaturn/ESPNowCam/master/pictures/broadcast-camera-mode.gif)](https://youtu.be/zXIzP1TGlpA) [![ESPNowCam P2P mode](https://raw.githubusercontent.com/hpsaturn/ESPNowCam/master/pictures/p2p-camera-mode.gif)](https://youtu.be/XDIiJ25AKr8) [![ESPNowCam multi camera mode](https://raw.githubusercontent.com/hpsaturn/ESPNowCam/master/pictures/multi-camera-mode.gif)](https://youtu.be/ip6RohVEg2s)  
 [[1:N mode video]](https://youtu.be/zXIzP1TGlpA) [[1:1 mode video]](https://youtu.be/XDIiJ25AKr8) [[N:1 mode video]](https://youtu.be/ip6RohVEg2s)  
@@ -35,6 +36,7 @@ The current version was tested with the next cameras:
 
 | Sender |  Frame | PSRAM | JPGQ | FPS | Status |
 |:---------|:-----:|:-----:|:------:|:-------:|:------:|
+| Freenove [80211tx()](#wifi-raw-80211tx-mode-experimental) | QVGA | Yes | 12 | ~13 FPS | TESTING |
 | TTGO TJournal |  QVGA | No | 12 | ~11 FPS | STABLE |
 | XIAO Sense S3 | QVGA | Yes | 12 | ~11 FPS | STABLE |
 | Freenove S3 | QVGA | Yes | 12 | ~10 FPS | STABLE |
@@ -51,21 +53,21 @@ The current version was tested with the next cameras:
 Add the following line to the lib_deps option of your [env:] section:
 
 ```python
-hpsaturn/EspNowCam@^0.1.17
+hpsaturn/EspNowCam@^0.2.0
 ```
 
 Or via command line:  
 
 ```python
-pio pkg install --library "hpsaturn/ESPNowCam@^0.1.17"
+pio pkg install --library "hpsaturn/ESPNowCam@^0.2.0"
 ```
 
 **Arduino IDE**:
 
 >[!IMPORTANT]
 >For `Arduino IDE` is a little bit more complicated because the Arduino IDE dependencies resolver is very bad, but you only need:
 >
->1. Download and install the [Nanopb library](https://github.com/nanopb/nanopb/releases/tag/nanopb-0.4.8) using the `Include Library` section via zip file
+>1. Download and install the [Nanopb library](https://github.com/nanopb/nanopb/releases/tag/nanopb-0.4.9.1) using the `Include Library` section via zip file
 >2. and then with the **Library Manager** find **ESPNowCam** and install it.
 
 >[!TIP]
@@ -83,6 +85,7 @@ ESPNowCam radio;
 radio.init();
 radio.sendData(data, data_len);
 ```
+
 [full sender implementation example](https://github.com/hpsaturn/ESPNowCam/blob/master/examples/xiao-espnow-sender/xiao-espnow-sender.cpp)
 
 **To receive** the data, you only need to define a buffer and callback:
@@ -98,6 +101,7 @@ void onDataReady(uint32_t lenght) {
   tft.drawJpg(fb, lenght , 0, 0, dw, dh);
 }
 ```
+
 [full receiver implementation example](https://github.com/hpsaturn/ESPNowCam/blob/master/examples/m5core2-basic-receiver/m5core2-basic-receiver.ino)
 
 >[!NOTE]
@@ -128,6 +132,42 @@ radio.setRecvFilter(fb_cam3, mac_cam3, onCam3DataReady);
 
 and each camera should have configured the receiver MAC like a target. Fore more details, please follow the [multi-camera-one-receiver](https://github.com/hpsaturn/ESPNowCam/tree/master/examples/multi-camera-one-receiver/) directory example.
 
+### WiFi Raw 802.11tx mode (experimental)
+
+Now is possible use 80211tx() primitive or WiFi RAW mode without ESPNow internals. Using this raw mode it could be better performance. For that, only do that:
+
+**sender**:
+
+```cpp
+WiFiRawComm wifiRaw;
+ESPNowCam radio(&wifiRaw);
+
+radio.setTarget(macRecv); // receiver mac address to improve quality
+radio.setChannel(6);      // improve quality (recommended)
+radio.init(512);          // you are able to change the chunk size
+
+radio.sendData(out_data, out_data_len);
+```  
+
+[full wifiraw-80211tx-sender example](https://github.com/hpsaturn/ESPNowCam/tree/master/examples/wifiraw-80211tx-sender)
+
+**receiver**:
+
+```cpp
+WiFiRawComm wifiRaw;
+ESPNowCam radio(&wifiRaw);
+
+radio.setRecvBuffer(fb);            // fixed buffer
+radio.setRecvCallback(onDataReady); // similar callback to other modes
+radio.setChannel(6);                // improve quality
+radio.init(512);                    // the same sender chunk size
+```  
+
+[full wifiraw-80211tx-receiver example](https://github.com/hpsaturn/ESPNowCam/tree/master/examples/wifiraw-80211tx-receiver)
+
+>[!TIP]
+>Note: The N:1 mode is not full implemented on WiFi raw. It is recommended use channel and mac address target on the sender for improve quality. Please sse the examples for details.
+
 ### Predefined drivers
 
 The library includes some pre-defined camera configs to have an easy implementation, for example:
@@ -214,7 +254,7 @@ Also I'm working in a complete Camera configurator and test suite for this libra
 - [x] Add sender callback to improve speed
 - [x] Added internal drivers for some popular Cameras
 - [x] Added multi-camera support with one only target
-- [ ] Migration to esp_wifi_80211_tx() to improve Payload and Quality
+- [x] Migration to esp_wifi_80211_tx() to improve Payload and Quality
 
 ## Credits
 

examples/freenove-p2p-sender/freenove-p2p-sender.cpp

@@ -40,17 +40,24 @@ void setup() {
   }
 
   // M5Core2 receiver
-  const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
-  radio.setTarget(macRecv);
-  radio.init();
+  // const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
+  // radio.setTarget(macRecv);
+
+  if (radio.init()) {
+    Serial.println("ESPNowCam Init Success");
+  }
+
+  delay(500);
 
   // You are able to change the Camera config E.g:
   // Camera.config.fb_count = 2;
   // Camera.config.frame_size = FRAMESIZE_QQVGA;
 
-  if (!Camera.begin()) {
+  if (Camera.begin()) {
+    Serial.println("Camera Init Success");
+  } else
     Serial.println("Camera Init Fail");
-  }
+  
   delay(500);
 }
 

examples/m5core2-espnow-receiver/m5core2-espnow-receiver.cpp

@@ -12,10 +12,8 @@
 
 ESPNowCam radio;
 
-// frame buffer
-uint8_t *fb; 
-// display globals
-int32_t dw, dh;
+uint8_t *fb;    // frame buffer
+int32_t dw, dh; // display width and height
 
 void onDataReady(uint32_t lenght) {
   M5.Display.drawJpg(fb, lenght , 0, 0, dw, dh);
@@ -42,8 +40,8 @@ void setup() {
   radio.setRecvCallback(onDataReady);
 
   if (radio.init()) {
-    M5.Display.drawString("ESPNow Init Success", dw / 2, dh / 2);
-    Serial.println("ESPNow Init Success");
+    M5.Display.drawString("ESPNowCam Init Success", dw / 2, dh / 2);
+    Serial.println("ESPNowCam Init Success");
   } 
   delay(500);
 }

examples/m5cores3-espnow-receiver/m5cores3-espnow-receiver.cpp

@@ -53,13 +53,13 @@ void setup() {
   }
 
   // BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
-  fb = static_cast<uint8_t *>(ps_malloc(5000 * sizeof(uint8_t)));
+  fb = static_cast<uint8_t *>(ps_malloc(15000 * sizeof(uint8_t)));
 
   radio.setRecvBuffer(fb);
   radio.setRecvCallback(onDataReady);
 
   if (radio.init()) {
-    M5.Display.drawString("ESPNow Init Success", dw / 2, dh / 2);
+    M5.Display.drawString("ESPNowCam Init Success", dw / 2, dh / 2);
   }
   delay(1000);
 }

examples/wifiraw-80211tx-receiver/wifiraw-80211tx-receiver.cpp

@@ -0,0 +1,59 @@
+/**************************************************
+ * ESPNowCam receiver using WiFi Raw frames (802.11 Tx)
+ * by @hpsaturn Copyright (C) 2024-2026
+ * This file is part ESPNowCam project:
+ * https://github.com/hpsaturn/ESPNowCam
+**************************************************/
+
+// N O T E:
+// -------
+// Don't forget first install NanoPb library!
+// and also review the README.md file.
+
+#include <Arduino.h>
+#include <M5Unified.h>
+#include "ESPNowCam.h"
+#include "Utils.h"
+
+WiFiRawComm wifiRaw;
+ESPNowCam radio(&wifiRaw);
+
+uint8_t *fb;    // frame buffer
+int32_t dw, dh; // display width and height
+
+void onDataReady(uint32_t lenght) {
+  M5.Display.drawJpg(fb, lenght , 0, 0, dw, dh);
+  printFPS("M5Core2:");
+}
+
+void setup() {
+  Serial.begin(115200);
+  Serial.setDebugOutput(true);
+  Serial.println();
+  delay(100);
+
+  auto cfg = M5.config();
+  M5.begin(cfg);
+  M5.Display.setBrightness(100);
+  dw=M5.Display.width();
+  dh=M5.Display.height();
+
+  if(psramFound()){
+    size_t psram_size = esp_spiram_get_size() / 1048576;
+    Serial.printf("PSRAM size: %dMb\r\n", psram_size);
+  }
+  // BE CAREFUL WITH IT, IF JPG LEVEL CHANGES, INCREASE IT
+  fb = static_cast<uint8_t*>(ps_malloc(15000 * sizeof(uint8_t)));
+
+  radio.setRecvBuffer(fb);
+  radio.setRecvCallback(onDataReady);
+  radio.setChannel(6);
+
+  if (radio.init(512)) {  // chunk size in bytes (beta feature)
+    M5.Display.drawString("ESPNowCam Init Success", dw / 2, dh / 2);
+    Serial.println("ESPNowCam Init Success");
+  } 
+  delay(100);
+}
+
+void loop() {}

examples/wifiraw-80211tx-sender/wifiraw-80211tx-sender.cpp

@@ -0,0 +1,64 @@
+/**************************************************
+ * ESPNowCam transmitter using WiFi Raw frames (802.11 Tx)
+ * by @hpsaturn Copyright (C) 2024-2026
+ * This file is part ESPNowCam project:
+ * https://github.com/hpsaturn/ESPNowCam
+**************************************************/
+
+// N O T E:
+// -------
+// Don't forget first install NanoPb library!
+// and also review the README.md file.
+
+#include <Arduino.h>
+#include <ESPNowCam.h>
+#include <drivers/CamFreenove.h>
+
+CamFreenove Camera;
+WiFiRawComm wifiRaw;
+ESPNowCam radio(&wifiRaw);
+
+void processFrame() {
+  if (Camera.get()) {
+    uint8_t *out_jpg = NULL;
+    size_t out_jpg_len = 0;
+    frame2jpg(Camera.fb, 12, &out_jpg, &out_jpg_len); 
+    radio.sendData(out_jpg, out_jpg_len);
+    free(out_jpg);
+    Camera.free();
+  }
+}
+
+void setup() {
+  Serial.begin(115200);
+  Serial.setDebugOutput(true);
+  Serial.println();
+  delay(100);
+
+  if(psramFound()){
+    size_t psram_size = esp_spiram_get_size() / 1048576;
+    Serial.printf("PSRAM size: %dMb\r\n", psram_size);
+  }
+
+  // M5Core2 receiver
+  const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
+  radio.setTarget(macRecv);
+  radio.setChannel(6);
+
+  if (radio.init(512)) {  // chunk size in bytes (beta feature)
+    Serial.println("ESPNowCam Init Success");
+  }
+
+  // You are able to change the Camera config E.g:
+  Camera.config.fb_count = 2;
+  Camera.config.frame_size = FRAMESIZE_QVGA;
+
+  if (!Camera.begin()) {
+    Serial.println("Camera Init Fail");
+  }
+  delay(100);
+}
+
+void loop() {
+  processFrame();
+}

library.json

@@ -1,6 +1,6 @@
 {
   "name": "EspNowCam",
-  "version": "0.1.17",
+  "version": "0.2.0",
   "homepage":"https://github.com/hpsaturn/esp32s3-cam",
   "keywords": 
   [