v10.5.4

Author: s60sc

ESP32-CAM_MJPEG2SD.ino

@@ -61,9 +61,6 @@ void setup() {
 #if INCLUDE_TGRAM
     prepTelegram();
 #endif
-#ifndef AUXILIARY
-    prepRecording(); 
-#endif
 #if INCLUDE_I2C
   prepI2C();
   #if INCLUDE_TELEM
@@ -73,8 +70,11 @@ void setup() {
 #if INCLUDE_PERIPH
     startHeartbeat();
 #endif
-#if INCLUDE_RTSP
+#ifndef AUXILIARY
+    prepRecording(); 
+ #if INCLUDE_RTSP
     prepRTSP();
+ #endif
 #endif
     checkMemory();
   } 

README.md

@@ -3,11 +3,11 @@
 
 Application for ESP32 / ESP32S3 with OV2640 / OV5640 camera to record JPEGs to SD card as AVI files and playback to browser as an MJPEG stream. The AVI format allows recordings to replay at correct frame rate on media players. If a microphone is installed then a WAV file is also created and stored in the AVI file.  
 The application supports:
-* [RTSP Server](#rtsp) stream Video, Audio and Subtitles
 * [Motion detection by camera](#motion-detection-by-camera) or PIR / radar sensor
 * Time lapse recording
 * [Audio Recording](#audio-recording) from I2S or PDM microphones
 * Camera pan / tilt servos and lamp control
+* [RTSP Server](#rtsp) stream Video, Audio and Subtitles
 * [Telemetry Recording](#telemetry-recording) during camera recording.
 * [Remote Control](#remote-control) of camera mounted vehicle.
 * Alert notification using [Telegram](#telegram-bot) or Email
@@ -30,11 +30,11 @@ To suggest an improvement or enhancement use Discussions.***
 
 Changes up to version 10.5.4:
 * Stream to [NVR](#stream-to-nvr) using integration to RTSPServer library contributed by [@rjsachse](https://github.com/rjsachse). 
-* RTSP server now has multiple client support as well as user/pass authentication.
 * Frame resolution selection mismatch corrected due to [#10801](https://github.com/espressif/arduino-esp32/issues/10801) in arduino core v3.1.0
 * SD card 4 bit mode configurable (see `utilsFS.cpp`)
 * Shared I2C fixed following code changes in Arduino core v3.1.1
 * 24Mhz camera clock available for faster frame rate on ESP32S3, contributed by [@josef2600](https://github.com/josef2600).
+* RTSP server now has multiple client support as well as user/pass authentication.
 
 ## Purpose
 

appGlobals.h

@@ -62,7 +62,7 @@
 #define INCLUDE_EXTHB false   // externalHeartbeat.cpp (heartbeat to remote server)
 #define INCLUDE_PGRAM false   // photogram.cpp (photogrammetry feature). Needs INCLUDE_PERIPH true
 #define INCLUDE_MCPWM false   // mcpwm.cpp (BDC motor control). Needs INCLUDE_PERIPH true
-#define INCLUDE_RTSP false    // rtsp.cpp (RTSP Streaming). Requires additional library: Latest ESP32-RTSPServer (https://github.com/rjsachse/ESP32-RTSPServer)
+#define INCLUDE_RTSP false    // rtsp.cpp (RTSP Streaming). Requires additional library: ESP32-RTSPServer
 #define INCLUDE_DS18B20 false // if true, requires INCLUDE_PERIPH and additional libraries: OneWire and DallasTemperature
 #define INCLUDE_I2C false     // periphsI2C.cpp (support for I2C peripherals)
 
@@ -282,6 +282,7 @@ bool setOutputPeripheral(uint8_t cmd, uint32_t rxValue);
 void setSteering(int steerVal);
 void setStepperPin(uint8_t pinNum, uint8_t pinPos);
 void setStickTimer(bool restartTimer, uint32_t interval = 0);
+bool shareI2C(int sdaShare, int sclShare);
 void startAudioRecord();
 void startHeartbeat();
 void startSustainTasks();

appSpecific.cpp

@@ -228,6 +228,7 @@ bool updateAppStatus(const char* variable, const char* value, bool fromUser) {
   else if (!strcmp(variable, "uartTxdPin")) uartTxdPin = intVal;
   else if (!strcmp(variable, "uartRxdPin")) uartRxdPin = intVal;
 #endif
+
 #ifndef AUXILIARY
   // camera settings
   else if (!strcmp(variable, "xclkMhz")) xclkMhz = intVal;

mjpeg2sd.cpp

@@ -35,6 +35,8 @@ uint8_t xclkMhz = 20; // camera clock rate MHz
 bool doKeepFrame = false;
 static bool haveSrt = false;
 char camModel[10];
+static int siodGpio = SIOD_GPIO_NUM;
+static int siocGpio = SIOC_GPIO_NUM;
 
 // header and reporting info
 static uint32_t vidSize; // total video size
@@ -841,7 +843,7 @@ static esp_err_t changeXCLK(camera_config_t config) {
     .speed_mode = LEDC_LOW_SPEED_MODE,
     .duty_resolution = LEDC_TIMER_1_BIT,
     .timer_num = config.ledc_timer,
-    .freq_hz = (uint32_t)config.xclk_freq_hz, // Fix arduino  warning: narrowing conversion from 'int' to 'uint32_t'
+    .freq_hz = (uint32_t)config.xclk_freq_hz,
     .clk_cfg = LEDC_AUTO_CLK
   };
   res = ledc_timer_config(&ledc_timer);
@@ -873,7 +875,14 @@ bool prepCam() {
   if (FRAMESIZE_INVALID != sizeof(frameData) / sizeof(frameData[0])) 
     LOG_ERR("framesize_t entries %d != frameData entries %d", FRAMESIZE_INVALID, sizeof(frameData) / sizeof(frameData[0]));
   if (!camPower()) return false;
-  
+#if INCLUDE_I2C
+  if (shareI2C(SIOD_GPIO_NUM, SIOC_GPIO_NUM)) { 
+    // if shared, set camera to use shared
+    siodGpio = -1;
+    siocGpio = -1;
+  }
+#endif
+
   bool res = false;
   // buffer sizing depends on psram size (4M or 8M)
   // FRAMESIZE_QSXGA = 1MB, FRAMESIZE_UXGA = 375KB (as JPEG)
@@ -894,8 +903,8 @@ bool prepCam() {
   config.pin_pclk = PCLK_GPIO_NUM;
   config.pin_vsync = VSYNC_GPIO_NUM;
   config.pin_href = HREF_GPIO_NUM;
-  config.pin_sccb_sda = SIOD_GPIO_NUM;
-  config.pin_sccb_scl = SIOC_GPIO_NUM;
+  config.pin_sccb_sda = siodGpio;
+  config.pin_sccb_scl = siocGpio;
   config.pin_pwdn = PWDN_GPIO_NUM;
   config.pin_reset = RESET_GPIO_NUM;
   config.xclk_freq_hz = xclkMhz * OneMHz;
@@ -906,7 +915,7 @@ bool prepCam() {
   config.frame_size = maxFS;
   config.jpeg_quality = 10;
   config.fb_count = FB_CNT;
-  config.sccb_i2c_port = 0;// using I2C 0. to be sure what port we are using. it can be changed.
+  config.sccb_i2c_port = 0;// using I2C 0. to be sure what port we are using.
 
 #if defined(CAMERA_MODEL_ESP_EYE)
   pinMode(13, INPUT_PULLUP);
@@ -921,14 +930,14 @@ bool prepCam() {
     if (err == ESP_OK) err = changeXCLK(config);
     if (err != ESP_OK) {
       // power cycle the camera, provided pin is connected
-      #if (defined(PWDN_GPIO_NUM)) && (PWDN_GPIO_NUM > -1) // both ckecks are needed. if we send -1 to digitalWrite, it can cause crashe or errors.
-        digitalWrite(PWDN_GPIO_NUM, 1);
-        delay(100);
-        digitalWrite(PWDN_GPIO_NUM, 0); 
-        delay(100);
-      #else
-        delay(200);
-      #endif
+#if (defined(PWDN_GPIO_NUM)) && (PWDN_GPIO_NUM > -1) // both ckecks are needed. if send -1 to digitalWrite, it can cause crash.
+      digitalWrite(PWDN_GPIO_NUM, 1);
+      delay(100);
+      digitalWrite(PWDN_GPIO_NUM, 0); 
+      delay(100);
+#else
+      delay(200);
+#endif
       retries--;
     }
   } 

motionDetect.cpp

@@ -184,7 +184,7 @@ bool checkMotion(camera_fb_t* fb, bool motionStatus, bool lightLevelOnly) {
     if (fsizePtr > 16) {
       LOG_WRN("Frame size %s too large for processing", frameData[fsizePtr].frameSizeStr);
       useMotion = false;
-    } else LOG_WRN("jpg2rgb() failure");
+    }
     return motionStatus;
   }
   LOG_VRB("JPEG to rescaled %s bitmap conversion %u bytes in %lums", colorDepth == RGB888_BYTES ? "color" : "grayscale", sampleWidth * sampleHeight * colorDepth, millis() - dTime);
@@ -377,5 +377,6 @@ static bool jpg2rgb(const uint8_t* src, size_t src_len, uint8_t* out, jpg_scale_
   jpeg.output = out; 
   jpeg.data_offset = 0;
   esp_err_t res = esp_jpg_decode(src_len, scale, _jpg_read, _rgb_write, (void*)&jpeg);
+  if (res != ESP_OK) LOG_WRN("jpg2rgb failure: %s", espErrMsg(res)); 
   return (res == ESP_OK) ? true : false;
 }

periphsI2C.cpp

@@ -28,6 +28,7 @@ int I2Csda = -1;
 int I2Cscl = -1;
 static byte I2CDATA[10]; // store I2C data received or to be sent 
 static int I2Cdevices = -1;
+static bool isShared = false;
 
 // I2C device names, indexed by address
 static bool deviceStatus[128] = {false}; // whether device present
@@ -101,20 +102,33 @@ static bool sendI2Cdata(int clientAddr, uint8_t controlByte, uint8_t numBytes) {
   return sendTransmission(clientAddr, false);
 }
 
+bool shareI2C(int sdaShare, int sclShare) {
+  // apply given pins if bus to be shared 
+// await cam lib fix
+//  if (I2Csda < 0) { 
+//    // I2C bus shared with another peripheral, eg camera
+//    I2Csda = sdaShare;
+//    I2Cscl = sclShare;
+//    isShared = true;
+//    Wire.begin(I2Csda, I2Cscl); // Join I2C bus as master
+//    LOG_INF("I2C bus shared with camera");
+//  }
+  return isShared;
+}
+
 bool prepI2C() {
-  // start I2C port and prep I2C peripherals
-  if (I2Csda < 0) { 
-    // I2C bus shared with camera
-    I2Csda = SIOD_GPIO_NUM;
-    I2Cscl = SIOC_GPIO_NUM;
-    LOG_INF("I2C bus shared with camera");
-  } else if (I2Csda == I2Cscl) {
-    LOG_ALT("I2C pins not defined");
+  // start I2C port if not shared then prep I2C peripherals
+  if (I2Csda == I2Cscl) {
+    LOG_ALT("I2C pins not defined: %d", I2Csda);
     return false;
   } 
-  Wire.begin(I2Csda, I2Cscl); // Join I2C bus as master
-  //Wire.setClock(400000); // default 100kHz, max 400kHz
-  LOG_INF("I2C initialised at %dkHz using pins SDA: %d, SCL: %d", Wire.getClock() / 1000, I2Csda, I2Cscl);
+  // start I2C
+  if (!isShared) {
+    Wire.begin(I2Csda, I2Cscl); // Join I2C bus as master
+    //Wire.setClock(400000); // default 100kHz, max 400kHz
+  }
+  LOG_INF("%sI2C initialised at %dkHz using pins SDA: %d, SCL: %d", isShared ? "Shared " : "", Wire.getClock() / 1000, I2Csda, I2Cscl);
+
   I2Cdevices = 0;
   scanI2C();
   return prepI2Cdevices();