Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-18 13:38:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add tag to logfile write (#1287)

Browse Source 
* HTML: implement data viewer

* Correct CSV error

* Improve OTA

* Use consistent Log TAG syntax, name TAG variable the same in every file.

* .

* .

* .

* .

* .

* Update server_tflite.cpp

* Correct CSV error

* Improve OTA

* Use consistent Log TAG syntax, name TAG variable the same in every file.

* .

* .

* .

* .

* .

* Update server_tflite.cpp

* .

* .

* .

* .

* .

* .

* .

* .

Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>
This commit is contained in:
CaCO3
2022-11-06 08:13:53 +01:00
committed by GitHub
parent 529690ec60
commit d1e7ef1fce
31 changed files with 450 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
code/main/main.cpp
View File

@@ -49,7 +49,7 @@ extern const char* BUILD_TIME;
#define BLINK_GPIO GPIO_NUM_33
static const char *TAGMAIN = "main";
static const char *TAG = "MAIN";
//#define FLASH_GPIO GPIO_NUM_4
@@ -62,7 +62,7 @@ bool Init_NVS_SDCard()
}
////////////////////////////////////////////////
ESP_LOGI(TAGMAIN, "Using SDMMC peripheral");
ESP_LOGI(TAG, "Using SDMMC peripheral");
sdmmc_host_t host = SDMMC_HOST_DEFAULT();
// This initializes the slot without card detect (CD) and write protect (WP) signals.
@@ -104,10 +104,10 @@ bool Init_NVS_SDCard()
if (ret != ESP_OK) {
if (ret == ESP_FAIL) {
ESP_LOGE(TAGMAIN, "Failed to mount filesystem. "
ESP_LOGE(TAG, "Failed to mount filesystem. "
"If you want the card to be formatted, set format_if_mount_failed = true.");
} else {
ESP_LOGE(TAGMAIN, "Failed to initialize the card (%s). "
ESP_LOGE(TAG, "Failed to initialize the card (%s). "
"Make sure SD card lines have pull-up resistors in place.", esp_err_to_name(ret));
}
return false;
@@ -128,7 +128,7 @@ void task_NoSDBlink(void *pvParameter)
TickType_t xDelay;
xDelay = 100 / portTICK_PERIOD_MS;
ESP_LOGD(TAGMAIN, "SD-Card could not be inialized - STOP THE PROGRAMM HERE");
ESP_LOGD(TAG, "SD-Card could not be inialized - STOP THE PROGRAMM HERE");
while (1)
{
@@ -148,18 +148,18 @@ 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"); // 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: %s", getResetReason().c_str());
ESP_LOGI(TAG, "\n\n\n\n\n"); // Add mark on log to see when it restarted
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "%s", versionFormated.c_str());
ESP_LOGD(TAG, "=============================================================================================");
ESP_LOGD(TAG, "Reset reason: %s", getResetReason().c_str());
PowerResetCamera();
esp_err_t cam = Camera.InitCam();
Camera.LightOnOff(false);
xDelay = 2000 / portTICK_PERIOD_MS;
ESP_LOGD(TAGMAIN, "After camera initialization: sleep for: %ldms", (long) xDelay);
ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay);
vTaskDelay( xDelay );
@@ -174,9 +174,9 @@ extern "C" void app_main(void)
LogFile.CreateLogDirectories();
/*
int mk_ret = mkdir("/sdcard/new_fd_mkdir", 0775);
ESP_LOGI(TAGMAIN, "mkdir ret %d", mk_ret);
ESP_LOGI(TAG, "mkdir ret %d", mk_ret);
mk_ret = mkdir("/sdcard/new_fd_mkdir/test", 0775);
ESP_LOGI(TAGMAIN, "mkdir ret %d", mk_ret);
ESP_LOGI(TAG, "mkdir ret %d", mk_ret);
MakeDir("/sdcard/test2");
MakeDir("/sdcard/test2/intern");
*/
@@ -187,58 +187,58 @@ extern "C" void app_main(void)
if (ssid != NULL && passwd != NULL)
#ifdef __HIDE_PASSWORD
ESP_LOGD(TAGMAIN, "WLan: %s, XXXXXX", ssid);
ESP_LOGD(TAG, "WLan: %s, XXXXXX", ssid);
#else
ESP_LOGD(TAGMAIN, "WLan: %s, %s", ssid, passwd);
ESP_LOGD(TAG, "WLan: %s, %s", ssid, passwd);
#endif
else
ESP_LOGD(TAGMAIN, "No SSID and PASSWORD set!!!");
ESP_LOGD(TAG, "No SSID and PASSWORD set!!!");
if (hostname != NULL)
ESP_LOGD(TAGMAIN, "Hostname: %s", hostname);
ESP_LOGD(TAG, "Hostename: %s", hostname);
else
ESP_LOGD(TAGMAIN, "Hostname not set");
ESP_LOGD(TAG, "Hostname not set");
if (ip != NULL && gateway != NULL && netmask != NULL)
ESP_LOGD(TAGMAIN, "Fixed IP: %s, Gateway %s, Netmask %s", ip, gateway, netmask);
ESP_LOGD(TAG, "Fixed IP: %s, Gateway %s, Netmask %s", ip, gateway, netmask);
if (dns != NULL)
ESP_LOGD(TAGMAIN, "DNS IP: %s", dns);
ESP_LOGD(TAG, "DNS IP: %s", dns);
wifi_init_sta(ssid, passwd, hostname, ip, gateway, netmask, dns);
xDelay = 2000 / portTICK_PERIOD_MS;
ESP_LOGD(TAGMAIN, "main: sleep for: %ldms", (long) xDelay);
ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay);
vTaskDelay( xDelay );
setup_time();
setBootTime();
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.WriteToFile(ESP_LOG_INFO, TAG, "=============================================================================================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================== Main Started ============================================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=============================================================================================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated);
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason());
std::string zw = gettimestring("%Y%m%d-%H%M%S");
ESP_LOGD(TAGMAIN, "time %s", zw.c_str());
ESP_LOGD(TAG, "time %s", zw.c_str());
size_t _hsize = getESPHeapSize();
if (_hsize < 4000000)
{
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.WriteToFile(ESP_LOG_ERROR, _zws);
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zws);
} else {
if (cam != ESP_OK) {
LogFile.WriteToFile(ESP_LOG_ERROR, "Failed to initialize camera module. "
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to initialize camera module. "
"Check that your camera module is working and connected properly.");
} else {
// Test Camera
camera_fb_t * fb = esp_camera_fb_get();
if (!fb) {
LogFile.WriteToFile(ESP_LOG_ERROR, "Camera cannot be initialzed. "
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Camera cannot be initialzed. "
"System will reboot.");
doReboot();
}
@@ -250,10 +250,10 @@ extern "C" void app_main(void)
xDelay = 2000 / portTICK_PERIOD_MS;
ESP_LOGD(TAGMAIN, "main: sleep for: %ldms", (long) xDelay*10);
ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay*10);
vTaskDelay( xDelay );
ESP_LOGD(TAGMAIN, "starting server");
ESP_LOGD(TAG, "starting server");
server = start_webserver();
register_server_camera_uri(server);
@@ -264,10 +264,10 @@ extern "C" void app_main(void)
gpio_handler_create(server);
ESP_LOGD(TAGMAIN, "vor reg server main");
ESP_LOGD(TAG, "vor reg server main");
register_server_main_uri(server, "/sdcard");
ESP_LOGD(TAGMAIN, "vor dotautostart");
ESP_LOGD(TAG, "vor dotautostart");
TFliteDoAutoStart();
}

42
code/main/server_main.cpp
View File

@@ -25,7 +25,7 @@
httpd_handle_t server = NULL;
std::string starttime = "";
static const char *TAG_SERVERMAIN = "server-main";
static const char *TAG = "MAIN SERVER";
/* An HTTP GET handler */
esp_err_t info_get_handler(httpd_req_t *req)
@@ -34,18 +34,18 @@ esp_err_t info_get_handler(httpd_req_t *req)
LogFile.WriteHeapInfo("info_get_handler - Start");
#endif
LogFile.WriteToFile(ESP_LOG_INFO, "info_get_handler");
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "info_get_handler");
char _query[200];
char _valuechar[30];
std::string _task;
if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK)
{
ESP_LOGD(TAG_SERVERMAIN, "Query: %s", _query);
ESP_LOGD(TAG, "Query: %s", _query);
if (httpd_query_key_value(_query, "type", _valuechar, 30) == ESP_OK)
{
ESP_LOGD(TAG_SERVERMAIN, "type is found: %s", _valuechar);
ESP_LOGD(TAG, "type is found: %s", _valuechar);
_task = std::string(_valuechar);
}
};
@@ -221,7 +221,7 @@ esp_err_t hello_main_handler(httpd_req_t *req)
#endif
char filepath[50];
ESP_LOGD(TAG_SERVERMAIN, "uri: %s\n", req->uri);
ESP_LOGD(TAG, "uri: %s\n", req->uri);
int _pos;
esp_err_t res;
@@ -230,7 +230,7 @@ esp_err_t hello_main_handler(httpd_req_t *req)
const char *filename = get_path_from_uri(filepath, base_path,
req->uri - 1, sizeof(filepath));
ESP_LOGD(TAG_SERVERMAIN, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
ESP_LOGD(TAG, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
if ((strcmp(req->uri, "/") == 0))
{
@@ -248,16 +248,16 @@ esp_err_t hello_main_handler(httpd_req_t *req)
}
if (filetosend == "/sdcard/html/index.html" && isSetupModusActive()) {
ESP_LOGD(TAG_SERVERMAIN, "System is in setup mode --> index.html --> setup.html");
ESP_LOGD(TAG, "System is in setup mode --> index.html --> setup.html");
filetosend = "/sdcard/html/setup.html";
}
ESP_LOGD(TAG_SERVERMAIN, "Filename: %s", filename);
ESP_LOGD(TAG, "Filename: %s", filename);
ESP_LOGD(TAG_SERVERMAIN, "File requested: %s", filetosend.c_str());
ESP_LOGD(TAG, "File requested: %s", filetosend.c_str());
if (!filename) {
ESP_LOGE(TAG_SERVERMAIN, "Filename is too long");
ESP_LOGE(TAG, "Filename is too long");
/* Respond with 500 Internal Server Error */
httpd_resp_send_err(req, HTTPD_500_INTERNAL_SERVER_ERROR, "Filename too long");
return ESP_FAIL;
@@ -284,17 +284,17 @@ esp_err_t hello_main_handler(httpd_req_t *req)
esp_err_t img_tmp_handler(httpd_req_t *req)
{
char filepath[50];
ESP_LOGD(TAG_SERVERMAIN, "uri: %s", req->uri);
ESP_LOGD(TAG, "uri: %s", req->uri);
char *base_path = (char*) req->user_ctx;
std::string filetosend(base_path);
const char *filename = get_path_from_uri(filepath, base_path,
req->uri + sizeof("/img_tmp/") - 1, sizeof(filepath));
ESP_LOGD(TAG_SERVERMAIN, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
ESP_LOGD(TAG, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
filetosend = filetosend + "/img_tmp/" + std::string(filename);
ESP_LOGD(TAG_SERVERMAIN, "File to upload: %s", filetosend.c_str());
ESP_LOGD(TAG, "File to upload: %s", filetosend.c_str());
esp_err_t res = send_file(req, filetosend);
if (res != ESP_OK)
@@ -313,17 +313,17 @@ esp_err_t img_tmp_virtual_handler(httpd_req_t *req)
char filepath[50];
ESP_LOGD(TAG_SERVERMAIN, "uri: %s", req->uri);
ESP_LOGD(TAG, "uri: %s", req->uri);
char *base_path = (char*) req->user_ctx;
std::string filetosend(base_path);
const char *filename = get_path_from_uri(filepath, base_path,
req->uri + sizeof("/img_tmp/") - 1, sizeof(filepath));
ESP_LOGD(TAG_SERVERMAIN, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
ESP_LOGD(TAG, "1 uri: %s, filename: %s, filepath: %s", req->uri, filename, filepath);
filetosend = std::string(filename);
ESP_LOGD(TAG_SERVERMAIN, "File to upload: %s", filetosend.c_str());
ESP_LOGD(TAG, "File to upload: %s", filetosend.c_str());
if (filetosend == "raw.jpg")
{
@@ -468,14 +468,14 @@ httpd_handle_t start_webserver(void)
starttime = gettimestring("%Y%m%d-%H%M%S");
// Start the httpd server
ESP_LOGI(TAG_SERVERMAIN, "Starting server on port: '%d'", config.server_port);
ESP_LOGI(TAG, "Starting server on port: '%d'", config.server_port);
if (httpd_start(&server, &config) == ESP_OK) {
// Set URI handlers
ESP_LOGI(TAG_SERVERMAIN, "Registering URI handlers");
ESP_LOGI(TAG, "Registering URI handlers");
return server;
}
ESP_LOGI(TAG_SERVERMAIN, "Error starting server!");
ESP_LOGI(TAG, "Error starting server!");
return NULL;
}
@@ -490,7 +490,7 @@ void disconnect_handler(void* arg, esp_event_base_t event_base,
{
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server) {
ESP_LOGI(TAG_SERVERMAIN, "Stopping webserver");
ESP_LOGI(TAG, "Stopping webserver");
stop_webserver(*server);
*server = NULL;
}
@@ -501,7 +501,7 @@ void connect_handler(void* arg, esp_event_base_t event_base,
{
httpd_handle_t* server = (httpd_handle_t*) arg;
if (*server == NULL) {
ESP_LOGI(TAG_SERVERMAIN, "Starting webserver");
ESP_LOGI(TAG, "Starting webserver");
*server = start_webserver();
}
}