From 38f6e49d0011a3885ab12b318b9f12f9cdd1989e Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 13:19:26 +0200 Subject: [PATCH 1/8] Add USB port to readme --- code/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/README.md b/code/README.md index 63483297..0eb5cac4 100644 --- a/code/README.md +++ b/code/README.md @@ -18,16 +18,14 @@ platformio run --environment esp32cam ### Upload ``` -pio run --target upload +pio run --target upload --upload-port /dev/ttyUSB0 ``` -If it doesnt find the device: -1. make sure it is in bootloader mode -1. set the UART device correctly: In `platformio.ini`, set `upload_port` correctly, eg. `upload_port = /dev/ttyUSB0` +Alternatively you also can set the UART device in `platformio.ini`, eg. `upload_port = /dev/ttyUSB0` ### Monitor UART Log ``` -pio device monitor +pio device monitor -p /dev/ttyUSB0 ``` ## Build and Flash with Visual Code IDE From f955f8786b17dd5f63a608783fda85991ace2376 Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 13:43:54 +0200 Subject: [PATCH 2/8] show reset reason, add function to get MAC --- code/components/jomjol_helper/Helper.cpp | 30 ++++++++++++++++++++++++ code/components/jomjol_helper/Helper.h | 3 +++ code/main/main.cpp | 7 +++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/code/components/jomjol_helper/Helper.cpp b/code/components/jomjol_helper/Helper.cpp index 130cf69c..0b2ca1e1 100644 --- a/code/components/jomjol_helper/Helper.cpp +++ b/code/components/jomjol_helper/Helper.cpp @@ -723,3 +723,33 @@ string RundeOutput(double _in, int _anzNachkomma) return stream.str(); } + +string getMac(void) { + uint8_t *macInt; + char macFormated[6*2 + 5 + 1]; + + esp_read_mac(macInt, ESP_MAC_WIFI_STA); + sprintf(macFormated, "%02X:%02X:%02X:%02X:%02X:%02X", macInt[0], macInt[1], macInt[2], macInt[3], macInt[4], macInt[5]); + + return macFormated; +} + +string getResetReason(void) { + std::string reasonText; + + switch(esp_reset_reason()) { + case ESP_RST_UNKNOWN: reasonText = "Unknown"; break; //!< Reset reason can not be determined + case ESP_RST_POWERON: reasonText = "Power-on event"; break; //!< Reset due to power-on event + case ESP_RST_EXT: reasonText = "External pin"; break; //!< Reset by external pin (not applicable for ESP32) + case ESP_RST_SW: reasonText = "Via esp_restart"; break; //!< Software reset via esp_restart + case ESP_RST_PANIC: reasonText = "Exception/panic"; break; //!< Software reset due to exception/panic + case ESP_RST_INT_WDT: reasonText = "Interrupt watchdog"; break; //!< Reset (software or hardware) due to interrupt watchdog + case ESP_RST_TASK_WDT: reasonText = "Task watchdog"; break; //!< Reset due to task watchdog + case ESP_RST_WDT: reasonText = "Other watchdogs"; break; //!< Reset due to other watchdogs + case ESP_RST_DEEPSLEEP: reasonText = "Exiting deep sleep mode"; break; //!< Reset after exiting deep sleep mode + case ESP_RST_BROWNOUT: reasonText = "Brownout"; break; //!< Brownout reset (software or hardware) + case ESP_RST_SDIO: reasonText = "SDIO"; break; //!< Reset over SDIO + default: reasonText = "unknnow" + } + return reasonText; +} diff --git a/code/components/jomjol_helper/Helper.h b/code/components/jomjol_helper/Helper.h index 9dcd333d..aeb5054f 100644 --- a/code/components/jomjol_helper/Helper.h +++ b/code/components/jomjol_helper/Helper.h @@ -59,3 +59,6 @@ string getSDCardManufacturer(); string getSDCardName(); string getSDCardCapacity(); string getSDCardSectorSize(); + +string getMac(void); +string getResetReason(void); \ No newline at end of file diff --git a/code/main/main.cpp b/code/main/main.cpp index f0a37ff8..a7dcfc16 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -147,9 +147,9 @@ extern "C" void app_main(void) string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + "', Tag: '" + std::string(GIT_TAG) + \ "', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME); - ESP_LOGD(TAGMAIN, "============================================================================================="); - ESP_LOGD(TAGMAIN, "%s", versionFormated.c_str()); - ESP_LOGD(TAGMAIN, "============================================================================================="); + ESP_LOGI(TAGMAIN, "\n\n\n\n\n\n\n\nInit System..."); // Add mark on log to see when it restarted + + PowerResetCamera(); esp_err_t cam = Camera.InitCam(); @@ -214,6 +214,7 @@ extern "C" void app_main(void) LogFile.WriteToFile("=================================== Main Started ============================================"); LogFile.WriteToFile("============================================================================================="); LogFile.WriteToFile(versionFormated); + LogFile.WriteToFile("Reset reason: " + getResetReason()); LogFile.SwitchOnOff(false); std::string zw = gettimestring("%Y%m%d-%H%M%S"); From 4a0f5eadc2445383fa233e361b13ee50dcb95193 Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 13:44:52 +0200 Subject: [PATCH 3/8] . --- code/components/jomjol_helper/Helper.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/components/jomjol_helper/Helper.cpp b/code/components/jomjol_helper/Helper.cpp index 0b2ca1e1..0236bb7f 100644 --- a/code/components/jomjol_helper/Helper.cpp +++ b/code/components/jomjol_helper/Helper.cpp @@ -738,7 +738,6 @@ string getResetReason(void) { std::string reasonText; switch(esp_reset_reason()) { - case ESP_RST_UNKNOWN: reasonText = "Unknown"; break; //!< Reset reason can not be determined case ESP_RST_POWERON: reasonText = "Power-on event"; break; //!< Reset due to power-on event case ESP_RST_EXT: reasonText = "External pin"; break; //!< Reset by external pin (not applicable for ESP32) case ESP_RST_SW: reasonText = "Via esp_restart"; break; //!< Software reset via esp_restart @@ -749,7 +748,10 @@ string getResetReason(void) { case ESP_RST_DEEPSLEEP: reasonText = "Exiting deep sleep mode"; break; //!< Reset after exiting deep sleep mode case ESP_RST_BROWNOUT: reasonText = "Brownout"; break; //!< Brownout reset (software or hardware) case ESP_RST_SDIO: reasonText = "SDIO"; break; //!< Reset over SDIO - default: reasonText = "unknnow" + + case ESP_RST_UNKNOWN: //!< Reset reason can not be determined + default: + reasonText = "Unknown"; } return reasonText; } From ec4ce66bccdcfc9bb6d25d2acdf788ce6945756e Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 13:49:44 +0200 Subject: [PATCH 4/8] . --- code/components/jomjol_helper/Helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/components/jomjol_helper/Helper.cpp b/code/components/jomjol_helper/Helper.cpp index 0236bb7f..fe1653bc 100644 --- a/code/components/jomjol_helper/Helper.cpp +++ b/code/components/jomjol_helper/Helper.cpp @@ -725,8 +725,8 @@ string RundeOutput(double _in, int _anzNachkomma) string getMac(void) { - uint8_t *macInt; - char macFormated[6*2 + 5 + 1]; + uint8_t macInt[6]; + char macFormated[6*2 + 5 + 1]; // AA:BB:CC:DD:EE:FF esp_read_mac(macInt, ESP_MAC_WIFI_STA); sprintf(macFormated, "%02X:%02X:%02X:%02X:%02X:%02X", macInt[0], macInt[1], macInt[2], macInt[3], macInt[4], macInt[5]); From 1a33834b3f1d14a5b41f378f2bfee825d02ec8a1 Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 14:16:41 +0200 Subject: [PATCH 5/8] . --- code/main/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/main/main.cpp b/code/main/main.cpp index a7dcfc16..2c276e6c 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -148,7 +148,10 @@ extern "C" void app_main(void) "', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME); ESP_LOGI(TAGMAIN, "\n\n\n\n\n\n\n\nInit System..."); // Add mark on log to see when it restarted - + ESP_LOGD(TAGMAIN, "============================================================================================="); + ESP_LOGD(TAGMAIN, "%s", versionFormated.c_str()); + ESP_LOGD(TAGMAIN, "============================================================================================="); + ESP_LOGD(TAGMAIN("Reset reason: " + getResetReason()); PowerResetCamera(); From 4ab0f632b7cefee285e701687c6fd51ad327bd54 Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 14:29:34 +0200 Subject: [PATCH 6/8] . --- code/main/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/main/main.cpp b/code/main/main.cpp index 2c276e6c..aa8f535e 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -151,7 +151,7 @@ extern "C" void app_main(void) ESP_LOGD(TAGMAIN, "============================================================================================="); ESP_LOGD(TAGMAIN, "%s", versionFormated.c_str()); ESP_LOGD(TAGMAIN, "============================================================================================="); - ESP_LOGD(TAGMAIN("Reset reason: " + getResetReason()); + ESP_LOGD(TAGMAIN, "Reset reason: " + getResetReason()); PowerResetCamera(); From e9e0eed8711fdd19faa0622c06522e754e6fac20 Mon Sep 17 00:00:00 2001 From: George Ruinelli Date: Tue, 25 Oct 2022 14:35:43 +0200 Subject: [PATCH 7/8] . --- code/main/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/main/main.cpp b/code/main/main.cpp index aa8f535e..aa299e22 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -147,11 +147,11 @@ extern "C" void app_main(void) string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + "', Tag: '" + std::string(GIT_TAG) + \ "', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME); - ESP_LOGI(TAGMAIN, "\n\n\n\n\n\n\n\nInit System..."); // Add mark on log to see when it restarted + ESP_LOGI(TAGMAIN, "\n\n\n\n\n"); // Add mark on log to see when it restarted ESP_LOGD(TAGMAIN, "============================================================================================="); ESP_LOGD(TAGMAIN, "%s", versionFormated.c_str()); ESP_LOGD(TAGMAIN, "============================================================================================="); - ESP_LOGD(TAGMAIN, "Reset reason: " + getResetReason()); + ESP_LOGD(TAGMAIN, "Reset reason: %s", getResetReason().c_str()); PowerResetCamera(); From 86809d8bf8578387dfbaeec1e06fef9a5be49fa9 Mon Sep 17 00:00:00 2001 From: CaCO3 Date: Tue, 25 Oct 2022 20:44:15 +0200 Subject: [PATCH 8/8] fixed missing parameters --- code/main/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/main/main.cpp b/code/main/main.cpp index 4be77f90..9cdf60fc 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -214,11 +214,11 @@ extern "C" void app_main(void) setup_time(); setBootTime(); - LogFile.WriteToFile("============================================================================================="); - LogFile.WriteToFile("=================================== Main Started ============================================"); - LogFile.WriteToFile("============================================================================================="); - LogFile.WriteToFile(versionFormated); - LogFile.WriteToFile("Reset reason: " + getResetReason()); + LogFile.WriteToFile(ESP_LOG_INFO, "============================================================================================="); + LogFile.WriteToFile(ESP_LOG_INFO, "=================================== Main Started ============================================"); + LogFile.WriteToFile(ESP_LOG_INFO, "============================================================================================="); + LogFile.WriteToFile(ESP_LOG_INFO, versionFormated); + LogFile.WriteToFile(ESP_LOG_INFO, "Reset reason: " + getResetReason()); LogFile.SwitchOnOff(false); std::string zw = gettimestring("%Y%m%d-%H%M%S");