feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved ble to taskmanager

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-19 04:48:12 +01:00
parent 04515eecb5
commit be53c39ebf
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/main.cpp
View File

@@ -27,9 +27,6 @@ using namespace std::chrono_literals;
#include "screens.h" #include "screens.h"
#include "presets.h" #include "presets.h"
#include "statistics.h" #include "statistics.h"
#ifdef FEATURE_BLE
#include "ble_bobby.h"
#endif
#ifdef FEATURE_WEBSERVER #ifdef FEATURE_WEBSERVER
#include "webserver.h" #include "webserver.h"
#endif #endif
@@ -60,9 +57,6 @@ std::optional<espchrono::millis_clock::time_point> lastModeUpdate;
std::optional<espchrono::millis_clock::time_point> lastStatsUpdate; std::optional<espchrono::millis_clock::time_point> lastStatsUpdate;
std::optional<espchrono::millis_clock::time_point> lastDisplayUpdate; std::optional<espchrono::millis_clock::time_point> lastDisplayUpdate;
std::optional<espchrono::millis_clock::time_point> lastDisplayRedraw; std::optional<espchrono::millis_clock::time_point> lastDisplayRedraw;
#ifdef FEATURE_BLE
std::optional<espchrono::millis_clock::time_point> lastBleUpdate;
#endif
#ifdef FEATURE_CLOUD #ifdef FEATURE_CLOUD
std::optional<espchrono::millis_clock::time_point> lastCloudCollect; std::optional<espchrono::millis_clock::time_point> lastCloudCollect;
std::optional<espchrono::millis_clock::time_point> lastCloudSend; std::optional<espchrono::millis_clock::time_point> lastCloudSend;
@@ -128,11 +122,6 @@ extern "C" void app_main()
currentMode = &modes::defaultMode; currentMode = &modes::defaultMode;
#ifdef FEATURE_BLE
bootLabel.redraw("ble");
initBle();
#endif
#ifdef FEATURE_WEBSERVER #ifdef FEATURE_WEBSERVER
bootLabel.redraw("webserver"); bootLabel.redraw("webserver");
initWebserver(); initWebserver();
@@ -230,15 +219,6 @@ extern "C" void app_main()
performance.lastTime = now; performance.lastTime = now;
} }
#ifdef FEATURE_BLE
if (!lastBleUpdate || now - *lastBleUpdate >= 250ms)
{
handleBle();
lastBleUpdate = now;
}
#endif
#ifdef FEATURE_ESPNOW #ifdef FEATURE_ESPNOW
espnow::handle(); espnow::handle();
#endif #endif

6
main/taskmanager.cpp
View File

@@ -51,6 +51,9 @@
#ifdef FEATURE_OTA #ifdef FEATURE_OTA
#include "ota.h" #include "ota.h"
#endif #endif
#ifdef FEATURE_BLE
#include "ble_bobby.h"
#endif
using namespace std::chrono_literals; using namespace std::chrono_literals;
@@ -99,6 +102,9 @@ espcpputils::SchedulerTask schedulerTasksArr[] {
#ifdef FEATURE_OTA #ifdef FEATURE_OTA
espcpputils::SchedulerTask { "ota", initOta, handleOta, 50ms }, espcpputils::SchedulerTask { "ota", initOta, handleOta, 50ms },
#endif #endif
#ifdef FEATURE_BLE
espcpputils::SchedulerTask { "ble", initBle, handleBle, 100ms },
#endif
}; };
} // namespace } // namespace