Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔦 Reduces flash size by making analytic synchronous

Browse Source
This commit is contained in:
Rune Harlyk
2024-05-02 19:20:58 +02:00
committed by Rune Harlyk
parent 8f87a1304b
commit ae1cb70710
2 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/AnalyticsService.h
+48 -47
View File
@@ -25,56 +25,57 @@
class AnalyticsService class AnalyticsService
{ {
public: public:
AnalyticsService(EventSocket *socket, TaskManager *taskManager) : _socket(socket), _taskManager(taskManager){}; AnalyticsService(EventSocket *socket, TaskManager *taskManager) : _socket(socket), _taskManager(taskManager){};
void begin() void begin()
{
_socket->registerEvent(EVENT_ANALYTICS);
_taskManager->createTask(&AnalyticsService::_loopImpl, "Analytics Service", 8120, this, tskIDLE_PRIORITY, nullptr,
ESP32SVELTEKIT_RUNNING_CORE);
};
protected:
EventSocket *_socket;
TaskManager *_taskManager;
static void _loopImpl(void *_this) { static_cast<AnalyticsService *>(_this)->_loop(); }
void _loop()
{ {
TickType_t xLastWakeTime = xTaskGetTickCount(); _socket->registerEvent(EVENT_ANALYTICS);
StaticJsonDocument<MAX_ESP_ANALYTICS_SIZE> doc; };
char message[MAX_ESP_ANALYTICS_SIZE];
while (1) void loop()
{
unsigned long currentMillis = millis();
if (!_lastUpdate || (currentMillis - _lastUpdate) >= ANALYTICS_INTERVAL)
{ {
doc.clear(); _lastUpdate = currentMillis;
doc["uptime"] = millis() / 1000; updateAnalytics();
doc["free_heap"] = ESP.getFreeHeap();
doc["total_heap"] = ESP.getHeapSize();
doc["min_free_heap"] = ESP.getMinFreeHeap();
doc["max_alloc_heap"] = ESP.getMaxAllocHeap();
doc["fs_used"] = ESPFS.usedBytes();
doc["fs_total"] = ESPFS.totalBytes();
doc["core_temp"] = temperatureRead();
doc["cpu0_usage"] = _taskManager->getCpuUsage(0);
doc["cpu1_usage"] = _taskManager->getCpuUsage(1);
doc["cpu_usage"] = _taskManager->getCpuUsage();
// Add _taskManager->getTaskNames() as a JSON array
JsonArray tasks = doc.createNestedArray("tasks");
for (auto const &task : _taskManager->getTasks())
{
JsonObject nested = tasks.createNestedObject();
nested["name"] = task.name;
nested["stackSize"] = task.stackSize;
nested["priority"] = task.priority;
nested["coreId"] = task.coreId;
}
serializeJson(doc, message);
_socket->emit(EVENT_ANALYTICS, message);
vTaskDelayUntil(&xLastWakeTime, ANALYTICS_INTERVAL / portTICK_PERIOD_MS);
} }
}; };
StaticJsonDocument<MAX_ESP_ANALYTICS_SIZE> doc;
char message[MAX_ESP_ANALYTICS_SIZE];
private:
EventSocket *_socket;
TaskManager *_taskManager;
unsigned long _lastUpdate;
void updateAnalytics() {
doc.clear();
doc["uptime"] = millis() / 1000;
doc["free_heap"] = ESP.getFreeHeap();
doc["total_heap"] = ESP.getHeapSize();
doc["min_free_heap"] = ESP.getMinFreeHeap();
doc["max_alloc_heap"] = ESP.getMaxAllocHeap();
doc["fs_used"] = ESPFS.usedBytes();
doc["fs_total"] = ESPFS.totalBytes();
doc["core_temp"] = temperatureRead();
doc["cpu0_usage"] = _taskManager->getCpuUsage(0);
doc["cpu1_usage"] = _taskManager->getCpuUsage(1);
doc["cpu_usage"] = _taskManager->getCpuUsage();
// Add _taskManager->getTaskNames() as a JSON array
JsonArray tasks = doc.createNestedArray("tasks");
for (auto const &task : _taskManager->getTasks())
{
JsonObject nested = tasks.createNestedObject();
nested["name"] = task.name;
nested["stackSize"] = task.stackSize;
nested["priority"] = task.priority;
nested["coreId"] = task.coreId;
}
serializeJson(doc, message);
_socket->emit(EVENT_ANALYTICS, message);
}
}; };
esp32/lib/ESP32-sveltekit/ESP32SvelteKit.cpp
+4 -1
View File
@@ -183,12 +183,15 @@ void ESP32SvelteKit::startServices() {
_fileExplorer.begin(); _fileExplorer.begin();
} }
void ESP32SvelteKit::_loop() { void IRAM_ATTR ESP32SvelteKit::_loop() {
while (1) { while (1) {
_wifiSettingsService.loop(); _wifiSettingsService.loop();
_apSettingsService.loop(); _apSettingsService.loop();
#if FT_ENABLED(FT_MQTT) #if FT_ENABLED(FT_MQTT)
_mqttSettingsService.loop(); _mqttSettingsService.loop();
#endif
#if FT_ENABLED(FT_ANALYTICS)
_analyticsService.loop();
#endif #endif
vTaskDelay(20 / portTICK_PERIOD_MS); vTaskDelay(20 / portTICK_PERIOD_MS);
} }