mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-08 12:36:52 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com>
308 lines
11 KiB
C++
308 lines
11 KiB
C++
#include <string>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "freertos/event_groups.h"
|
|
|
|
#include "driver/gpio.h"
|
|
#include "sdkconfig.h"
|
|
|
|
// SD-Card ////////////////////
|
|
#include "nvs_flash.h"
|
|
#include "esp_vfs_fat.h"
|
|
#include "sdmmc_cmd.h"
|
|
#include "driver/sdmmc_host.h"
|
|
#include "driver/sdmmc_defs.h"
|
|
///////////////////////////////
|
|
|
|
#include "ClassLogFile.h"
|
|
|
|
#include "connect_wlan.h"
|
|
#include "read_wlanini.h"
|
|
|
|
#include "server_main.h"
|
|
#include "server_tflite.h"
|
|
#include "server_file.h"
|
|
#include "server_ota.h"
|
|
#include "time_sntp.h"
|
|
#include "ClassControllCamera.h"
|
|
#include "server_main.h"
|
|
#include "server_camera.h"
|
|
#ifdef ENABLE_MQTT
|
|
#include "server_mqtt.h"
|
|
#endif //ENABLE_MQTT
|
|
#include "Helper.h"
|
|
|
|
extern const char* GIT_TAG;
|
|
extern const char* GIT_REV;
|
|
extern const char* GIT_BRANCH;
|
|
extern const char* BUILD_TIME;
|
|
|
|
extern std::string getHTMLversion(void);
|
|
extern std::string getHTMLcommit(void);
|
|
|
|
#define __HIDE_PASSWORD
|
|
|
|
// #include "jomjol_WS2812Slow.h"
|
|
#include "SmartLeds.h"
|
|
|
|
|
|
#define __SD_USE_ONE_LINE_MODE__
|
|
|
|
#include "server_GPIO.h"
|
|
|
|
|
|
#define BLINK_GPIO GPIO_NUM_33
|
|
|
|
static const char *TAG = "MAIN";
|
|
|
|
//#define FLASH_GPIO GPIO_NUM_4
|
|
|
|
bool Init_NVS_SDCard()
|
|
{
|
|
esp_err_t ret = nvs_flash_init();
|
|
if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
|
|
ESP_ERROR_CHECK(nvs_flash_erase());
|
|
ret = nvs_flash_init();
|
|
}
|
|
////////////////////////////////////////////////
|
|
|
|
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.
|
|
// Modify slot_config.gpio_cd and slot_config.gpio_wp if your board has these signals.
|
|
sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
|
|
|
|
// To use 1-line SD mode, uncomment the following line:
|
|
|
|
#ifdef __SD_USE_ONE_LINE_MODE__
|
|
slot_config.width = 1;
|
|
#endif
|
|
|
|
// GPIOs 15, 2, 4, 12, 13 should have external 10k pull-ups.
|
|
// Internal pull-ups are not sufficient. However, enabling internal pull-ups
|
|
// does make a difference some boards, so we do that here.
|
|
gpio_set_pull_mode(GPIO_NUM_15, GPIO_PULLUP_ONLY); // CMD, needed in 4- and 1- line modes
|
|
gpio_set_pull_mode(GPIO_NUM_2, GPIO_PULLUP_ONLY); // D0, needed in 4- and 1-line modes
|
|
#ifndef __SD_USE_ONE_LINE_MODE__
|
|
gpio_set_pull_mode(GPIO_NUM_4, GPIO_PULLUP_ONLY); // D1, needed in 4-line mode only
|
|
gpio_set_pull_mode(GPIO_NUM_12, GPIO_PULLUP_ONLY); // D2, needed in 4-line mode only
|
|
#endif
|
|
gpio_set_pull_mode(GPIO_NUM_13, GPIO_PULLUP_ONLY); // D3, needed in 4- and 1-line modes
|
|
|
|
// Options for mounting the filesystem.
|
|
// If format_if_mount_failed is set to true, SD card will be partitioned and
|
|
// formatted in case when mounting fails.
|
|
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
|
|
.format_if_mount_failed = false,
|
|
.max_files = 7, // anstatt 5 (2022-09-21)
|
|
.allocation_unit_size = 16 * 1024
|
|
};
|
|
|
|
// Use settings defined above to initialize SD card and mount FAT filesystem.
|
|
// Note: esp_vfs_fat_sdmmc_mount is an all-in-one convenience function.
|
|
// Please check its source code and implement error recovery when developing
|
|
// production applications.
|
|
sdmmc_card_t* card;
|
|
ret = esp_vfs_fat_sdmmc_mount("/sdcard", &host, &slot_config, &mount_config, &card);
|
|
|
|
if (ret != ESP_OK) {
|
|
if (ret == ESP_FAIL) {
|
|
ESP_LOGE(TAG, "Failed to mount filesystem. "
|
|
"If you want the card to be formatted, set format_if_mount_failed = true.");
|
|
} else {
|
|
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;
|
|
}
|
|
|
|
sdmmc_card_print_info(stdout, card);
|
|
SaveSDCardInfo(card);
|
|
return true;
|
|
}
|
|
|
|
void task_NoSDBlink(void *pvParameter)
|
|
{
|
|
gpio_pad_select_gpio(BLINK_GPIO);
|
|
gpio_set_direction(BLINK_GPIO, GPIO_MODE_OUTPUT);
|
|
|
|
|
|
TickType_t xDelay;
|
|
xDelay = 100 / portTICK_PERIOD_MS;
|
|
ESP_LOGD(TAG, "SD-Card could not be inialized - STOP THE PROGRAMM HERE");
|
|
|
|
while (1)
|
|
{
|
|
gpio_set_level(BLINK_GPIO, 1);
|
|
vTaskDelay( xDelay );
|
|
gpio_set_level(BLINK_GPIO, 0);
|
|
vTaskDelay( xDelay );
|
|
|
|
}
|
|
vTaskDelete(NULL); //Delete this task if it exits from the loop above
|
|
}
|
|
|
|
|
|
extern "C" void app_main(void)
|
|
{
|
|
TickType_t xDelay;
|
|
bool initSucessful = true;
|
|
|
|
ESP_LOGI(TAG, "\n\n\n\n\n"); // Add mark on log to see when it restarted
|
|
|
|
PowerResetCamera();
|
|
esp_err_t camStatus = Camera.InitCam();
|
|
Camera.LightOnOff(false);
|
|
xDelay = 2000 / portTICK_PERIOD_MS;
|
|
ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay);
|
|
vTaskDelay( xDelay );
|
|
|
|
if (!Init_NVS_SDCard())
|
|
{
|
|
xTaskCreate(&task_NoSDBlink, "task_NoSDBlink", configMINIMAL_STACK_SIZE * 64, NULL, tskIDLE_PRIORITY+1, NULL);
|
|
return;
|
|
};
|
|
|
|
string versionFormated = "Branch: '" + std::string(GIT_BRANCH) + \
|
|
"', Revision: " + std::string(GIT_REV) +", Date/Time: " + std::string(BUILD_TIME) + \
|
|
", Web UI: " + getHTMLversion();
|
|
|
|
if (std::string(GIT_TAG) != "") { // We are on a tag, add it as prefix
|
|
string versionFormated = "Tag: '" + std::string(GIT_TAG) + "', " + versionFormated;
|
|
}
|
|
|
|
LogFile.CreateLogDirectories();
|
|
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Startup ====================");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated);
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason());
|
|
|
|
CheckOTAUpdate();
|
|
CheckUpdate();
|
|
|
|
char *ssid = NULL, *passwd = NULL, *hostname = NULL, *ip = NULL, *gateway = NULL, *netmask = NULL, *dns = NULL;
|
|
LoadWlanFromFile("/sdcard/wlan.ini", ssid, passwd, hostname, ip, gateway, netmask, dns);
|
|
|
|
if (ssid != NULL && passwd != NULL)
|
|
#ifdef __HIDE_PASSWORD
|
|
ESP_LOGD(TAG, "WLan: %s, XXXXXX", ssid);
|
|
#else
|
|
ESP_LOGD(TAG, "WLan: %s, %s", ssid, passwd);
|
|
#endif
|
|
|
|
else
|
|
ESP_LOGD(TAG, "No SSID and PASSWORD set!!!");
|
|
|
|
if (hostname != NULL)
|
|
ESP_LOGD(TAG, "Hostname: %s", hostname);
|
|
else
|
|
ESP_LOGD(TAG, "Hostname not set");
|
|
|
|
if (ip != NULL && gateway != NULL && netmask != NULL)
|
|
ESP_LOGD(TAG, "Fixed IP: %s, Gateway %s, Netmask %s", ip, gateway, netmask);
|
|
if (dns != NULL)
|
|
ESP_LOGD(TAG, "DNS IP: %s", dns);
|
|
|
|
|
|
wifi_init_sta(ssid, passwd, hostname, ip, gateway, netmask, dns);
|
|
|
|
|
|
xDelay = 2000 / portTICK_PERIOD_MS;
|
|
ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay);
|
|
vTaskDelay( xDelay );
|
|
|
|
if (!setup_time()) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "NTP Initialization failed!");
|
|
}
|
|
|
|
setBootTime();
|
|
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================== Main Started =================");
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
|
|
|
|
if (getHTMLcommit().substr(0, 7) != std::string(GIT_REV).substr(0, 7)) { // Compare the first 7 characters of both hashes
|
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Web UI version (") + getHTMLcommit() + ") does not match firmware version (" + std::string(GIT_REV) + ") !");
|
|
}
|
|
|
|
std::string zw = gettimestring("%Y%m%d-%H%M%S");
|
|
ESP_LOGD(TAG, "time %s", zw.c_str());
|
|
|
|
size_t _hsize = getESPHeapSize();
|
|
if (_hsize < 4000000) // Check for a bit less than 4 MB (but clearly over 2 MB)
|
|
{
|
|
std::string _zws = "Not enough PSRAM available. Expected around 4 MBytes - available: " + std::to_string((float)_hsize/1024/1024) + " MBytes!";
|
|
_zws = _zws + "\nEither not initialized, too small (2 MByte only) or not present at all. Firmware cannot start!!";
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, _zws);
|
|
} else { // Bad Camera Status, retry init
|
|
if (camStatus != ESP_OK) {
|
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Failed to initialize camera module, retrying...");
|
|
|
|
PowerResetCamera();
|
|
esp_err_t camStatus = Camera.InitCam();
|
|
Camera.LightOnOff(false);
|
|
xDelay = 2000 / portTICK_PERIOD_MS;
|
|
ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay);
|
|
vTaskDelay( xDelay );
|
|
|
|
if (camStatus != ESP_OK) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Failed to initialize camera module!");
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Check that your camera module is working and connected properly!");
|
|
initSucessful = false;
|
|
}
|
|
} else { // Test Camera
|
|
camera_fb_t * fb = esp_camera_fb_get();
|
|
if (!fb) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Camera Framebuffer cannot be initialized!");
|
|
/* Easiest would be to simply restart here and try again,
|
|
how ever there seem to be systems where it fails at startup but still work corectly later.
|
|
Therefore we treat it still as successed!
|
|
//initSucessful = false; */
|
|
}
|
|
else {
|
|
esp_camera_fb_return(fb);
|
|
Camera.LightOnOff(false);
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
xDelay = 2000 / portTICK_PERIOD_MS;
|
|
ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay*10);
|
|
vTaskDelay( xDelay );
|
|
|
|
ESP_LOGD(TAG, "starting servers");
|
|
|
|
server = start_webserver();
|
|
register_server_camera_uri(server);
|
|
register_server_tflite_uri(server);
|
|
register_server_file_uri(server, "/sdcard");
|
|
register_server_ota_sdcard_uri(server);
|
|
#ifdef ENABLE_MQTT
|
|
register_server_mqtt_uri(server);
|
|
#endif //ENABLE_MQTT
|
|
|
|
gpio_handler_create(server);
|
|
|
|
ESP_LOGD(TAG, "vor reg server main");
|
|
register_server_main_uri(server, "/sdcard");
|
|
|
|
if (initSucessful) {
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Initialization completed successfully!");
|
|
ESP_LOGD(TAG, "vor do autostart");
|
|
TFliteDoAutoStart();
|
|
}
|
|
else { // Initialization failed
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Initialization failed. Will restart in 5 minutes!");
|
|
vTaskDelay(60*4000 / portTICK_RATE_MS); // Wait 4 minutes to give time to do an OTA or fetch the log
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Initialization failed. Will restart in 1 minute!");
|
|
vTaskDelay(60*1000 / portTICK_RATE_MS); // Wait 1 minute to give time to do an OTA or fetch the log
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Initialization failed. Will restart now!");
|
|
doReboot();
|
|
}
|
|
}
|