kleiax/Bachelorarbeit-Rover
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fixed to fast switching between autopilot mode

Browse Source
This commit is contained in:
kleiax
2023-05-24 13:48:24 +02:00
parent 74d56576ae
commit 6a2a437e21
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/driveModi/Modi/Autopilot/autopilot.cpp
+8 -6
View File
@@ -57,16 +57,18 @@ void Autopilot::runAutopilot() {
if (this->routeInfo.currentPoint >= 2 && this->state == State::GetToStartPoint) if (this->routeInfo.currentPoint >= 2 && this->state == State::GetToStartPoint)
this->state = State::SelfDrivingAvailable; this->state = State::SelfDrivingAvailable;
if (this->state == State::SelfDrivingAvailable if (ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action)
&& ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action)) { && millis() - this->lastAutopilotChangeMillis > this->autopilotChangeDelayMillis) {
if (this->state == State::SelfDrivingAvailable) {
this->state = State::SelfDriving; this->state = State::SelfDriving;
this->updateDisplay = true; this->updateDisplay = true;
} this->lastAutopilotChangeMillis = millis();
} else if (this->state == State::SelfDriving) {
if (this->state == State::SelfDriving
&& ControlPadButton::isControlPadButtonPressed(this->input, ControlPadButton::PadButton::Action)) {
this->state = State::SelfDrivingAvailable; this->state = State::SelfDrivingAvailable;
this->updateDisplay = true; this->updateDisplay = true;
this->lastAutopilotChangeMillis = millis();
}
} }
if (this->state == State::SelfDriving) { if (this->state == State::SelfDriving) {
src/driveModi/Modi/Autopilot/autopilot.h
+2
View File
@@ -126,9 +126,11 @@ class Autopilot : public ManualControl {
uint8_t ntripReconnectMaxAttemps = 10; uint8_t ntripReconnectMaxAttemps = 10;
uint16_t displayUpdateDelayMillis = 1000; uint16_t displayUpdateDelayMillis = 1000;
uint16_t reconnectNtripDelayMillis = 1000; uint16_t reconnectNtripDelayMillis = 1000;
uint16_t autopilotChangeDelayMillis = 500;
uint32_t displayUpdateLastMillis = 0; uint32_t displayUpdateLastMillis = 0;
uint32_t loopLastMillis = 0; uint32_t loopLastMillis = 0;
uint32_t reconnectNtripLastMillis = 0; uint32_t reconnectNtripLastMillis = 0;
uint32_t lastAutopilotChangeMillis = 0;
}; };
#endif // AUTOPILOT_H #endif // AUTOPILOT_H