Merge branch 'rolling' into various-improvements

This commit is contained in:
jomjol
2022-10-25 20:06:16 +02:00
committed by GitHub
22 changed files with 135 additions and 111 deletions

View File

@@ -213,6 +213,7 @@ extern "C" void app_main(void)
vTaskDelay( xDelay );
setup_time();
setBootTime();
LogFile.WriteToFile("=============================================================================================");
LogFile.WriteToFile("=================================== Main Started ============================================");
LogFile.WriteToFile("=============================================================================================");
@@ -229,12 +230,12 @@ extern "C" void app_main(void)
std::string _zws = "Not enough PSRAM available. Expected 4.194.304 MByte - available: " + std::to_string(_hsize);
_zws = _zws + "\nEither not initialzed, too small (2MByte only) or not present at all. Firmware cannot start!!";
LogFile.SwitchOnOff(true);
LogFile.WriteToFile(_zws);
LogFile.WriteToFile(ESP_LOG_ERROR, _zws);
LogFile.SwitchOnOff(false);
} else {
if (cam != ESP_OK) {
LogFile.SwitchOnOff(true);
LogFile.WriteToFile("Failed to initialize camera module. "
LogFile.WriteToFile(ESP_LOG_ERROR, "Failed to initialize camera module. "
"Check that your camera module is working and connected properly.");
LogFile.SwitchOnOff(false);
} else {
@@ -242,7 +243,7 @@ extern "C" void app_main(void)
camera_fb_t * fb = esp_camera_fb_get();
if (!fb) {
LogFile.SwitchOnOff(true);
LogFile.WriteToFile("Camera cannot be initialzed. "
LogFile.WriteToFile(ESP_LOG_ERROR, "Camera cannot be initialzed. "
"System will reboot.");
doReboot();
}