v10.8.4

Author: s60sc

ESP32-CAM_MJPEG2SD.ino

@@ -10,8 +10,6 @@
 void setup() {
   logSetup();
   LOG_INF("Selected board %s", CAM_BOARD);
-  
-  if (!DBG_ON) esp_log_level_set("*", ESP_LOG_ERROR); // show ESP_LOG_ERROR messages during init
   // prep storage
   if (startStorage()) {
     // Load saved user configuration
@@ -34,11 +32,7 @@ void setup() {
 
   // connect network (WiFi or Ethernet per config)
   startNetwork();
-  startWebServer();
-
-  if (!DBG_ON) esp_log_level_set("*", ESP_LOG_NONE); // suppress ESP_LOG_ERROR messages
-  if (strlen(startupFailure)) LOG_WRN("%s", startupFailure);
-  else {
+  if (startWebServer()) {
     // start rest of services
 #ifndef AUXILIARY
     startSustainTasks(); 
@@ -65,7 +59,7 @@ void setup() {
     prepTelegram();
 #endif
 #if INCLUDE_I2C
-  prepI2C();
+    prepI2C();
   #if INCLUDE_TELEM
     prepTelemetry();
   #endif
@@ -77,10 +71,10 @@ void setup() {
  #if INCLUDE_RTSP
     prepRTSP();
  #endif
- if (!prepRecording()) {
-   snprintf(startupFailure, SF_LEN, STARTUP_FAIL "Insufficient memory, remove optional features");
-   LOG_WRN("%s", startupFailure);
- }
+    if (!prepRecording()) {
+      snprintf(startupFailure, SF_LEN, STARTUP_FAIL "Insufficient memory, remove optional features");
+      LOG_WRN("%s", startupFailure);
+    }
 #endif
     checkMemory();
   }

README.md

@@ -29,7 +29,7 @@ The ESP32 cannot support all of the features as it will run out of heap space. F
 ***This is a complex app and some users are raising issues when the app reports a warning, but this is the app notifying the user that there is an problem with their setup, which only the user can fix. Be aware that some clone boards have different specs to the original, eg PSRAM size. Please only raise issues for actual bugs (ERR messages, unhandled library error or crash). Thanks.  
 To suggest an improvement or enhancement use Discussions.*** 
 
-Changes for version 10.8.3:
+Changes for version 10.8.4:
 * Addition of [Ethernet](#configuration-web-page) network selection instead of Wifi
 * Pins added for [`CAMERA_MODEL_Waveshare_ESP32_S3_ETH`](https://www.waveshare.com/wiki/ESP32-S3-ETH)
 * Define pins for external W5500 Ethernet controller

appGlobals.h

@@ -74,6 +74,7 @@
 #define INCLUDE_MCPWM false   // mcpwm.cpp (BDC motor control). Needs INCLUDE_PERIPH true
 #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_NEW_JPG false // true to use esp_new_jpg library, which must be installed first. Faster but uses more memory
 #define INCLUDE_I2C false     // periphsI2C.cpp (support for I2C peripherals)
 
 // if INCLUDE_I2C true, set each I2C device used to true 
@@ -121,7 +122,7 @@
 #define DOT_MAX 50
 #define HOSTNAME_GRP 99
 
-#define APP_VER "10.8.3"
+#define APP_VER "10.8.4"
 
 #if defined(AUXILIARY)
 #define APP_NAME "ESP-CAM_AUX" // max 15 chars
@@ -162,7 +163,7 @@
 #define ISCAM // cam specific code in generic cpp files
 
 // to determine if newer data files need to be loaded
-#define CFG_VER 33
+#define CFG_VER 34
 
 #define AVI_EXT "avi"
 #define CSV_EXT "csv"
@@ -412,7 +413,6 @@ extern bool relayMode;
 // sensors 
 extern int pirPin; // if usePir is true
 extern int lampPin; // if useLamp is true
-extern int wakePin; // if wakeUse is true
 extern int lightsPin;
 extern bool teleUse;
 extern int srtInterval;
@@ -552,22 +552,22 @@ struct frameStruct {
 // and update corresponding frameSizeData[] entries in avi.cpp 
 // https://github.com/espressif/esp32-camera/blob/master/driver/include/sensor.h
 const frameStruct frameData[] = {
-  {"96X96", 96, 96, 30, 1, 1},   // 2MP sensors // PY260
+  {"96X96", 96, 96, 30, 1, 1},     // 2MP sensors // PY260
   {"QQVGA", 160, 120, 30, 1, 1},
   {"128X128", 128, 128, 30, 1, 1}, // PY260
   {"QCIF", 176, 144, 30, 1, 1}, 
   {"HQVGA", 240, 176, 30, 2, 1}, 
   {"240X240", 240, 240, 30, 2, 1}, 
-  {"QVGA", 320, 240, 30, 2, 1},  // PY260
-  {"320X320", 320, 320, 30, 2, 1}, // PY260
+  {"QVGA", 320, 240, 30, 2, 1},    // PY260
+  {"320X320", 320, 320, 30, 2, 1}, // PY260 only
   {"CIF", 400, 296, 30, 2, 1},  
   {"HVGA", 480, 320, 30, 2, 1}, 
-  {"VGA", 640, 480, 20, 3, 1},  // PY260
+  {"VGA", 640, 480, 20, 3, 1},     // PY260
   {"SVGA", 800, 600, 20, 3, 1}, 
   {"XGA", 1024, 768, 5, 3, 1},   
-  {"HD", 1280, 720, 5, 3, 1}, // PY260
+  {"HD", 1280, 720, 5, 3, 1},      // PY260
   {"SXGA", 1280, 1024, 5, 3, 1}, 
-  {"UXGA", 1600, 1200, 5, 4, 1},  // PY260
+  {"UXGA", 1600, 1200, 5, 4, 1},   // PY260
   {"FHD", 1920, 1080, 5, 3, 1},    // 3MP Sensors only // PY260
   {"P_HD", 720, 1280, 5, 3, 1},    //
   {"P_3MP", 864, 1536, 5, 3, 1},   //
@@ -576,5 +576,5 @@ const frameStruct frameData[] = {
   {"WQXGA", 2560, 1600, 5, 4, 1},  //
   {"P_FHD", 1080, 1920, 5, 4, 1},  //
   {"QSXGA", 2560, 1920, 4, 4, 1},  //
-  {"5MP", 2592, 1944, 4, 4, 1}     // PY260
+  {"5MP", 2592, 1944, 4, 4, 1}     // PY260 only
 };

appSpecific.cpp

@@ -158,6 +158,7 @@ bool updateAppStatus(const char* variable, const char* value, bool fromUser) {
   else if (!strcmp(variable, "teleInterval")) srtInterval = intVal;
   else if (!strcmp(variable, "wakeUse")) wakeUse = (bool)intVal;
   else if (!strcmp(variable, "wakePin")) wakePin = intVal;
+  else if (!strcmp(variable, "wakeLevel")) wakeLevel = intVal;
 #if INCLUDE_MCPWM
   else if (!strcmp(variable, "motorRevPin")) motorRevPin = intVal;
   else if (!strcmp(variable, "motorFwdPin")) motorFwdPin = intVal;
@@ -699,7 +700,7 @@ void doAppPing() {
 #ifndef AUXILIARY
       digitalWrite(PWDN_GPIO_NUM, 1); // power down camera
 #endif
-      goToSleep(wakePin, true);
+      goToSleep(true);
     }
 #if INCLUDE_PERIPH
     if (relayPin && relayMode && !atNight) {
@@ -940,7 +941,8 @@ voltLow~3~3~N~Warning level for low voltage
 voltInterval~5~3~N~Voltage check interval (mins)
 voltPin~~3~N~ADC Pin used for battery voltage
 voltUse~0~3~C~Use Voltage check
-wakePin~~3~N~Pin used for to wake app from sleep
+wakePin~~3~N~Pin used to wake app from sleep
+wakeLevel~1~3~N~Pin level (0,1) to wake app from sleep
 wakeUse~0~3~C~Deep sleep app during night
 mqtt_active~0~2~C~Mqtt enabled
 mqtt_broker~~2~T~Mqtt server ip to connect

globals.h

@@ -152,7 +152,7 @@ size_t getFreeStorage();
 uint32_t getFrequency();
 bool getLocalNTP();
 float getNTCcelsius(uint16_t resistance, float oldTemp);
-void goToSleep(int wakeupPin, bool deepSleep);
+void goToSleep(bool deepSleep);
 bool handleWebDav(httpd_req_t* rreq);
 void initStatus(int cfgGroup, int delayVal);
 void killSocket(int skt = -99);
@@ -198,8 +198,7 @@ float smoothSensor(float latestVal, float smoothedVal, float alpha);
 void startOTAtask();
 void startSecTimer(bool startTimer);
 bool startStorage();
-void startWebServer();
-bool startWifi(bool firstcall = true);
+bool startWebServer();
 void stopPing();
 void syncToBrowser(uint32_t browserUTC);
 bool updateConfigVect(const char* variable, const char* value);
@@ -347,6 +346,8 @@ extern const char* failPageE_html;
 extern char startupFailure[];
 extern time_t currEpoch;
 extern bool RCactive;
+extern int wakePin;
+extern int wakeLevel;
 
 extern UBaseType_t uxHighWaterMarkArr[];