spelling
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <Arduino.h>
|
||||
|
||||
#include "controllPadInput.h"
|
||||
#include "controlPadInput.h"
|
||||
#include "menuInformationSites.h"
|
||||
#include "battery.h"
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "driveModi/Modi/Autopilot/autopilot.h"
|
||||
|
||||
Autopilot::Autopilot(MoveControl* moveControl, const ControllPadInput *input, Navigation* navigation)
|
||||
Autopilot::Autopilot(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation)
|
||||
: ManualControl(moveControl, input) {
|
||||
this->navigation = navigation;
|
||||
this->navigationStarted = this->navigation->startNavigation();
|
||||
@@ -45,7 +45,7 @@ void Autopilot::runAutopilot() {
|
||||
this->selfDrivingAvailable = true;
|
||||
|
||||
if (!this->selfDriving && this->selfDrivingAvailable)
|
||||
this->setSelfDriving(ControllPadButton::isControllPadButtonPressed(this->input, ControllPadButton::PadButton::Action));
|
||||
this->setSelfDriving(ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action));
|
||||
|
||||
if (this->routeInfo.currentPoint == this->routeInfo.totalPoints) {
|
||||
this->navigationEnded = true;
|
||||
|
||||
@@ -35,7 +35,7 @@ class Autopilot : public ManualControl {
|
||||
* @param moveControl for ManualControl
|
||||
* @param navigation for route instructions
|
||||
*/
|
||||
Autopilot(MoveControl* moveControl, const ControllPadInput *input, Navigation* navigation);
|
||||
Autopilot(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation);
|
||||
|
||||
/**
|
||||
* @brief Calls runAutopilot or ManualControl loop
|
||||
@@ -50,7 +50,7 @@ class Autopilot : public ManualControl {
|
||||
void loop();
|
||||
|
||||
/**
|
||||
* @brief Manges the autoipilot
|
||||
* @brief Manges the autopilot
|
||||
*
|
||||
* If the first Point is near to current location you can turn
|
||||
* the autopilot on.
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "driveModi/Modi/CaptureRoute/captureRoute.h"
|
||||
|
||||
CaptureRoute::CaptureRoute(MoveControl* moveControl, const ControllPadInput *input, Navigation* navigation)
|
||||
CaptureRoute::CaptureRoute(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation)
|
||||
: ManualControl(moveControl, input) {
|
||||
this->navigation = navigation;
|
||||
this->routeInfo = navigation->getRouteInfo();
|
||||
@@ -28,7 +28,7 @@ void CaptureRoute::loop() {
|
||||
}
|
||||
|
||||
void CaptureRoute::runCaptureRoute() {
|
||||
if (ControllPadButton::isControllPadButtonPressed(this->input, ControllPadButton::PadButton::Action)) {
|
||||
if (ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action)) {
|
||||
if (this->navigation->addCurrentPosToRoute()) {
|
||||
this->routeInfo = navigation->getRouteInfo();
|
||||
this->updateDisplay = true;
|
||||
|
||||
@@ -33,7 +33,7 @@ class CaptureRoute : public ManualControl {
|
||||
* @param moveControl for ManualControl
|
||||
* @param navigation to add Points
|
||||
*/
|
||||
CaptureRoute(MoveControl* moveControl, const ControllPadInput *input, Navigation* navigation);
|
||||
CaptureRoute(MoveControl* moveControl, const ControlPadInput *input, Navigation* navigation);
|
||||
|
||||
/**
|
||||
* @brief Calls runCaptureRoute and ManualControl::loop
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
*/
|
||||
#include "manualControl.h"
|
||||
|
||||
ManualControl::ManualControl(MoveControl *moveControl, const ControllPadInput *input) {
|
||||
ManualControl::ManualControl(MoveControl *moveControl, const ControlPadInput *input) {
|
||||
this->moveControl = moveControl;
|
||||
this->input = input;
|
||||
this->moveControl->setDrivingStatus(DrivingStatus::drive);
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
#include "moveControl.h"
|
||||
#include "driveModi/driveModi.h"
|
||||
#include "controllPadInput.h"
|
||||
#include "controlPadInput.h"
|
||||
|
||||
/**
|
||||
* @brief Drive the Rover with a Joystick
|
||||
@@ -25,7 +25,7 @@
|
||||
*/
|
||||
class ManualControl : public DriveModi {
|
||||
public:
|
||||
ManualControl(MoveControl *moveControl, const ControllPadInput *input);
|
||||
ManualControl(MoveControl *moveControl, const ControlPadInput *input);
|
||||
|
||||
/**
|
||||
* @brief Destroy the Manual Control object
|
||||
@@ -72,7 +72,7 @@ class ManualControl : public DriveModi {
|
||||
|
||||
protected:
|
||||
MoveControl *moveControl;
|
||||
const ControllPadInput* input;
|
||||
const ControlPadInput* input;
|
||||
|
||||
private:
|
||||
uint32_t lastMillis = 0;
|
||||
|
||||
@@ -15,7 +15,7 @@ Modi& operator++(Modi& m, int) {
|
||||
return m = (m == Modi::TestMode) ? Modi::Off : static_cast<Modi>(static_cast<int>(m)+1);
|
||||
}
|
||||
|
||||
DriveManager::DriveManager(MoveControl *moveControl, const ControllPadInput *input, bool wifi) {
|
||||
DriveManager::DriveManager(MoveControl *moveControl, const ControlPadInput *input, bool wifi) {
|
||||
this->moveControl = moveControl;
|
||||
this->input = input;
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "config.h"
|
||||
#include "networkConfig.h"
|
||||
#include "debugTimes.h"
|
||||
#include "controllPadInput.h"
|
||||
#include "controlPadInput.h"
|
||||
|
||||
// All Drive Modi
|
||||
#include "driveModi/Modi/ManualControl/manualControl.h"
|
||||
@@ -52,7 +52,7 @@ class DriveManager {
|
||||
*
|
||||
* @param moveControl
|
||||
*/
|
||||
DriveManager(MoveControl *moveControl, const ControllPadInput *input, bool wifi = false);
|
||||
DriveManager(MoveControl *moveControl, const ControlPadInput *input, bool wifi = false);
|
||||
|
||||
/**
|
||||
* @brief Destroy the Drive Manager object
|
||||
@@ -118,7 +118,7 @@ class DriveManager {
|
||||
private:
|
||||
Modi currentModus = Modi::Off;
|
||||
MoveControl *moveControl;
|
||||
const ControllPadInput* input;
|
||||
const ControlPadInput* input;
|
||||
DriveModi *currentModusPtr = nullptr;
|
||||
Navigation* navigation;
|
||||
SPIClass* spiPort;
|
||||
|
||||
+6
-6
@@ -29,7 +29,7 @@
|
||||
#include "debugMqtt.h"
|
||||
#include "battery.h"
|
||||
#include "debugTimes.h"
|
||||
#include "controllPad.h"
|
||||
#include "controlPad.h"
|
||||
|
||||
#include "menu.h"
|
||||
#include "menuAction.h"
|
||||
@@ -50,7 +50,7 @@ LcdWrapper* lcdWrapper;
|
||||
OutputBuf* outputBuf;
|
||||
DebugMqtt* debugMqtt = nullptr;
|
||||
Battery* mainBattery;
|
||||
ControllPad* controllPad;
|
||||
ControlPad* controlPad;
|
||||
|
||||
bool wifiIsActive;
|
||||
|
||||
@@ -66,8 +66,8 @@ void setup() {
|
||||
char wifiIndicator = 'X';
|
||||
|
||||
mainBattery = new Battery(35, 692000, 218500);
|
||||
controllPad = new ControllPad();
|
||||
controllPad->setMenuControll(main_m);
|
||||
controlPad = new ControlPad();
|
||||
controlPad->setMenuControl(main_m);
|
||||
|
||||
Wire.begin(21, 19);
|
||||
Wire.setClock(400000);
|
||||
@@ -97,7 +97,7 @@ void setup() {
|
||||
std::cout << "Welcome to Kleiax-Rover" << std::endl;
|
||||
std::cout << "All actions from the main program run on Core -> " << xPortGetCoreID() << std::endl;
|
||||
|
||||
driveManager = new DriveManager(&moveController, controllPad->getControllPadDataPtr(), wifiIsActive);
|
||||
driveManager = new DriveManager(&moveController, controlPad->getControlPadDataPtr(), wifiIsActive);
|
||||
|
||||
outputBuf->activateMqtt(false);
|
||||
|
||||
@@ -120,7 +120,7 @@ void loop() {
|
||||
wifiTime.stopConsol("WiFi-Time", 10);
|
||||
}
|
||||
driveManager->loop();
|
||||
controllPad->loop();
|
||||
controlPad->loop();
|
||||
lcdWrapper->loop();
|
||||
|
||||
mainBattery->loop();
|
||||
|
||||
Reference in New Issue
Block a user