🔦 Reduces flash size by making analytic synchronous
This commit is contained in:
@@ -31,23 +31,27 @@ public:
|
||||
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()
|
||||
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;
|
||||
char message[MAX_ESP_ANALYTICS_SIZE];
|
||||
while (1)
|
||||
{
|
||||
|
||||
private:
|
||||
EventSocket *_socket;
|
||||
TaskManager *_taskManager;
|
||||
unsigned long _lastUpdate;
|
||||
|
||||
void updateAnalytics() {
|
||||
doc.clear();
|
||||
doc["uptime"] = millis() / 1000;
|
||||
doc["free_heap"] = ESP.getFreeHeap();
|
||||
@@ -73,8 +77,5 @@ protected:
|
||||
|
||||
serializeJson(doc, message);
|
||||
_socket->emit(EVENT_ANALYTICS, message);
|
||||
|
||||
vTaskDelayUntil(&xLastWakeTime, ANALYTICS_INTERVAL / portTICK_PERIOD_MS);
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -183,12 +183,15 @@ void ESP32SvelteKit::startServices() {
|
||||
_fileExplorer.begin();
|
||||
}
|
||||
|
||||
void ESP32SvelteKit::_loop() {
|
||||
void IRAM_ATTR ESP32SvelteKit::_loop() {
|
||||
while (1) {
|
||||
_wifiSettingsService.loop();
|
||||
_apSettingsService.loop();
|
||||
#if FT_ENABLED(FT_MQTT)
|
||||
_mqttSettingsService.loop();
|
||||
#endif
|
||||
#if FT_ENABLED(FT_ANALYTICS)
|
||||
_analyticsService.loop();
|
||||
#endif
|
||||
vTaskDelay(20 / portTICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user