🔦 Reduces flash size by making analytic synchronous

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
+17 -16
View File
@@ -25,29 +25,33 @@
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); _socket->registerEvent(EVENT_ANALYTICS);
_taskManager->createTask(&AnalyticsService::_loopImpl, "Analytics Service", 8120, this, tskIDLE_PRIORITY, nullptr,
ESP32SVELTEKIT_RUNNING_CORE);
}; };
protected: void loop()
EventSocket *_socket;
TaskManager *_taskManager;
static void _loopImpl(void *_this) { static_cast<AnalyticsService *>(_this)->_loop(); }
void _loop()
{ {
TickType_t xLastWakeTime = xTaskGetTickCount(); unsigned long currentMillis = millis();
if (!_lastUpdate || (currentMillis - _lastUpdate) >= ANALYTICS_INTERVAL)
{
_lastUpdate = currentMillis;
updateAnalytics();
}
};
StaticJsonDocument<MAX_ESP_ANALYTICS_SIZE> doc; StaticJsonDocument<MAX_ESP_ANALYTICS_SIZE> doc;
char message[MAX_ESP_ANALYTICS_SIZE]; char message[MAX_ESP_ANALYTICS_SIZE];
while (1)
{ private:
EventSocket *_socket;
TaskManager *_taskManager;
unsigned long _lastUpdate;
void updateAnalytics() {
doc.clear(); doc.clear();
doc["uptime"] = millis() / 1000; doc["uptime"] = millis() / 1000;
doc["free_heap"] = ESP.getFreeHeap(); doc["free_heap"] = ESP.getFreeHeap();
@@ -73,8 +77,5 @@ protected:
serializeJson(doc, message); serializeJson(doc, message);
_socket->emit(EVENT_ANALYTICS, message); _socket->emit(EVENT_ANALYTICS, message);
vTaskDelayUntil(&xLastWakeTime, ANALYTICS_INTERVAL / portTICK_PERIOD_MS);
} }
};
}; };
+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);
} }