v1.8

Author: s60sc

appGlobals.h

@@ -29,16 +29,15 @@
 /*********************** Fixed defines leave as is ***********************/ 
 /** Do not change anything below here unless you know what you are doing **/
 
-//#define DEV_ONLY // leave commented out
-#define STATIC_IP_OCTAL "162" // dev only
+#define STATIC_IP_OCTAL "163" // dev only
 #define DEBUG_MEM false // leave as false
 #define FLUSH_DELAY 0 // for debugging crashes
 #define DBG_ON false // esp debug output
 #define DOT_MAX 50
 #define HOSTNAME_GRP 0
 
 #define APP_NAME "ESP-TuyaDevice" // max 15 chars
-#define APP_VER "1.7"
+#define APP_VER "1.8"
 
 #define HTTP_CLIENTS 2 // http, ws
 #define MAX_STREAMS 0
@@ -103,7 +102,6 @@
 #define LOG_PRI 1
 #define UART_PRI 1
 #define BATT_PRI 1
-#define IDLEMON_PRI 5
 
 #define UART_RTS UART_PIN_NO_CHANGE
 #define UART_CTS UART_PIN_NO_CHANGE

globals.h

@@ -4,13 +4,17 @@
 
 #include "esp_arduino_version.h"
 
-#if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 3)
-#error Must be compiled with arduino-esp32 core v3.0.3 or higher
+#if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 1, 1)
+#error Must be compiled with arduino-esp32 core v3.1.1 or higher
 #endif
 
 #pragma once
+
+//#define DEV_ONLY // leave commented out
+#ifdef DEV_ONLY
 // to compile with -Wall -Werror=all -Wextra
-//#pragma GCC diagnostic error "-Wformat=2"
+#pragma GCC diagnostic error "-Wformat=2"
+#pragma GCC diagnostic ignored "-Wformat-truncation"
 #pragma GCC diagnostic ignored "-Wformat-y2k"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@@ -19,6 +23,7 @@
 //#pragma GCC diagnostic ignored "-Wignored-qualifiers"
 //#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wvolatile"
+#endif
 
 /******************** Libraries *******************/
 
@@ -29,7 +34,7 @@
 #include "ping/ping_sock.h"
 #include <Preferences.h>
 #include <regex>
-#if !CONFIG_IDF_TARGET_ESP32C3
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
 #include <SD_MMC.h>
 #endif
 #include <LittleFS.h>
@@ -131,11 +136,13 @@ char* fmtSize (uint64_t sizeVal);
 void forceCrash();
 void formatElapsedTime(char* timeStr, uint32_t timeVal, bool noDays = false);
 void formatHex(const char* inData, size_t inLen);
+bool formatSDcard();
 bool fsStartTransfer(const char* fileFolder);
 const char* getEncType(int ssidIndex);
 void getExtIP();
 time_t getEpoch();
 size_t getFreeStorage();
+uint32_t getFrequency();
 bool getLocalNTP();
 float getNTCcelsius(uint16_t resistance, float oldTemp);
 void goToSleep(int wakeupPin, bool deepSleep);
@@ -150,6 +157,7 @@ void logPrint(const char *fmtStr, ...);
 void logSetup();
 void OTAprereq();
 bool parseJson(int rxSize);
+bool prepFreq(int maxFreq, int sampleInterval);
 bool prepI2C();
 void prepPeripherals();
 void prepSMTP();

prefs.cpp

@@ -191,6 +191,9 @@ static bool savePrefs(bool retain = true) {
 #endif
 #if INCLUDE_MQTT
   prefs.putString("mqtt_user_Pass", mqtt_user_Pass);
+#endif
+#if INCLUDE_RTSP
+  prefs.putString("RTSP_Pass", RTSP_Pass);
 #endif
   prefs.end();
   LOG_INF("Saved preferences");
@@ -221,6 +224,9 @@ static bool loadPrefs() {
 #endif
 #if INCLUDE_MQTT
   prefs.getString("mqtt_user_Pass", mqtt_user_Pass, MAX_PWD_LEN);
+#endif
+#if INCLUDE_RTSP
+  prefs.getString("RTSP_Pass", RTSP_Pass, MAX_PWD_LEN);
 #endif
   prefs.end();
   return true;
@@ -314,7 +320,20 @@ void updateStatus(const char* variable, const char* _value, bool fromUser) {
   else if (!strcmp(variable, "mqtt_user_Pass") && value[0] != '*') strncpy(mqtt_user_Pass, value, MAX_PWD_LEN-1);
   else if (!strcmp(variable, "mqtt_topic_prefix")) strncpy(mqtt_topic_prefix, value, (FILE_NAME_LEN/2)-1);
 #endif
-
+#if INCLUDE_RTSP
+  else if (!strcmp(variable, "RTSP_Name")) strncpy(RTSP_Name, value, MAX_HOST_LEN-1);
+  else if (!strcmp(variable, "RTSP_Pass")  && value[0] != '*')strncpy(RTSP_Pass, value, MAX_PWD_LEN-1);
+  else if (!strcmp(variable, "rtsp00Video")) rtspVideo = streamVid = (bool)intVal;
+  else if (!strcmp(variable, "rtsp01Audio")) rtspAudio = streamAud = (bool)intVal;
+  else if (!strcmp(variable, "rtsp02Subtitles")) rtspSubtitles = streamSrt = (bool)intVal;
+  else if (!strcmp(variable, "rtsp03Port")) rtspPort = intVal;
+  else if (!strcmp(variable, "rtsp04VideoPort")) rtpVideoPort = intVal;
+  else if (!strcmp(variable, "rtsp05AudioPort")) rtpAudioPort = intVal;
+  else if (!strcmp(variable, "rtsp06SubtitlesPort")) rtpSubtitlesPort = intVal;
+  else if (!strcmp(variable, "rtsp07Ip")) strncpy(RTP_ip, value, MAX_IP_LEN-1);
+  else if (!strcmp(variable, "rtsp08MaxC")) rtspMaxClients = intVal;
+  else if (!strcmp(variable, "rtsp09TTL")) rtpTTL = intVal;
+#endif
   // Other settings
   else if (!strcmp(variable, "clockUTC")) syncToBrowser((uint32_t)intVal);      
   else if (!strcmp(variable, "timezone")) strncpy(timezone, value, FILE_NAME_LEN-1);
@@ -359,7 +378,7 @@ void updateStatus(const char* variable, const char* _value, bool fromUser) {
   } else {
     res = updateAppStatus(variable, value, fromUser);
     if (!res) {
-      if (fromUser) LOG_WRN("Trying to config %s but feature not included", variable);
+      if (fromUser) LOG_WRN("Unable to config %s as required cpp file not included", variable);
       else LOG_VRB("Unrecognised config: %s", variable);
     }
   }
@@ -410,6 +429,9 @@ void buildJsonString(uint8_t filter) {
 #endif
 #if INCLUDE_MQTT
       p += sprintf(p, "\"mqtt_user_Pass\":\"%.*s\",", strlen(mqtt_user_Pass), FILLSTAR);
+#endif
+#if INCLUDE_RTSP
+      p += sprintf(p, "\"RTSP_Pass\":\"%.*s\",", strlen(RTSP_Pass), FILLSTAR);
 #endif
     }
   } else {

setupAssist.cpp

@@ -69,7 +69,7 @@ bool checkDataFiles() {
   return res;
 }
 
-/// To customise the the setupPage, use example in extras folder setupPage.html and then use cyberchef.org to convert to hex (see example in extras folder for cyberchef settings)
+// To customise the the setupPage, use example in extras folder setupPage.html and then use cyberchef.org to convert to hex (see example in extras folder for cyberchef settings)
 const uint8_t setupPage_html_gz[] PROGMEM = {
   0x1f, 0x8b, 0x08, 0x08, 0xbd, 0xf2, 0x0a, 0x67, 0x00, 0xff, 0x73, 0x65, 0x74, 0x75, 0x70, 0x50, 
   0x61, 0x67, 0x65, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0xc5, 0x38, 0xeb, 0x72, 0xdb, 0xba, 0xd1, 

utils.cpp

@@ -18,6 +18,7 @@ bool dataFilesChecked = false;
 // allow any startup failures to be reported via browser for remote devices
 char startupFailure[SF_LEN] = {0};
 size_t alertBufferSize = 0;
+size_t maxAlertBuffSize = 32 * 1024;
 byte* alertBuffer = NULL; // buffer for telegram / smtp alert image
 RTC_NOINIT_ATTR uint32_t crashLoop;
 RTC_NOINIT_ATTR char brownoutStatus;
@@ -63,6 +64,7 @@ esp_ping_handle_t pingHandle = NULL;
 bool usePing = true;
 
 static void startPing();
+static void printGpioInfo();
 
 static void setupMdnsHost() {  
   // set up MDNS service 
@@ -886,9 +888,9 @@ void logSetup() {
   boardInfo();
   LOG_INF("Compiled with arduino-esp32 v%s", ESP_ARDUINO_VERSION_STR);
   wakeupResetReason();
-  if (alertBuffer == NULL) alertBuffer = (byte*)ps_malloc(MAX_ALERT); 
+  if (alertBuffer == NULL) alertBuffer = psramFound() ? (byte*)ps_malloc(maxAlertBuffSize) : (byte*)malloc(maxAlertBuffSize); 
   if (jsonBuff == NULL) jsonBuff = psramFound() ? (char*)ps_malloc(JSON_BUFF_LEN) : (char*)malloc(JSON_BUFF_LEN); 
-  debugMemory("logSetup"); 
+  debugMemory("logSetup");
 }
 
 void formatHex(const char* inData, size_t inLen) {
@@ -967,7 +969,7 @@ static const char* getTaskStateString(eTaskState state) {
 static void statsTask(void *arg) { 
   // Output real time task stats periodically
   #define STATS_TASK_PRIO     10
-  #define STATS_INTERVAL      5000
+  #define STATS_INTERVAL      30000 // ms
   #define ARRAY_SIZE_OFFSET   40   // Increase this if ESP_ERR_INVALID_SIZE
 
   static configRUN_TIME_COUNTER_TYPE prevRunCounter = 0;
@@ -1028,14 +1030,19 @@ void runTaskStats() {
 }
 #endif
 
-void checkMemory(const char* source ) {
-  LOG_INF("%s Free: heap %u, block: %u, min: %u, pSRAM %u", source, ESP.getFreeHeap(), ESP.getMaxAllocHeap(), ESP.getMinFreeHeap(), ESP.getFreePsram());
+void checkMemory(const char* source) {
+  LOG_INF("%s Free: heap %u, block: %u, min: %u, pSRAM %u", strlen(source) ? source : "Setup", ESP.getFreeHeap(), ESP.getMaxAllocHeap(), ESP.getMinFreeHeap(), ESP.getFreePsram());
   if (ESP.getFreeHeap() < WARN_HEAP) LOG_WRN("Free heap only %u, min %u", ESP.getFreeHeap(), ESP.getMinFreeHeap());
   if (ESP.getMaxAllocHeap() < WARN_ALLOC) LOG_WRN("Max allocatable heap block is only %u", ESP.getMaxAllocHeap());
+  if (!strlen(source) && DEBUG_MEM) {
+    printGpioInfo();
+    runTaskStats();
+  }
 }
 
 uint32_t checkStackUse(TaskHandle_t thisTask, int taskIdx) {
   // get minimum free stack size for task since started
+  // taskIdx used to index minStack[] array
   static uint32_t minStack[20]; 
   uint32_t freeStack = 0;
   if (thisTask != NULL) {
@@ -1060,6 +1067,35 @@ void debugMemory(const char* caller) {
   }
 }
 
+#include "esp32-hal-periman.h"
+static void printGpioInfo() {
+  // from https://github.com/espressif/arduino-esp32/blob/master/cores/esp32/chip-debug-report.cpp
+  printf("Assigned GPIO Info:\n");
+  for (uint8_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+    if (!perimanPinIsValid(i)) continue;  //invalid pin
+    peripheral_bus_type_t type = perimanGetPinBusType(i);
+    if (type == ESP32_BUS_TYPE_INIT) continue;  //unused pin
+
+#if defined(BOARD_HAS_PIN_REMAP)
+    int dpin = gpioNumberToDigitalPin(i);
+    if (dpin < 0) continue;  //pin is not exported
+    else printf("  D%-3d|%4u : ", dpin, i);
+#else
+    printf("  %4u : ", i);
+#endif
+    const char *extra_type = perimanGetPinBusExtraType(i);
+    if (extra_type) printf("%s", extra_type);
+    else printf("%s", perimanGetTypeName(type));
+    int8_t bus_number = perimanGetPinBusNum(i);
+    if (bus_number != -1) printf("[%u]", bus_number);
+
+    int8_t bus_channel = perimanGetPinBusChannel(i);
+    if (bus_channel != -1) printf("[%u]", bus_channel);
+    printf("\n");
+  }
+  printf("\n");
+}
+
 
 /****************** send device to sleep (light or deep) & watchdog ******************/
 

utilsFS.cpp

@@ -1,14 +1,32 @@
 // General purpose SD card and flash storage utilities
 //
-// s60sc 2021, 2022 
+// Card can be accessed using a 1 data bit or 4 data bits (if allowed by board)
+// 4 data bits is potentially faster on ESP32S3 (depending on card spec) 
+// but requires 3 additional pins
+/* The following #defines must be declared under the relevant camera entry in camera_pins.h
+   1 bit       4 bit        
+   SD_MMC_CMD  SD_MMC_CMD  
+   SD_MMC_CLK  SD_MMC_CLK   
+   SD_MMC_D0   SD_MMC_D0    
+               SD_MMC_D1     
+               SD_MMC_D2    
+               SD_MMC_D3    
+*/
+// s60sc 2021, 2022, 2025
 
 #include "appGlobals.h"
+#include "ff.h"
+#include "vfs_fat_internal.h"
 
 // Storage settings
 int sdMinCardFreeSpace = 100; // Minimum amount of card free Megabytes before sdFreeSpaceMode action is enabled
 int sdFreeSpaceMode = 1; // 0 - No Check, 1 - Delete oldest dir, 2 - Upload oldest dir to FTP/HFS and then delete on SD 
 bool formatIfMountFailed = true; // Auto format the file system if mount failed. Set to false to not auto format.
+static bool use1bitMode = true;
 static fs::FS fp = STORAGE;
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
+static int sdmmcFreq = BOARD_MAX_SDMMC_FREQ; // board specific default SD_MMC speed
+#endif
 
 // hold sorted list of filenames/folders names in order of newest first
 static std::vector<std::string> fileVec;
@@ -17,31 +35,22 @@ static auto previousDir = "/~previous";
 static char fsType[10] = {0};
 
 static void infoSD() {
-#if !(CONFIG_IDF_TARGET_ESP32C3)
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
   uint8_t cardType = SD_MMC.cardType();
   if (cardType == CARD_NONE) LOG_WRN("No SD card attached");
   else {
     char typeStr[8] = "UNKNOWN";
     if (cardType == CARD_MMC) strcpy(typeStr, "MMC");
     else if (cardType == CARD_SD) strcpy(typeStr, "SDSC");
     else if (cardType == CARD_SDHC) strcpy(typeStr, "SDHC");
-    LOG_INF("SD card type %s, Size: %s", typeStr, fmtSize(SD_MMC.cardSize()));
+    LOG_INF("SD card type %s, Size: %s, using %d bit mode @ %uMHz", typeStr, fmtSize(SD_MMC.cardSize()), use1bitMode ? 1 : 4, sdmmcFreq / 1000);
   }
 #endif
 }
 
 static bool prepSD_MMC() {
   bool res = false;
-#if !(CONFIG_IDF_TARGET_ESP32C3)
-  /* open SD card in MMC 1 bit mode
-     MMC4  MMC1  ESP32 ESP32S3
-      D2          12
-      D3    ..    13
-      CMD  CMD    15    38
-      CLK  CLK    14    39
-      D0   D0     2     40
-      D1          4
-  */
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
   if (psramFound()) heap_caps_malloc_extmem_enable(MIN_RAM); // small number to force vector into psram
   fileVec.reserve(1000);
   if (psramFound()) heap_caps_malloc_extmem_enable(MAX_RAM);
@@ -50,11 +59,18 @@ static bool prepSD_MMC() {
   LOG_WRN("SD card pins not defined");
   return false;
 #else
+ #if defined(SD_MMC_D1)
+  // assume 4 bit mode
+  SD_MMC.setPins(SD_MMC_CLK, SD_MMC_CMD, SD_MMC_D0, SD_MMC_D1, SD_MMC_D2, SD_MMC_D3);
+  use1bitMode = false;
+ #else
+  // assume 1 bit mode
   SD_MMC.setPins(SD_MMC_CLK, SD_MMC_CMD, SD_MMC_D0);
+ #endif
 #endif
 #endif
 
-  res = SD_MMC.begin("/sdcard", true, formatIfMountFailed);
+  res = SD_MMC.begin("/sdcard", use1bitMode, formatIfMountFailed, sdmmcFreq);
 #if defined(CAMERA_MODEL_AI_THINKER)
   pinMode(4, OUTPUT);
   digitalWrite(4, 0); // set lamp pin fully off as sd_mmc library still initialises pin 4 in 1 line mode
@@ -88,7 +104,7 @@ static void listFolder(const char* rootDir) {
 bool startStorage() {
   // start required storage device (SD card or flash file system)
   bool res = false;
-#if !(CONFIG_IDF_TARGET_ESP32C3)
+#if (!CONFIG_IDF_TARGET_ESP32C3 && !CONFIG_IDF_TARGET_ESP32S2)
   if ((fs::SDMMCFS*)&STORAGE == &SD_MMC) {
     strcpy(fsType, "SD_MMC");
     res = prepSD_MMC();
@@ -413,3 +429,30 @@ esp_err_t downloadFile(File& df, httpd_req_t* req) {
   } else res = sendChunks(df, req); // send AVI
   return res;
 }
+
+bool formatSDcard() {
+  // format SD card, erases existing content
+  // can take some time to complete
+  // invoke from url: <cam ip>/control?formatSD=1
+  LOG_INF("Format the SD card, wait ...");
+  char drv[3] = {'0', ':', 0};
+  const size_t workbuf_size = 4096;
+  void* workbuf = NULL;
+  size_t allocation_unit_size = 4 * 1024;
+  int sector_size_default = 512;
+
+  workbuf = ff_memalloc(workbuf_size);
+  if (workbuf == NULL) {
+    LOG_ERR("workbuf memory not allocated");
+    return false;
+  }
+
+  size_t alloc_unit_size = esp_vfs_fat_get_allocation_unit_size(
+      sector_size_default, allocation_unit_size);
+  const MKFS_PARM opt = {(BYTE)FM_ANY, 0, 0, 0, alloc_unit_size};
+  FRESULT res = f_mkfs(drv, &opt, workbuf, workbuf_size);
+  ff_memfree(workbuf);
+  if (res != FR_OK) LOG_ERR("SD card format failed");
+  else LOG_INF("SD card formatted with alloc unit size %d", alloc_unit_size);
+  return res != FR_OK ? false : true;
+}

webDav.cpp

@@ -60,7 +60,7 @@ static int getMimeType(const char* path) {
 static void formatTime(time_t t) {
   // format time for XML property values
   tm* timeinfo = gmtime(&t);
-  strftime(formattedTime, sizeof(formattedTime), "%a, %d %b %Y %H:%M:%S %Z", timeinfo);
+  strftime(formattedTime, sizeof(formattedTime), "%a, %d %b %Y %H:%M:%S GMT", timeinfo);
 }
 
 static bool haveResource(bool ignore = false) {