Moved handle_dns_announce and dnsannounce into task manager

This commit is contained in:
2021-12-19 23:40:41 +01:00
parent 0adb55c668
commit 95ae227a97
6 changed files with 21 additions and 12 deletions

View File

@ -11,6 +11,11 @@
#include "lwip/dns.h" #include "lwip/dns.h"
#include "globals.h" #include "globals.h"
void init_dns_announce()
{
}
void handle_dns_announce() void handle_dns_announce()
{ {
const auto staStatus = wifi_stack::get_sta_status(); const auto staStatus = wifi_stack::get_sta_status();

View File

@ -1,2 +1,4 @@
#pragma once #pragma once
void init_dns_announce();
void handle_dns_announce(); void handle_dns_announce();

View File

@ -49,6 +49,11 @@ uint16_t getEfficiencyClassColor()
else return 0xF800; else return 0xF800;
} }
void initStatistics()
{
}
void calculateStatistics() void calculateStatistics()
{ {
EVERY_N_MILLIS( 10 ) { EVERY_N_MILLIS( 10 ) {

View File

@ -16,6 +16,7 @@ struct DrivingStatistics
extern DrivingStatistics drivingStatistics; extern DrivingStatistics drivingStatistics;
void initStatistics();
void calculateStatistics(); void calculateStatistics();
float getAvgWhPerKm(); float getAvgWhPerKm();
std::string getEfficiencyClassString(); std::string getEfficiencyClassString();

View File

@ -10,9 +10,6 @@ constexpr const char * const TAG = "BOBBY";
// esp-idf includes // esp-idf includes
#include <esp_log.h> #include <esp_log.h>
// Arduino includes
#include <Arduino.h>
// 3rdparty lib includes // 3rdparty lib includes
#include <espchrono.h> #include <espchrono.h>
using namespace std::chrono_literals; using namespace std::chrono_literals;
@ -31,10 +28,6 @@ using namespace std::chrono_literals;
#include "displays/statusdisplay.h" #include "displays/statusdisplay.h"
#include "displays/lockscreen.h" #include "displays/lockscreen.h"
#include "displays/calibratedisplay.h" #include "displays/calibratedisplay.h"
#ifdef FEATURE_DNS_NS
#include "dnsannounce.h"
#endif
#include "drivingstatistics.h"
#include "newsettings.h" #include "newsettings.h"
#include "taskmanager.h" #include "taskmanager.h"
@ -151,11 +144,6 @@ extern "C" void app_main()
lastStatsPush = now; lastStatsPush = now;
} }
#ifdef FEATURE_DNS_NS
handle_dns_announce();
#endif
calculateStatistics();
if (battery::bootBatPercentage == -1) if (battery::bootBatPercentage == -1)
{ {
if(controllers.front.feedbackValid && controllers.back.feedbackValid) if(controllers.front.feedbackValid && controllers.back.feedbackValid)

View File

@ -73,6 +73,10 @@
#include "udpcloud.h" #include "udpcloud.h"
#endif #endif
#include "modes.h" #include "modes.h"
#include "drivingstatistics.h"
#ifdef FEATURE_DNS_NS
#include "dnsannounce.h"
#endif
using namespace std::chrono_literals; using namespace std::chrono_literals;
@ -143,6 +147,10 @@ espcpputils::SchedulerTask schedulerTasksArr[] {
espcpputils::SchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms }, espcpputils::SchedulerTask { "udpcloud", udpCloudInit, udpCloudUpdate, 50ms },
#endif #endif
espcpputils::SchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms }, espcpputils::SchedulerTask { "drivingmode", initDrivingMode, updateDrivingMode, 20ms },
espcpputils::SchedulerTask { "drivingstatistics", initStatistics, calculateStatistics, 100ms },
#ifdef FEATURE_DNS_NS
espcpputils::SchedulerTask { "dnsannounce", init_dns_announce, handle_dns_announce, 100ms },
#endif
}; };
} // namespace } // namespace