From baa14da9ffb9954e121ee3f620bd287614ba7c72 Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Sat, 6 May 2023 02:22:05 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=82=20Moves=20camera=20setup=20to=20ow?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/camera.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/main.cpp     | 40 +---------------------------------------
 2 files changed, 47 insertions(+), 39 deletions(-)
 create mode 100644 include/camera.h

diff --git a/include/camera.h b/include/camera.h
new file mode 100644
index 0000000..b43245b
--- /dev/null
+++ b/include/camera.h
@@ -0,0 +1,46 @@
+#include <esp_camera.h>
+#include <Arduino.h>
+
+#include <config.h>
+#include <camera_pins.h>
+
+bool setupCamera(){
+  camera_config_t camera_config;
+  camera_config.ledc_channel = LEDC_CHANNEL_0;
+  camera_config.ledc_timer = LEDC_TIMER_0;
+  camera_config.pin_d0 = Y2_GPIO_NUM;
+  camera_config.pin_d1 = Y3_GPIO_NUM;
+  camera_config.pin_d2 = Y4_GPIO_NUM;
+  camera_config.pin_d3 = Y5_GPIO_NUM;
+  camera_config.pin_d4 = Y6_GPIO_NUM;
+  camera_config.pin_d5 = Y7_GPIO_NUM;
+  camera_config.pin_d6 = Y8_GPIO_NUM;
+  camera_config.pin_d7 = Y9_GPIO_NUM;
+  camera_config.pin_xclk = XCLK_GPIO_NUM;
+  camera_config.pin_pclk = PCLK_GPIO_NUM;
+  camera_config.pin_vsync = VSYNC_GPIO_NUM;
+  camera_config.pin_href = HREF_GPIO_NUM;
+  camera_config.pin_sscb_sda = SIOD_GPIO_NUM;
+  camera_config.pin_sscb_scl = SIOC_GPIO_NUM;
+  camera_config.pin_pwdn = PWDN_GPIO_NUM;
+  camera_config.pin_reset = RESET_GPIO_NUM;
+  camera_config.xclk_freq_hz = 20000000;
+  camera_config.pixel_format = PIXFORMAT_JPEG; 
+  
+  if(psramFound()){
+      camera_config.frame_size = FRAMESIZE_SVGA;
+      camera_config.jpeg_quality = 10;
+      camera_config.fb_count = 2;
+  } else {
+      camera_config.frame_size = FRAMESIZE_SVGA;
+      camera_config.jpeg_quality = 12;
+      camera_config.fb_count = 1;
+  }
+
+  esp_err_t err = esp_camera_init(&camera_config);
+  if (err != ESP_OK) {
+      printf("Camera probe failed with error 0x%x", err);
+      return 0;
+  }
+  return 1;
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 3e06c45..a9c37c7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@
 #include <WebsocketHandler.h>
 
 #include <config.h>
-#include <camera_pins.h>
+#include <camera.h>
 
 DNSServer dnsServer;
 AsyncWebSocket ws(WEBSOCKET_PATH);
@@ -42,45 +42,7 @@ const bool USE_CAPTIVE_PORTAL = false;
 
 long timer = 0;
 
-bool setupCamera(){
-  camera_config_t camera_config;
-  camera_config.ledc_channel = LEDC_CHANNEL_0;
-  camera_config.ledc_timer = LEDC_TIMER_0;
-  camera_config.pin_d0 = Y2_GPIO_NUM;
-  camera_config.pin_d1 = Y3_GPIO_NUM;
-  camera_config.pin_d2 = Y4_GPIO_NUM;
-  camera_config.pin_d3 = Y5_GPIO_NUM;
-  camera_config.pin_d4 = Y6_GPIO_NUM;
-  camera_config.pin_d5 = Y7_GPIO_NUM;
-  camera_config.pin_d6 = Y8_GPIO_NUM;
-  camera_config.pin_d7 = Y9_GPIO_NUM;
-  camera_config.pin_xclk = XCLK_GPIO_NUM;
-  camera_config.pin_pclk = PCLK_GPIO_NUM;
-  camera_config.pin_vsync = VSYNC_GPIO_NUM;
-  camera_config.pin_href = HREF_GPIO_NUM;
-  camera_config.pin_sscb_sda = SIOD_GPIO_NUM;
-  camera_config.pin_sscb_scl = SIOC_GPIO_NUM;
-  camera_config.pin_pwdn = PWDN_GPIO_NUM;
-  camera_config.pin_reset = RESET_GPIO_NUM;
-  camera_config.xclk_freq_hz = 20000000;
-  camera_config.pixel_format = PIXFORMAT_JPEG; 
-  
-  if(psramFound()){
-      camera_config.frame_size = FRAMESIZE_VGA;
-      camera_config.jpeg_quality = 10;
-      camera_config.fb_count = 2;
-  } else {
-      camera_config.frame_size = FRAMESIZE_SVGA;
-      camera_config.jpeg_quality = 12;
-      camera_config.fb_count = 1;
   }
-  esp_err_t err = esp_camera_init(&camera_config);
-  if (err != ESP_OK) {
-      printf("Camera probe failed with error 0x%x", err);
-      return 0;
-  }
-  return 1;
-}
 
 bool setupOLED(){
   if(!display.begin(SSD1306_SWITCHCAPVCC, 0x3C)) {