Merge pull request #71 from hpsaturn/fix_proto_capacity_issue

hpsaturn · web-flow · commit 92cbb46447ff · 2026-03-08T23:29:14.000+01:00
Fixed proto and payload capacity issues
diff --git a/.github/workflows/devel.yml b/.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 -e wifiraw-80211tx-sender
+          pio run -e freenove-tank -e makerfabs-multi-receiver -e xiao-camera3 -e wifiraw-80211tx-freenove-sender
diff --git a/.github/workflows/platformio.yml b/.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 -e wifiraw-80211tx-sender -e wifiraw-80211tx-receiver
+          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-freenove-sender -e wifiraw-80211tx-receiver
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![PlatformIO](https://github.com/hpsaturn/esp32s3-cam/workflows/PlatformIO/badge.svg)](https://github.com/hpsaturn/esp32s3-cam/actions/) [![All Platforms](https://github.com/hpsaturn/esp32s3-cam/workflows/Scheduled/badge.svg)](https://github.com/hpsaturn/esp32s3-cam/actions/) ![ViewCount](https://views.whatilearened.today/views/github/hpsaturn/esp32s3-cam.svg)  
 
-The ESPNowCam library is a simple and direct video or data streamer designed for popular ESP32 devices, utilizing the ESPNow protocol. No need for IPs, routers, or credentials—keeping it straightforward and hassle-free! :D
+The ESPNowCam library is a simple and direct video or data streamer designed for popular ESP32 devices, utilizing ESPNow and WiFi-raw (80211tx) protocols. No need for IPs, routers, or credentials-keeping it straightforward and hassle-free! :D
 
 >[!TIP]
 >**This library is for general purpose**, as it accepts pointers to various types of data, including buffers, strings, images, or any byte-formatted content. This flexibility enables transmission of larger packages across different scenarios, not limited to cameras alone. For instance, a buffer of 4000 bytes takes approximately 1/9 of a second to transmit, resulting in a frame rate of around 9FPS.
@@ -36,6 +36,7 @@ The current version was tested with the next cameras:
 
 | Sender |  Frame | PSRAM | JPGQ | FPS | Status |
 |:---------|:-----:|:-----:|:------:|:-------:|:------:|
+| M5CoreS3 [80211tx()](#wifi-raw-80211tx-mode-experimental) | QVGA | Yes | 12 | ~14 FPS | TESTING |
 | 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 |
@@ -149,7 +150,8 @@ 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)
+[full wifiraw-80211tx-freenove-sender example](https://github.com/hpsaturn/ESPNowCam/tree/master/examples/wifiraw-80211tx-freenove-sender)  
+[full wifiraw-80211tx-m5cores3-sender example](https://github.com/hpsaturn/ESPNowCam/tree/master/examples/wifiraw-80211tx-sender)
 
 **receiver**:
 
diff --git a/examples/esp32cam-basic-sender/platformio.ini b/examples/esp32cam-basic-sender/platformio.ini
@@ -23,4 +23,4 @@ board = esp32dev
 [env:esp32cam-basic-sender]
 extends = esp32common
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.12
+  hpsaturn/EspNowCam@^0.2.0
diff --git a/examples/freenove-basic-sender/platformio.ini b/examples/freenove-basic-sender/platformio.ini
@@ -26,4 +26,4 @@ board_build.partitions = ../../config/partitions.csv
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.11
+  hpsaturn/EspNowCam@^0.2.0
diff --git a/examples/freenove-hvga-sender/platformio.ini b/examples/freenove-hvga-sender/platformio.ini
@@ -26,4 +26,4 @@ board_build.partitions = ../../config/partitions.csv
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.6
+  hpsaturn/EspNowCam@^0.2.0
diff --git a/examples/generic-camera-nopsram/platformio.ini b/examples/generic-camera-nopsram/platformio.ini
@@ -22,4 +22,4 @@ board = esp32dev
 [env:generic-camera-nopsram]
 extends = esp32common
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.8
+  hpsaturn/EspNowCam@^0.2.0
diff --git a/examples/generic-camera-psram/platformio.ini b/examples/generic-camera-psram/platformio.ini
@@ -26,4 +26,4 @@ board_build.partitions = ../../config/partitions.csv
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.8
+  hpsaturn/EspNowCam@^0.2.0
diff --git a/examples/m5core2-basic-receiver/platformio.ini b/examples/m5core2-basic-receiver/platformio.ini
@@ -20,6 +20,6 @@ build_flags =
 extends = env
 board = esp32dev
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.6
+  hpsaturn/EspNowCam@^0.2.0
   m5stack/M5Unified@^0.1.6
 
diff --git a/examples/makerfabs-basic-receiver/platformio.ini b/examples/makerfabs-basic-receiver/platformio.ini
@@ -28,6 +28,6 @@ board_build.partitions = ../../config/partitions.csv
 [env:makerfabs-basic-receiver]
 extends = esp32common
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.6
+  hpsaturn/EspNowCam@^0.2.0
   lovyan03/LovyanGFX@^1.1.5
 
diff --git a/examples/tft-3.5-basic-receiver/platformio.ini b/examples/tft-3.5-basic-receiver/platformio.ini
@@ -27,6 +27,6 @@ board_build.partitions = ../../config/partitions.csv
 [env:tft-hvga-basic-receiver]
 extends = esp32common
 lib_deps = 
-  hpsaturn/EspNowCam@^0.1.6
+  hpsaturn/EspNowCam@^0.2.0
   lovyan03/LovyanGFX@^1.1.5
 
diff --git a/examples/wifiraw-80211tx-freenove-sender/wifiraw-80211tx-freenove-sender.cpp b/examples/wifiraw-80211tx-freenove-sender/wifiraw-80211tx-freenove-sender.cpp
@@ -45,7 +45,7 @@ void setup() {
   radio.setTarget(macRecv);
   radio.setChannel(6);
 
-  if (radio.init(512)) {  // chunk size in bytes (beta feature)
+  if (radio.init(960)) {  // chunk size in bytes (beta feature)
     Serial.println("ESPNowCam Init Success");
   }
 
diff --git a/examples/wifiraw-80211tx-m5cores3-sender/wifiraw-80211tx-m5cores3-sender.cpp b/examples/wifiraw-80211tx-m5cores3-sender/wifiraw-80211tx-m5cores3-sender.cpp
@@ -0,0 +1,87 @@
+/**************************************************
+ * ESPNowCam video Transmitter
+ * by @hpsaturn Copyright (C) 2024
+ * This file is part ESPNowCam project:
+ * https://github.com/hpsaturn/ESPNowCam
+**************************************************/
+
+#include <M5CoreS3.h>
+#include "esp_camera.h"
+#include "ESPNowCam.h"
+#include "Utils.h"
+
+WiFiRawComm wifiRaw;
+ESPNowCam radio(&wifiRaw);
+// ESPNowCam radio;
+
+int32_t dw, dh;
+
+static void drawFPS() {
+  static uint_least64_t timeStamp = 0;
+  frame++;
+  if (millis() - timeStamp > 1000) {
+    timeStamp = millis();
+    char bf [10];
+    sprintf(bf,"FPS: %i",frame);
+    CoreS3.Display.clear();
+    CoreS3.Display.drawString(String(bf), dw / 2, dh / 2);
+    // Serial.printf("%s %2d FPS\r\n",msg, frame);
+    frame = 0;
+  } 
+}
+
+void processFrame() {
+  if (CoreS3.Camera.get()) {
+    // CoreS3.Display.pushImage(0, 0, dw, dh, (uint16_t *)CoreS3.Camera.fb->buf);
+    uint8_t *out_jpg = NULL;
+    size_t out_jpg_len = 0;
+    frame2jpg(CoreS3.Camera.fb, 12, &out_jpg, &out_jpg_len);
+    radio.sendData(out_jpg, out_jpg_len);
+    printFPS("CAM:");
+    free(out_jpg);
+    CoreS3.Camera.free();
+  }
+}
+
+void setup() {
+  Serial.begin(115200);
+
+  auto cfg = M5.config();
+  CoreS3.begin(cfg);
+  CoreS3.Display.setTextColor(GREEN);
+  CoreS3.Display.setTextDatum(middle_center);
+  CoreS3.Display.setFont(&fonts::Orbitron_Light_24);
+  CoreS3.Display.setTextSize(1);
+
+  if(psramFound()){
+    size_t psram_size = esp_spiram_get_size() / 1048576;
+    Serial.printf("PSRAM size: %dMb\r\n", psram_size);
+  }
+
+  const uint8_t macRecv[6] = {0xB8,0xF0,0x09,0xC6,0x0E,0xCC};
+  radio.setTarget(macRecv);
+  radio.setChannel(6);
+  
+  if (radio.init(960)) {  // chunk size in bytes (beta feature)
+    Serial.println("ESPNowCam Init Success");
+  }
+
+  dw = CoreS3.Display.width();
+  dh = CoreS3.Display.height();
+
+  if (!CoreS3.Camera.begin()) {
+    CoreS3.Display.drawString("Camera Init Fail", dw / 2, dh / 2);
+  }
+  CoreS3.Display.drawString("Camera Init Success", dw / 2, dh / 2);
+
+  // CoreS3.Camera.config->fb_count = 2;
+  // CoreS3.Camera.config->fb_location = CAMERA_FB_IN_DRAM;
+  // CoreS3.Camera.config->pixel_format = PIXFORMAT_GRAYSCALE;
+  CoreS3.Camera.sensor->set_framesize(CoreS3.Camera.sensor, FRAMESIZE_QVGA);
+
+  delay(100);
+}
+
+void loop() {
+  processFrame();
+}
diff --git a/examples/wifiraw-80211tx-receiver/wifiraw-80211tx-receiver.cpp b/examples/wifiraw-80211tx-receiver/wifiraw-80211tx-receiver.cpp
@@ -17,6 +17,7 @@
 
 WiFiRawComm wifiRaw;
 ESPNowCam radio(&wifiRaw);
+// ESPNowCam radio;
 
 uint8_t *fb;    // frame buffer
 int32_t dw, dh; // display width and height
@@ -34,7 +35,7 @@ void setup() {
 
   auto cfg = M5.config();
   M5.begin(cfg);
-  M5.Display.setBrightness(100);
+  M5.Display.setBrightness(250);
   dw=M5.Display.width();
   dh=M5.Display.height();
 
@@ -49,7 +50,7 @@ void setup() {
   radio.setRecvCallback(onDataReady);
   radio.setChannel(6);
 
-  if (radio.init(512)) {  // chunk size in bytes (beta feature)
+  if (radio.init(960)) {  // chunk size in bytes (beta feature)
     M5.Display.drawString("ESPNowCam Init Success", dw / 2, dh / 2);
     Serial.println("ESPNowCam Init Success");
   } 
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "EspNowCam",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "homepage":"https://github.com/hpsaturn/esp32s3-cam",
   "keywords": 
   [ 
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=EspNowCam
-version=0.2.0
+version=0.2.1
 author=@hpsaturn
 maintainer=Antonio Vanegas <hpsaturn@gmail.com>
 sentence=ESPNowCam, a straightforward video streamer for popular ESP32Cam models, leveraging the ESPNow protocol. No need for IPs, routers, or credentials—keeping it simple! :D
diff --git a/platformio.ini b/platformio.ini
@@ -231,10 +231,15 @@ lib_deps =
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; Freenove S3 camera example using WiFi raw 802.11 tx instead of ESP-NOW.
-[env:wifiraw-80211tx-sender]
+[env:wifiraw-80211tx-freenove-sender]
 extends = esp32common
 board_build.arduino.memory_type = dio_opi ;
-build_src_filter = -<*> +<common/> +<wifiraw-80211tx-sender/>
+build_src_filter = -<*> +<common/> +<wifiraw-80211tx-freenove-sender/>
+
+; M5CoreS3 camera example using WiFi raw 802.11 tx instead of ESP-NOW.
+[env:wifiraw-80211tx-m5cores3-sender]
+extends = m5cores3_common
+build_src_filter = -<*> +<common/> +<wifiraw-80211tx-m5cores3-sender/>
 
 ; M5Core2 receiver example using WiFi raw 802.11 tx instead of ESP-NOW.
 [env:wifiraw-80211tx-receiver]
diff --git a/src/CommInterface.h b/src/CommInterface.h
@@ -13,7 +13,7 @@
 
 // Maximum data length (can be overridden by implementations)
 #ifndef COMM_MAX_DATA_LEN
-#define COMM_MAX_DATA_LEN 640
+#define COMM_MAX_DATA_LEN 1024
 #endif
 
 // Simple error type for abstraction
diff --git a/src/ESPNowCam.cpp b/src/ESPNowCam.cpp
@@ -18,14 +18,14 @@ static ESPNowComm defaultESPNow;
 ************************************/
 uint16_t chunksize = 244;
 uint8_t send_buffer[COMM_MAX_DATA_LEN - 8];
-uint16_t chunk_size_left = chunksize;
-uint16_t chunk_pos = 0;
+uint32_t chunk_size_left = chunksize;
+uint32_t chunk_pos = 0;
 uint8_t *outdata = NULL;
-size_t outdata_len = 0;
+uint32_t outdata_len = 0;
 bool msgReady = false;
 
 bool sendMessage(uint32_t msglen, const uint8_t *mac, CommInterface* comm);
-size_t encodeMsg(Frame msg);
+uint32_t encodeMsg(Frame msg);
 
 bool encode_uint8_array(pb_ostream_t *stream, const pb_field_t *field, void *const *arg) {
   if (!pb_encode_tag_for_field(stream, field))
@@ -51,12 +51,14 @@ ESPNowCam::~ESPNowCam() {
 }
 
 bool ESPNowCam::sendData(uint8_t *data, uint32_t lenght) {
+  log_v("sending data (size: %i)", lenght);
   outdata = data;
   outdata_len = lenght;
 
   uint32_t frame_left = outdata_len;
   Frame msg = Frame_init_zero;
   while (frame_left > 0) {
+    log_v("frame_left: %i)", frame_left);
     if (frame_left <= chunk_size_left) {
       chunk_size_left = frame_left;
       msg.lenght = outdata_len;
@@ -78,11 +80,11 @@ bool ESPNowCam::sendData(uint8_t *data, uint32_t lenght) {
   return true;
 }
 
-size_t encodeMsg(Frame msg) {
+uint32_t encodeMsg(Frame msg) {
   pb_ostream_t stream = pb_ostream_from_buffer(send_buffer, sizeof(send_buffer));
   
   bool status = pb_encode(&stream, Frame_fields, &msg);
-  size_t message_length = stream.bytes_written;
+  uint32_t message_length = stream.bytes_written;
   if (!status) {
     printf("Encoding failed: %s\r\n", PB_GET_ERROR(&stream));
     return 0;
diff --git a/src/ESPNowCam.h b/src/ESPNowCam.h
@@ -24,8 +24,8 @@ extern "C" {
 typedef void (*RecvCb)(uint32_t lenght);
 }
 
-#define ENC_VERSION "0.2.0"
-#define ENC_REVISION 083
+#define ENC_VERSION "0.2.1"
+#define ENC_REVISION 084
 
 // Maximum data length (can be overridden by implementations)
 #ifndef COMM_MAX_DATA_LEN
diff --git a/src/frame.pb.h b/src/frame.pb.h
@@ -11,7 +11,7 @@
 
 /* Struct definitions */
 typedef struct _Frame {
-    uint16_t lenght;
+    uint32_t lenght;
     pb_callback_t data;
 } Frame;
 
diff --git a/src/frame.proto b/src/frame.proto
@@ -3,6 +3,6 @@ syntax = "proto2";
 import "nanopb.proto";
 
 message Frame {
-  required uint32 lenght = 1 [(nanopb).int_size = IS_16];
+  required uint32 lenght = 1 [(nanopb).int_size = IS_32];
   repeated bytes data = 2 [(nanopb).int_size = IS_8];
 }
