Start with Capture Route

This commit is contained in:
2022-01-31 21:12:11 +01:00
parent ab4ceb8b09
commit d356b28ffb
24 changed files with 327 additions and 320 deletions
@@ -1,22 +1,14 @@
#include "driveModi/Modi/CaptureRoute/captureRoute.h"
CaptureRoute::CaptureRoute() {
CaptureRoute::CaptureRoute(MoveControl* moveControl, Navigation* navigation)
: ManualControl(moveControl) {
this->navigation = navigation;
}
void CaptureRoute::init() {
void CaptureRoute::loop() {
ManualControl::loop();
}
void CaptureRoute::runCaptureRoute() {
// this->runManualControl();
// static uint64_t last_millis = 0;
// if (millis() - last_millis < RUN_CAPTuRE_ROUTE_DELAY) {
// return;
// }
// last_millis = millis();
//Add Point to route
// this->route->addCurrentLocationToRoute();
}
@@ -1,21 +1,20 @@
#ifndef CAPTURE_ROUTE_H
#define CAPTURE_ROUTE_H
#include <iostream>
#include "driveModi/Modi/ManualControl/manualControl.h"
// #include "route.h"
#include "navigation.h"
#include "config.h"
class CaptureRoute : ManualControl {
class CaptureRoute : public ManualControl {
public:
CaptureRoute();
CaptureRoute(MoveControl* moveControl, Navigation* navigation);
void init();
void loop();
void runCaptureRoute();
private:
// Route *route;
// DebugMqtt *debug;
Navigation* navigation;
};
#endif // CAPTURE_ROUTE_H
@@ -10,7 +10,10 @@
*/
#include "manualControl.h"
ManualControl::ManualControl() { }
ManualControl::ManualControl(MoveControl *moveControl) {
this->moveControl = moveControl;
this->moveControl->setDrivingStatus(DrivingStatus::drive);
}
ManualControl::~ManualControl() {
this->moveControl->setSpeed(0);
@@ -18,11 +21,6 @@ ManualControl::~ManualControl() {
this->moveControl->setDrivingStatus(DrivingStatus::stop);
}
void ManualControl::init(MoveControl *moveControl) {
this->moveControl = moveControl;
this->moveControl->setDrivingStatus(DrivingStatus::drive);
}
void ManualControl::loop() {
static uint32_t last_millis = 0;
if (millis() - last_millis < delay) {
@@ -26,7 +26,7 @@
*/
class ManualControl : public DriveModi{
public:
ManualControl();
ManualControl(MoveControl *moveControl);
/**
* @brief Destroy the Manual Control object
@@ -34,15 +34,6 @@ class ManualControl : public DriveModi{
*/
~ManualControl();
/**
* @brief Initalize ManualControl
*
* set DrivingStatus::drive
*
* @param moveControl
*/
void init(MoveControl *moveControl);
/**
* @brief Calls runManualControl() to update all values.
*