mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 19:46:54 +03:00
* Testcase for #2145 and debug-log (#2151) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Fix timezone config parser (#2169) * make sure to parse the whole config line * fix crash on empty timezone parameter --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Enhance ROI pages (#2161) * Check if the ROIs are equidistant. Only if not, untick the checkbox * renaming * Check if the ROIs have same y, dy and dx. If so, tick the sync checkbox * only allow editing space when box is checked * fix sync check * show inner frame on all ROIs * cleanup * Check if the ROIs have same dy and dx. If so, tick the sync checkbox * checkbox position * renaming * renaming * show inner frame and cross hairs on all ROIs * update ROIs on ticking checkboxes * show timezone hint * fix deleting last ROI * cleanup --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * restart timeout on progress, catch error (#2170) * restart timeout on progress, catch error * . --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * BugFix #2167 * Release 15.1 preparations (#2171) * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update changelog * Fix links to PR * Formating * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md * Update Changelog.md --------- Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> * fix typo * Replace relative documentation links with absolute ones pointing to the external documentation (#2180) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Sort model files in configuration combobox (#2189) * new models ana-cont-11.0.5, ana-class100-1.5.7, dig-class100-1.6.0 * Testcase for #2145 Added debug log, if allowNegativeRates is handeled * Sort model files in combobox * reboot task - increase stack size (#2201) Avoid stack overflow * Update interface_influxdb.cpp * Update Changelog.md * Show PSRAM usage (#2206) * centralize PSRAM usage (application code only) * update logging * update logging * fix use after free * initialize buffer * free rgb_image before ussing it for new allocation * use wrapper function * switch log level to debug * . * undo adding free() calls * . * add names to all CImage instances * . * . * . * revert changes of stbi_image_free() with free_psram_heap() on the places where is is not in PSRAM * . * typos * typo * Added MQTT Outbox explanation/warning * added CONFIG_SPIRAM_USE_MEMMAP explanation --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Disable custom MQTT Outbox. This also moves the MQTT Publishing memory usage back to the internal RAM! * log MQTT connection refused reasons (#2216) * Revert PSRAM usage as it lead to memory fragmentation. See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details * fix missing value data * Revert PSRAM usage as it lead to memory fragmentation. (#2224) See https://github.com/jomjol/AI-on-the-edge-device/issues/2200 for details Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix missing value data in graph (#2230) * fix missing value data --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2231) * Update interface_influxdb.cpp (#2233) * update copyright year * Cleanup * Set prevalue using MQTT + set prevalue to RAW value (REST+MQTT) (#2252) * Use double instead of float * Error handling + set to RAW if newvalue < 0 * REST SetPrevalue: Set to RAW if newvalue < 0 * set prevalue with MQTT * removed the stb_image files and re-add them as a submodule. (#2223) - stb_image.h: Version update 2.25 -> 2.28 - stb_resize.h: Version update 0.96 -> 0.97 - stb_write.h: Version update 1.14 -> 1.16 Co-authored-by: CaCO3 <caco@ruinelli.ch> * Remove obsolete ClassFlowWriteList (#2264) * Renaming & cleanup of some modules / functions in source code (#2265) * Rename module tag name * Rename server_tflite.cpp -> MainFlowControl.cpp * Remove redundandant MQTTMainTopic function * Update * Remove obsolete GetMQTTMainTopic * Fix last element missing in digit model drop down (#2282) * Debug influxdb (#2283) * Fix time offset issues in InfluxDB component. (#2278) Closes #2273 Closes #2150 * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Improve Logging * Implement TimeSync at beginning * Update time_sntp.cpp * Update time_sntp.cpp * Set Time After WLAN Init --------- Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu> * Implement a camera livestream handler (#2286) * fix leading NaN (#2310) * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend InfluxDBv1 with individual topic names (#2319) * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * analogROI: Activate save button after ROI creation (#2326) * Migration of PlatformIO 5.2.0 to 6.1.0 (resp. ESP IDF from 4.4.2 to 5.0.1) (#2305) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * fix leading NaN (#2310) * Migration to PlatformIO 6.1.0 * Disable RMTMEM usage as it is no longer allowed -> Smart LEDs not functional! * moved miniz into subfolder of jomjol_fileserver_ota, else it does not build anymore. * cleanup * Task watchdog has new config name * Fix return value check. It must be something else than ESP_FAIL, but it does not need to be ESP_OK! * add missing strucures to work around new RMTMEM restriction (untested) --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Keep MainFlowTask alive to handle reboot (#2325) * Shared PSRAM memory (#2285) * enable PSRAM logging * add extra functions for psram shared memroy handling * CImageBasis objects still should used dynamic memory (eg. rawImage), haw ever tmpImage must be placed inside the shared memory * Place all STBI allocs inside the shared memory * The models are placed in the shared PSRAM reagion and must be allocated through the dedicated functions * . * renaming * fix cast warning * add flag to switch STBI PSRAM usage * improve PSRAM shared handling * reserve shared PSRAM as early as possible * init logging eralier so we can use it in PSRAM shared alloc * move Wifi_LWIP, BSS_SEG and MQTT Outbox into PSRAM to ffree internal memory * Check if model fits into reserved shared memory * Update code/components/jomjol_tfliteclass/CTfLiteClass.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_flowcontroll/ClassFlowControll.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_image_proc/CImageBasis.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * Update code/components/jomjol_helper/psram.cpp * . * . * . * . * Korrektur Merge Conflict in main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * fix PSRAM init return value check * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Implement individual influx topic * Update interface_influxdb.cpp * Update interface_influxdb.cpp * Update FieldName * Extend incl. indiv. Measurement * Implement UX * Update ClassFlowInfluxDBv2.cpp * Update main.cpp --------- Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: CaCO3 <caco3@ruinelli.ch> Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md (#2344) * Update Changelog.md * Update Changelog.md * merge conflicts * merge conflicts * update changelog --------- Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Slider0007 <jobbelle@gmx.net> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
180 lines
5.9 KiB
C++
180 lines
5.9 KiB
C++
#include "../../include/defines.h"
|
|
|
|
#ifdef DEBUG_ENABLE_SYSINFO
|
|
|
|
#include "esp_sys.h"
|
|
#include "esp_chip_info.h"
|
|
|
|
#include <string>
|
|
|
|
|
|
#include "esp_chip_info.h"
|
|
|
|
|
|
void Restart() {
|
|
esp_restart();
|
|
}
|
|
|
|
//source : https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/misc_system_api.html#_CPPv416esp_chip_model_t
|
|
|
|
//https://github.com/espressif/esp-idf/blob/8464186e67e34b417621df6b6f1f289a6c60b859/components/esp_hw_support/include/esp_chip_info.h
|
|
/*
|
|
typedef enum {
|
|
CHIP_ESP32 = 1, //!< ESP32
|
|
CHIP_ESP32S2 = 2, //!< ESP32-S2
|
|
CHIP_ESP32S3 = 9, //!< ESP32-S3
|
|
CHIP_ESP32C3 = 5, //!< ESP32-C3
|
|
CHIP_ESP32H4 = 6, //!< ESP32-H4
|
|
CHIP_ESP32C2 = 12, //!< ESP32-C2
|
|
CHIP_ESP32C6 = 13, //!< ESP32-C6
|
|
CHIP_ESP32H2 = 16, //!< ESP32-H2
|
|
CHIP_POSIX_LINUX = 999, //!< The code is running on POSIX/Linux simulator
|
|
} esp_chip_model_t;
|
|
*/
|
|
|
|
char* GetChipModel(){
|
|
esp_chip_info_t chipInfo;
|
|
esp_chip_info(&chipInfo);
|
|
switch((int)chipInfo.model) {
|
|
case 0 : return (char*)"ESP8266";
|
|
case (int)esp_chip_model_t::CHIP_ESP32 : return (char*)"ESP32";
|
|
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
|
|
case (int)esp_chip_model_t::CHIP_ESP32S2 : return (char*)"ESP32-S2";
|
|
case (int)esp_chip_model_t::CHIP_ESP32S3 : return (char*)"ESP32-S3";
|
|
case (int)esp_chip_model_t::CHIP_ESP32C3 : return (char*)"ESP32-C3";
|
|
case 6 : return (char*)"ESP32-H4";
|
|
case 12 : return (char*)"ESP32-C2";
|
|
case 13 : return (char*)"ESP32-C6";
|
|
//case (int)esp_chip_model_t::CHIP_ESP32H4 : return (char*)"ESP32-H4";
|
|
//case (int)esp_chip_model_t::CHIP_ESP32C2 : return (char*)"ESP32-C2";
|
|
//case (int)esp_chip_model_t::CHIP_ESP32C6 : return (char*)"ESP32-C6";
|
|
//case (int)esp_chip_model_t::CHIP_ESP32H2 : return (char*)"ESP32-H2";
|
|
case 16 : return (char*)"ESP32-H2";
|
|
//case (int)esp_chip_model_t::CHIP_POSIX_LINUX : return (char*)"CHIP_POSIX_LINUX";
|
|
|
|
#endif
|
|
}
|
|
return (char*)"Chip Unknown";
|
|
}
|
|
|
|
uint8_t GetChipCoreCount() {
|
|
esp_chip_info_t chipInfo;
|
|
esp_chip_info(&chipInfo);
|
|
return chipInfo.cores;
|
|
}
|
|
|
|
uint16_t GetChipRevision() {
|
|
esp_chip_info_t chipInfo;
|
|
esp_chip_info(&chipInfo);
|
|
return chipInfo.revision;
|
|
}
|
|
|
|
uint32_t GetChipfeatures() {
|
|
esp_chip_info_t chipInfo;
|
|
esp_chip_info(&chipInfo);
|
|
return chipInfo.features;
|
|
}
|
|
|
|
|
|
uint32_t GetFreeHeap() {
|
|
return esp_get_free_heap_size();
|
|
}
|
|
|
|
uint32_t GetLeastHeapFreeSinceBoot() {
|
|
return esp_get_minimum_free_heap_size();
|
|
}
|
|
|
|
|
|
std::string get_device_info()
|
|
{
|
|
esp_chip_info_t chip_info;
|
|
esp_chip_info(&chip_info);
|
|
|
|
std::string espInfoResultStr = "";
|
|
char aMsgBuf[40];
|
|
|
|
espInfoResultStr += "Device Info:";
|
|
espInfoResultStr += "---------------\n";
|
|
espInfoResultStr += "Chip Model: " + std::string(GetChipModel()) +"\n";
|
|
sprintf(aMsgBuf,"Chip Revision: %d\n", chip_info.revision);
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
sprintf(aMsgBuf,"CPU Cores: %d\n", chip_info.cores);
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
sprintf(aMsgBuf,"Flash Memory: %dMB\n", spi_flash_get_chip_size()/(1024*1024));
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
if(chip_info.features & CHIP_FEATURE_WIFI_BGN)
|
|
//espInfoResultStr += "Base MAC: " + std::string(getMac()) +"\n";
|
|
espInfoResultStr += "ESP-IDF version: " + std::string(esp_get_idf_version()) +"\n";
|
|
if((chip_info.features & CHIP_FEATURE_WIFI_BGN) || (chip_info.features & CHIP_FEATURE_BT) ||
|
|
(chip_info.features & CHIP_FEATURE_BLE) || (chip_info.features & CHIP_FEATURE_EMB_FLASH))
|
|
{
|
|
espInfoResultStr += "Characteristics:\n";
|
|
if(chip_info.features & CHIP_FEATURE_WIFI_BGN)
|
|
espInfoResultStr += " WiFi 2.4GHz\n";
|
|
if(chip_info.features & CHIP_FEATURE_BT)
|
|
espInfoResultStr += " Bluetooth Classic\n";
|
|
if(chip_info.features & CHIP_FEATURE_BLE)
|
|
espInfoResultStr += " Bluetooth Low Energy\n";
|
|
if(chip_info.features & CHIP_FEATURE_EMB_FLASH)
|
|
espInfoResultStr += " Embedded Flash memory\n";
|
|
else
|
|
espInfoResultStr += " External Flash memory\n";
|
|
}
|
|
|
|
#ifdef USE_HIMEM_IF_AVAILABLE
|
|
sprintf(aMsgBuf,"spiram size %u\n", esp_psram_get_size());
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
sprintf(aMsgBuf,"himem free %u\n", esp_himem_get_free_size());
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
sprintf(aMsgBuf,"himem phys %u\n", esp_himem_get_phys_size());
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
sprintf(aMsgBuf,"himem reserved %u\n", esp_himem_reserved_area_size());
|
|
espInfoResultStr += std::string(aMsgBuf);
|
|
#endif
|
|
|
|
return espInfoResultStr;
|
|
}
|
|
|
|
|
|
size_t getFreeMemoryInternal(){ //Current Free Memory
|
|
return heap_caps_get_free_size(MALLOC_CAP_8BIT) - heap_caps_get_free_size(MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
size_t getFreeMemorySPIRAM(){ //Current Free Memory
|
|
return heap_caps_get_free_size(MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
|
|
size_t getLargestFreeBlockInternal(){ //Largest Free Block
|
|
return heap_caps_get_largest_free_block(MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
|
|
}
|
|
|
|
size_t getLargestFreeBlockSPIRAM(){ //Largest Free Block
|
|
return heap_caps_get_largest_free_block(MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
|
|
size_t getMinEverFreeMemInternal(){ //Min. Ever Free Size
|
|
return heap_caps_get_minimum_free_size(MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
|
|
}
|
|
|
|
size_t getMinEverFreeMemSPIRAM(){ //Min. Ever Free Size
|
|
return heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM);
|
|
}
|
|
|
|
#ifdef USE_HIMEM_IF_AVAILABLE
|
|
size_t getHimemTotSpace(){
|
|
return esp_himem_get_phys_size();
|
|
}
|
|
|
|
size_t getHimemFreeSpace(){
|
|
return esp_himem_get_free_size();
|
|
}
|
|
|
|
size_t getHimemReservedArea(){
|
|
return esp_himem_reserved_area_size();
|
|
}
|
|
#endif
|
|
|
|
#endif //DEBUG_ENABLE_SYSINFO
|