shuffle

Author: Chris McKeever

esp32/camera/motion-camera/v2-motion-camera/OV2640.cpp

@@ -2,43 +2,37 @@
 
 void OV2640::run(void)
 {
-    //return the frame buffer back to the driver for reuse
-    if (fb) esp_camera_fb_return(fb);
-    fb = esp_camera_fb_get();
+    if (buffer) esp_camera_fb_return(buffer);
+    buffer = esp_camera_fb_get();
 }
 
 void OV2640::runIfNeeded(void)
 {
-    if (!fb) run();
+    if (!buffer) run();
 }
 
 int OV2640::getWidth(void)
 {
     runIfNeeded();
-    return fb->width;
+    return buffer->width;
 }
 
 int OV2640::getHeight(void)
 {
     runIfNeeded();
-    return fb->height;
+    return buffer->height;
 }
 
 size_t OV2640::getSize(void)
 {
     runIfNeeded();
-    // FIXME - this shouldn't be possible but apparently the new cam board returns null sometimes?
-    if (!fb) return 0;
-    return fb->len;
+    return (!buffer) ? 0 : buffer->len;
 }
 
-uint8_t *OV2640::getfb(void)
+uint8_t *OV2640::getBuffer(void)
 {
     runIfNeeded();
-    // FIXME - this shouldn't be possible but apparently the new cam board returns null sometimes?
-    if (!fb) return NULL;
-
-    return fb->buf;
+    return (!buffer) ? NULL : buffer->buf;
 }
 
 esp_err_t OV2640::init(camera_config_t camConfig)

esp32/camera/motion-camera/v2-motion-camera/OV2640.h

@@ -1,43 +1,28 @@
 #ifndef OV2640_H_
 #define OV2640_H_
 
-#include <Arduino.h>
-#include <pgmspace.h>
-#include <stdio.h>
-#include "esp_log.h"
-#include "esp_attr.h"
 #include "esp_camera.h"
 
-extern camera_config_t esp32cam_config, esp32cam_aithinker_config, esp32cam_ttgo_t_config;
-
 class OV2640
 {
 public:
-    OV2640(){
-        fb = NULL;
-    };
-    ~OV2640(){
+    OV2640() {
+        buffer = NULL;
     };
+    ~OV2640() {};
+
     esp_err_t init(camera_config_t config);
     void run(void);
     size_t getSize(void);
-    uint8_t *getfb(void);
+    uint8_t *getBuffer(void);
     int getWidth(void);
     int getHeight(void);
-    framesize_t getFrameSize(void);
-    pixformat_t getPixelFormat(void);
-
-    void setFrameSize(framesize_t size);
-    void setPixelFormat(pixformat_t format);
 
 private:
-    void runIfNeeded(); // grab a frame if we don't already have one
-
-    // camera_framesize_t _frame_size;
-    // camera_pixelformat_t _pixel_format;
-    camera_config_t _cam_config;
+    // grab a frame if we don't already have one
+    void runIfNeeded();
 
-    camera_fb_t *fb;
+    camera_fb_t *buffer;
 };
 
 #endif //OV2640_H_

esp32/camera/motion-camera/v2-motion-camera/camera.h

@@ -1,9 +1,9 @@
-#include "esp_camera.h"
 #include "camera_pins.h"
 
-#include "fd_forward.h"
+#include "OV2640.h"
+OV2640 cam;
 
-bool cameraOK = false;
+bool cameraStatus = false;
 bool *cameraInUse = new bool(false);
 
 enum cameraModes { isReady, isStream, isCapture, isMotion };
@@ -45,10 +45,9 @@ camera_config_t getConfig() {
 }
 
 bool initCamera() {
+    cameraStatus = cam.init(getConfig());
 
-    camera_config_t cameraConfig = getConfig();
-    cameraOK = esp_camera_init(&cameraConfig) == ESP_OK;
-
+    // camera class?
     sensor_t *s = esp_camera_sensor_get();
     s->set_aec_value(s, config.camera_exposure);
     s->set_exposure_ctrl(s, config.camera_exposure_control);
@@ -57,9 +56,11 @@ bool initCamera() {
     s->set_hmirror(s, config.camera_hmirror);
     s->set_raw_gma(s, config.camera_raw_gma);
 
+    // move these to camera class
     *cameraMode = isReady;
     *cameraInUse = false;
-    return cameraOK;
+
+    return cameraStatus;
 }
 
 void flash(bool on) {

esp32/camera/motion-camera/v2-motion-camera/configmanager.h

@@ -3,7 +3,8 @@
 ConfigManager configManager;
 bool wifiConnected = false;
 
-void streamServer(WebServer* server);
+void apModeCallback(WebServer* server);
+void stationModeCallback(WebServer* server);
 
 /* == Brownout Handler ==*/
 #include "soc/soc.h"
@@ -100,8 +101,8 @@ void configSetup() {
     configManager.addParameter("cameraRawGMA", &config.camera_raw_gma);
 
     configManager.setInitCallback(configDefaults);
-    configManager.setAPCallback(streamServer);
-    configManager.setAPICallback(streamServer);
+    configManager.setAPCallback(stationModeCallback);
+    configManager.setAPICallback(stationModeCallback);
     configManager.setAPFilename("/wifiConfig.html");
 
     configManager.setAPName("Spy-Cam-v2");

esp32/camera/motion-camera/v2-motion-camera/standard.h

@@ -133,9 +133,6 @@ void initHTTP(int port=80) {
         request->send(SPIFFS, "/index.html", "text/html");
     });
 
-    webServer.addHandler(&logSocket);
-    webServer.begin();
-
     logger("Ready at: http://");
     logger(deviceIP());
     logger(":");