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

remove all PS3 things and begin with ControllPad

Browse Source
This commit is contained in:
kleiax
2023-03-30 22:20:28 +02:00
parent e4cdc5f98d
commit 33fe6916ed
16 changed files with 182 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/driveModi/driveManager.cpp
+5 -5
View File
@@ -15,9 +15,9 @@ Modi& operator++(Modi& m, int) {
return m = (m == Modi::TestMode) ? Modi::Off : static_cast<Modi>(static_cast<int>(m)+1);
}
DriveManager::DriveManager(MoveControl *moveControl, Ps3Controller *gamepad, bool wifi) {
DriveManager::DriveManager(MoveControl *moveControl, const ControllPadInput *input, bool wifi) {
this->moveControl = moveControl;
this->gamepad = gamepad;
this->input = input;
this->spiPort = new SPIClass(HSPI);
spiPort->begin(UBLOX_GNSS_SPI_SCK, UBLOX_GNSS_SPI_CIPO, UBLOX_GNSS_SPI_COPI, UBLOX_GNSS_SPI_CS);
@@ -66,17 +66,17 @@ void DriveManager::changeModus(Modi modus) {
break;
case Modi::ManualControl: {
this->currentModusPtr = new ManualControl(this->moveControl, this->gamepad);
this->currentModusPtr = new ManualControl(this->moveControl, this->input);
}
break;
case Modi::CaptureRoute: {
this->currentModusPtr = new CaptureRoute(this->moveControl, this->gamepad, this->navigation);
this->currentModusPtr = new CaptureRoute(this->moveControl, this->input, this->navigation);
}
break;
case Modi::Autopilot: {
this->currentModusPtr = new Autopilot(this->moveControl, this->gamepad, this->navigation);
this->currentModusPtr = new Autopilot(this->moveControl, this->input, this->navigation);
}
break;