Moved can into task manager

This commit is contained in:
2021-12-19 03:33:51 +01:00
parent 514f993b9c
commit 8210c57dff
9 changed files with 15 additions and 64 deletions

View File

@@ -38,9 +38,6 @@ using namespace std::chrono_literals;
#ifdef FEATURE_WEBSERVER
#include "webserver.h"
#endif
#ifdef FEATURE_CAN
#include "can.h"
#endif
#ifdef FEATURE_CLOUD
#include "cloud.h"
#include "udpcloud.h"
@@ -68,9 +65,6 @@ std::optional<espchrono::millis_clock::time_point> lastModeUpdate;
std::optional<espchrono::millis_clock::time_point> lastStatsUpdate;
std::optional<espchrono::millis_clock::time_point> lastDisplayUpdate;
std::optional<espchrono::millis_clock::time_point> lastDisplayRedraw;
#ifdef FEATURE_CAN
std::optional<espchrono::millis_clock::time_point> lastCanParse;
#endif
#ifdef FEATURE_BLE
std::optional<espchrono::millis_clock::time_point> lastBleUpdate;
#endif
@@ -133,11 +127,6 @@ extern "C" void app_main()
task.setup();
}
#ifdef FEATURE_CAN
bootLabel.redraw("can");
can::initCan();
#endif
#ifdef FEATURE_SERIAL
bootLabel.redraw("front Serial begin");
controllers.front.serial.get().begin(38400, SERIAL_8N1, PINS_RX1, PINS_TX1);
@@ -266,16 +255,6 @@ extern "C" void app_main()
performance.lastTime = now;
}
#ifdef FEATURE_CAN
if (!lastCanParse || now - *lastCanParse >= 1000ms/settings.boardcomputerHardware.timersSettings.canReceiveRate)
{
//can::tryParseCanInput();
can::parseCanInput();
lastCanParse = now;
}
#endif
#ifdef FEATURE_SERIAL
for (Controller &controller : controllers)
controller.parser.update();