From 50819fbaf28e2e1c897fd1dfb45ee4ec3b8c6d9b Mon Sep 17 00:00:00 2001 From: Rene Zeldenthuis Date: Tue, 5 Jul 2022 15:30:50 +0200 Subject: [PATCH] - More logging when initialize the camera --- src/main.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index adbb099..0325e9d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,7 @@ std::unique_ptr camera_server; // Web server WebServer web_server(80); IotWebConf iotWebConf(WIFI_SSID, &dnsServer, &web_server, WIFI_PASSWORD, CONFIG_VERSION); + bool config_changed = false; void handle_root() @@ -91,7 +92,7 @@ void handle_restart() else { // Redirect to root page. - web_server.sendHeader("Location", "/", true ); + web_server.sendHeader("Location", "/", true); web_server.send(302, "text/plain", ""); } } @@ -102,9 +103,9 @@ void on_config_saved() config_changed = true; } -void initialize_camera() +bool initialize_camera() { - log_v("Initialize camera"); + log_v("initialize_camera"); log_i("Camera config: %s", camera_config_val); auto camera_config = lookup_camera_config(camera_config_val); log_i("Frame size: %s", frame_size_val); @@ -115,16 +116,17 @@ void initialize_camera() camera_config.frame_size = frame_size; camera_config.jpeg_quality = jpeg_quality; - if (cam.init(camera_config) == ESP_OK) - log_i("Camera found"); - else - log_e("No camera found"); + return cam.init(camera_config) == ESP_OK; } void start_rtsp_server() { log_v("start_rtsp_server"); - initialize_camera(); + if (!initialize_camera()) + { + log_e("Failed to initialize camera. Type: %s, frame size: %s, frame rate: %s ms, jpeg quality: %s", camera_config_val, frame_size_val, frame_rate_val, jpeg_quality_val); + return; + } auto frame_rate = atol(frame_rate_val); camera_server = std::unique_ptr(new rtsp_server(cam, frame_rate, RTSP_PORT)); // Add service to mDNS - rtsp @@ -172,7 +174,7 @@ void setup() web_server.onNotFound([]() { iotWebConf.handleNotFound(); }); - // Set DNS to thingname + // Set DNS to thing name MDNS.begin(iotWebConf.getThingName()); // Add service to mDNS - http MDNS.addService("http", "tcp", 80);