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>
153 lines
5.1 KiB
C++
153 lines
5.1 KiB
C++
#include "statusled.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include "driver/gpio.h"
|
|
|
|
#include "ClassLogFile.h"
|
|
#include "../../include/defines.h"
|
|
|
|
// define `gpio_pad_select_gpip` for newer versions of IDF
|
|
#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0))
|
|
#include "esp_rom_gpio.h"
|
|
#define gpio_pad_select_gpio esp_rom_gpio_pad_select_gpio
|
|
#endif
|
|
|
|
static const char* TAG = "STATUSLED";
|
|
|
|
TaskHandle_t xHandle_task_StatusLED = NULL;
|
|
struct StatusLEDData StatusLEDData = {};
|
|
|
|
|
|
void task_StatusLED(void *pvParameter)
|
|
{
|
|
//ESP_LOGD(TAG, "task_StatusLED - create");
|
|
while (StatusLEDData.bProcessingRequest)
|
|
{
|
|
//ESP_LOGD(TAG, "task_StatusLED - start");
|
|
struct StatusLEDData StatusLEDDataInt = StatusLEDData;
|
|
|
|
gpio_pad_select_gpio(BLINK_GPIO); // Init the GPIO
|
|
gpio_set_direction(BLINK_GPIO, GPIO_MODE_OUTPUT); // Set the GPIO as a push/pull output
|
|
gpio_set_level(BLINK_GPIO, 1);// LED off
|
|
|
|
for (int i=0; i<2; ) // Default: repeat 2 times
|
|
{
|
|
if (!StatusLEDDataInt.bInfinite)
|
|
++i;
|
|
|
|
for (int j = 0; j < StatusLEDDataInt.iSourceBlinkCnt; ++j)
|
|
{
|
|
gpio_set_level(BLINK_GPIO, 0);
|
|
vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
|
|
gpio_set_level(BLINK_GPIO, 1);
|
|
vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
|
|
}
|
|
|
|
vTaskDelay(500 / portTICK_PERIOD_MS); // Delay between module code and error code
|
|
|
|
for (int j = 0; j < StatusLEDDataInt.iCodeBlinkCnt; ++j)
|
|
{
|
|
gpio_set_level(BLINK_GPIO, 0);
|
|
vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
|
|
gpio_set_level(BLINK_GPIO, 1);
|
|
vTaskDelay(StatusLEDDataInt.iBlinkTime / portTICK_PERIOD_MS);
|
|
}
|
|
vTaskDelay(1500 / portTICK_PERIOD_MS); // Delay to signal new round
|
|
}
|
|
|
|
StatusLEDData.bProcessingRequest = false;
|
|
//ESP_LOGD(TAG, "task_StatusLED - done/wait");
|
|
vTaskDelay(10000 / portTICK_PERIOD_MS); // Wait for an upcoming request otherwise continue and delete task to save memory
|
|
}
|
|
//ESP_LOGD(TAG, "task_StatusLED - delete");
|
|
xHandle_task_StatusLED = NULL;
|
|
vTaskDelete(NULL); // Delete this task due to no request
|
|
}
|
|
|
|
|
|
void StatusLED(StatusLedSource _eSource, int _iCode, bool _bInfinite)
|
|
{
|
|
//ESP_LOGD(TAG, "StatusLED - start");
|
|
|
|
if (_eSource == WLAN_CONN) {
|
|
StatusLEDData.iSourceBlinkCnt = WLAN_CONN;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == WLAN_INIT) {
|
|
StatusLEDData.iSourceBlinkCnt = WLAN_INIT;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == SDCARD_INIT) {
|
|
StatusLEDData.iSourceBlinkCnt = SDCARD_INIT;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == SDCARD_CHECK) {
|
|
StatusLEDData.iSourceBlinkCnt = SDCARD_CHECK;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == CAM_INIT) {
|
|
StatusLEDData.iSourceBlinkCnt = CAM_INIT;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == PSRAM_INIT) {
|
|
StatusLEDData.iSourceBlinkCnt = PSRAM_INIT;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == TIME_CHECK) {
|
|
StatusLEDData.iSourceBlinkCnt = TIME_CHECK;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 250;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
else if (_eSource == AP_OR_OTA) {
|
|
StatusLEDData.iSourceBlinkCnt = AP_OR_OTA;
|
|
StatusLEDData.iCodeBlinkCnt = _iCode;
|
|
StatusLEDData.iBlinkTime = 350;
|
|
StatusLEDData.bInfinite = _bInfinite;
|
|
}
|
|
|
|
if (xHandle_task_StatusLED && !StatusLEDData.bProcessingRequest) {
|
|
StatusLEDData.bProcessingRequest = true;
|
|
BaseType_t xReturned = xTaskAbortDelay(xHandle_task_StatusLED); // Reuse still running status LED task
|
|
/*if (xReturned == pdPASS)
|
|
ESP_LOGD(TAG, "task_StatusLED - abort waiting delay");*/
|
|
}
|
|
else if (xHandle_task_StatusLED == NULL) {
|
|
StatusLEDData.bProcessingRequest = true;
|
|
BaseType_t xReturned = xTaskCreate(&task_StatusLED, "task_StatusLED", 1280, NULL, tskIDLE_PRIORITY+1, &xHandle_task_StatusLED);
|
|
if(xReturned != pdPASS)
|
|
{
|
|
xHandle_task_StatusLED = NULL;
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "task_StatusLED failed to create");
|
|
LogFile.WriteHeapInfo("task_StatusLED failed");
|
|
}
|
|
}
|
|
else {
|
|
ESP_LOGD(TAG, "task_StatusLED still processing, request skipped"); // Requests with high frequency could be skipped, but LED is only helpful for static states
|
|
}
|
|
//ESP_LOGD(TAG, "StatusLED - done");
|
|
}
|
|
|
|
|
|
void StatusLEDOff(void)
|
|
{
|
|
if (xHandle_task_StatusLED)
|
|
vTaskDelete(xHandle_task_StatusLED); // Delete task for StatusLED to force stop of blinking
|
|
|
|
gpio_pad_select_gpio(BLINK_GPIO); // Init the GPIO
|
|
gpio_set_direction(BLINK_GPIO, GPIO_MODE_OUTPUT); // Set the GPIO as a push/pull output
|
|
gpio_set_level(BLINK_GPIO, 1);// LED off
|
|
} |