v10.6.2

Author: s60sc

appGlobals.h

@@ -5,10 +5,6 @@
 #pragma once
 #include "globals.h"
 
-#if !CONFIG_IDF_TARGET_ESP32S3 && !CONFIG_IDF_TARGET_ESP32
-#error "Must select ESP32 or ESP32S3 board"
-#endif
-
 /**************************************************************************
  Uncomment one only of the ESP32 or ESP32S3 camera models in the block below
  Selecting wrong model may crash your device due to pin conflict
@@ -43,9 +39,20 @@
 //#define CAMERA_MODEL_DFRobot_Romeo_ESP32S3
 //#define CAMERA_MODEL_XENOIONEX
 //#define CAMERA_MODEL_Waveshare_ESP32_S3_ETH
+//#define CAMERA_MODEL_DFRobot_ESP32_S3_AI_CAM
 //#define AUXILIARY
+
+// User's ESP32C3 board (auxiliary only)
+#elif defined(CONFIG_IDF_TARGET_ESP32C3)
+#define AUXILIARY
+#define NO_SD
+#endif
+
+#if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32) && !defined(AUXILIARY)
+#error "Must select ESP32 or ESP32S3 board for camera"
 #endif
 
+
 /***************************************************************
   Optional features NOT included by default to reduce heap use 
   To include a particular feature, change false to true
@@ -100,7 +107,9 @@
 /*********************** Fixed defines leave as is ***********************/ 
 /** Do not change anything below here unless you know what you are doing **/
 
+#ifndef AUXILIARY
 #include "esp_camera.h"
+#endif
 #include "camera_pins.h"
 
 #define STATIC_IP_OCTAL "133" // dev only
@@ -110,14 +119,14 @@
 #define DOT_MAX 50
 #define HOSTNAME_GRP 99
 
-#define APP_VER "10.6.1"
+#define APP_VER "10.6.2"
 
 #if defined(AUXILIARY)
 #define APP_NAME "ESP-CAM_AUX" // max 15 chars
 #define INDEX_PAGE_PATH DATA_DIR "/Auxil" HTML_EXT
 #define USE_UARTTASK
 #elif defined(SIDE_ALARM)
-#define APP_NAME "ESP-CAM-SIDE" // max 15 chars
+#define APP_NAME "ESP-CAM_SIDE" // max 15 chars
 #define INDEX_PAGE_PATH DATA_DIR "/SideAl" HTML_EXT
 #define NO_SD
 #else
@@ -230,7 +239,7 @@ struct fnameStruct {
 };
 
 enum audioAction {NO_ACTION, UPDATE_CONFIG, RECORD_ACTION, PLAY_ACTION, PASS_ACTION, WAV_ACTION, STOP_ACTION};
-
+enum stepperModel {BYJ_48, BIPOLAR_8mm};
 // global app specific functions
 
 void applyFilters();
@@ -241,7 +250,6 @@ void buildAviHdr(uint8_t FPS, uint8_t frameType, uint16_t frameCnt, bool isTL =
 void buildAviIdx(size_t dataSize, bool isVid = true, bool isTL = false);
 size_t buildSubtitle(int srtSeqNo, uint32_t sampleInterval);
 void buzzerAlert(bool buzzerOn);
-bool checkMotion(camera_fb_t* fb, bool motionStatus, bool lightLevelOnly = false);
 int8_t checkPotVol(int8_t adjVol);
 bool checkSDFiles();
 void currentStackUsage();
@@ -257,10 +265,8 @@ bool haveWavFile(bool isTL = false);
 bool identifyBMx();
 void intercom();
 bool isNight(uint8_t nightSwitch);
-void keepFrame(camera_fb_t* fb);
 void micTaskStatus();
 void motorSpeed(int speedVal, bool leftMotor = true);
-void notifyMotion(camera_fb_t* fb);
 void openSDfile(const char* streamFile);
 void prepAudio();
 void prepAviIndex(bool isTL = false);
@@ -288,7 +294,7 @@ void startHeartbeat();
 void startSustainTasks();
 bool startTelemetry();
 void stepperDone();
-void stepperRun(float RPM, float revFraction, bool _clockwise);
+void stepperRun(float RPM, float revFraction, bool _clockwise, stepperModel thisStepper);
 void stopPlaying();
 void stopSustainTask(int taskId);
 void stopTelemetry(const char* fileName);
@@ -300,6 +306,12 @@ size_t writeAviIndex(byte* clientBuf, size_t buffSize, bool isTL = false);
 bool writeUart(uint8_t cmd, uint32_t outputData);
 size_t writeWavFile(byte* clientBuf, size_t buffSize);
 
+#ifndef CONFIG_IDF_TARGET_ESP32C3
+bool checkMotion(camera_fb_t* fb, bool motionStatus, bool lightLevelOnly = false);
+void keepFrame(camera_fb_t* fb);
+void notifyMotion(camera_fb_t* fb);
+#endif
+
 /******************** Global app declarations *******************/
 
 // motion detection parameters
@@ -332,7 +344,6 @@ extern bool forceRecord; // Recording enabled by rec button
 extern bool forcePlayback; // playback enabled by user
 extern uint8_t FPS;
 extern uint8_t fsizePtr; // index to frameData[] for record
-extern framesize_t maxFS;
 extern bool isCapturing;
 extern uint8_t lightLevel;  
 extern uint8_t lampLevel;  
@@ -357,6 +368,10 @@ extern bool streamSrt;
 extern uint8_t numStreams;
 extern uint8_t vidStreams;
 
+#ifndef CONFIG_IDF_TARGET_ESP32C3
+extern framesize_t maxFS;
+#endif
+
 // buffers
 extern uint8_t iSDbuffer[];
 extern uint8_t aviHeader[];

appSpecific.cpp

@@ -27,7 +27,9 @@ static void stopRC();
 bool updateAppStatus(const char* variable, const char* value, bool fromUser) {
   // update vars from browser input
   esp_err_t res = ESP_OK; 
+#ifndef CONFIG_IDF_TARGET_ESP32C3
   sensor_t* s = esp_camera_sensor_get();
+#endif
   int intVal = atoi(value);
   float fltVal = atof(value);
   if (!strcmp(variable, "custom")) return res;
@@ -500,6 +502,7 @@ void buildAppJsonString(bool filter) {
 #endif
   p += sprintf(p, "\"sustainId\":\"%u\",", sustainId);     
   // Extend info
+#ifndef CONFIG_IDF_TARGET_ESP32C3
   uint8_t cardType = 99; // not MMC
   if ((fs::SDMMCFS*)&STORAGE == &SD_MMC) cardType = SD_MMC.cardType();
   if (cardType == CARD_NONE) p += sprintf(p, "\"card\":\"%s\",", "NO card");
@@ -516,6 +519,7 @@ void buildAppJsonString(bool filter) {
     p += sprintf(p, "\"total_bytes\":\"%s\",", fmtSize(STORAGE.totalBytes()));
   }
   p += sprintf(p, "\"free_psram\":\"%s\",", fmtSize(ESP.getFreePsram()));     
+#endif
 #if INCLUDE_FTP_HFS
   p += sprintf(p, "\"progressBar\":%d,", percentLoaded);  
   if (percentLoaded == 100) percentLoaded = 0;

audio.cpp

@@ -262,7 +262,8 @@ static void VCactions() {
   closeI2S();
   prepAudio();
   setupFilters();
-          
+
+  // enum audioAction defined in appGlobals.h
   switch (THIS_ACTION) {
     case RECORD_ACTION: 
       if (micRem) wsAsyncSendText("#M1");
@@ -385,18 +386,26 @@ void setI2Schan(int whichChan) {
 }
 
 static void predefPins() {
+char audPin[3];
 #if defined(I2S_SD)
-  char micPin[3];
-  sprintf(micPin, "%d", I2S_SD);
-  updateStatus("micSdPin", micPin);
-  sprintf(micPin, "%d", I2S_WS);
-  updateStatus("micSWsPin", micPin);
-  sprintf(micPin, "%d", I2S_SCK);
-  updateStatus("micSckPin", micPin);
+  sprintf(audPin, "%d", I2S_SD);
+  updateStatus("micSdPin", audPin);
+  sprintf(audPin, "%d", I2S_WS);
+  updateStatus("micSWsPin", audPin);
+  sprintf(audPin, "%d", I2S_SCK);
+  updateStatus("micSckPin", audPin);
+#endif
+#if defined(I2S_BCLK)
+  sprintf(audPin, "%d", I2S_BCLK);
+  updateStatus("mampBckIo", audPin);
+  sprintf(audPin, "%d", I2S_LRCLK);
+  updateStatus("mampSwsIo", audPin);
+  sprintf(audPin, "%d", I2S_DIN);
+  updateStatus("mampSdIo", audPin);
 #endif
 
   I2Smic = micSckPin == -1 ? false : true;
-  
+
 #ifdef CONFIG_IDF_TARGET_ESP32S3
   MIC_CHAN = I2S_NUM_0;
 #endif

camera_pins.h

@@ -567,6 +567,47 @@
 #define I2S_WS 33
 #define I2S_SCK 35          // clock
 
+#elif defined(CAMERA_MODEL_DFRobot_ESP32_S3_AI_CAM)
+// https://wiki.dfrobot.com/SKU_DFR1154_ESP32_S3_AI_CAM
+#define CAM_BOARD "CAMERA_MODEL_DFRobot_ESP32_S3_AI_CAM"
+#define PWDN_GPIO_NUM    -1
+#define RESET_GPIO_NUM   -1
+#define XCLK_GPIO_NUM    5
+#define SIOD_GPIO_NUM    8
+#define SIOC_GPIO_NUM    9
+
+#define Y9_GPIO_NUM      4
+#define Y8_GPIO_NUM      6
+#define Y7_GPIO_NUM      7
+#define Y6_GPIO_NUM      14
+#define Y5_GPIO_NUM      17
+#define Y4_GPIO_NUM      21
+#define Y3_GPIO_NUM      18
+#define Y2_GPIO_NUM      16
+#define VSYNC_GPIO_NUM   1
+#define HREF_GPIO_NUM    2
+#define PCLK_GPIO_NUM    15
+
+#define LED_GPIO_NUM 3 
+// IR pin 47
+
+// Define SD Pins
+#define SD_MMC_CLK 12      //
+#define SD_MMC_CMD 13      // CMD/DI/MOSI
+#define SD_MMC_D0  11      // DAT0/D0/MISO
+// Chip select pin is GPIO10
+
+// Define Mic Pins 
+#define I2S_SD 39 // PDM Microphone
+#define I2S_WS 38
+#define I2S_SCK -1
+
+// Define Amp Pins 
+#define I2S_BCLK  45 // I2S amp
+#define I2S_LRCLK 46
+#define I2S_DIN   42
+// Gain pin 41, mode pin 40
+
 
 #elif defined(AUXILIARY)
 #define CAM_BOARD "AUXILIARY"

globals.h

@@ -14,6 +14,7 @@
 #ifdef DEV_ONLY
 // to compile with -Wall -Werror=all -Wextra
 #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"

mjpeg2sd.cpp

@@ -38,7 +38,6 @@ char camModel[10];
 static int siodGpio = SIOD_GPIO_NUM;
 static int siocGpio = SIOC_GPIO_NUM;
 size_t maxFrameBuffSize;
-framesize_t maxFS = FRAMESIZE_SVGA; // default
 
 // header and reporting info
 static uint32_t vidSize; // total video size
@@ -81,6 +80,9 @@ bool stopPlayback = false; // controls if playback allowed
 bool timeLapseOn = false;
 static bool pirVal = false;
 
+#ifndef CONFIG_IDF_TARGET_ESP32C3
+framesize_t maxFS = FRAMESIZE_SVGA; // default
+
 /**************** timers & ISRs ************************/
 
 static void IRAM_ATTR frameISR() {
@@ -1021,3 +1023,12 @@ bool prepCam() {
   debugMemory("prepCam");
   return res;
 }
+
+#else
+
+// dummies
+void appShutdown() {}
+void OTAprereq() {}
+uint8_t setFPSlookup(uint8_t val) {return 0;}
+
+#endif

motionDetect.cpp

@@ -54,6 +54,8 @@ uint8_t* motionJpeg = NULL;
 size_t motionJpegLen = 0;
 static uint8_t* currBuff = NULL;
 
+#ifndef CONFIG_IDF_TARGET_ESP32C3
+
 /**********************************************************************************/
 
 static bool jpg2rgb(const uint8_t* src, size_t src_len, uint8_t* out, jpg_scale_t scale);
@@ -375,3 +377,10 @@ static bool jpg2rgb(const uint8_t* src, size_t src_len, uint8_t* out, jpg_scale_
   if (res != ESP_OK) LOG_WRN("jpg2rgb failure: %s", espErrMsg(res)); 
   return (res == ESP_OK) ? true : false;
 }
+
+#else
+
+// dummies
+bool isNight(uint8_t nightSwitch) {return false;}
+
+#endif