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

added digital control to manualControl

Browse Source
This commit is contained in:
kleiax
2023-08-08 14:48:15 +02:00
parent 4540966f87
commit 115da0f8a8
5 changed files with 96 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SpecialMenus/driveModi/ManualDrive/menuManualDrive.cpp
+27 -16
View File
@@ -27,45 +27,53 @@ void MenuManualControl::printPage() const {
break;
case 1:
lineOne = "Speed: ";
lineOne.concat(this->manualControl->getMaxSpeed());
lineTwo = "Increase by 0.1";
lineOne = "Input mode:";
if (this->manualControl->getInputMode() == ManualControl::InputMode::Analog)
lineTwo = "Analog";
else
lineTwo = "Digital";
break;
case 2:
lineOne = "Speed: ";
lineOne.concat(this->manualControl->getMaxSpeed());
lineTwo = "Decrease by 0.1";
lineTwo = "Increase by 0.1";
break;
case 3:
lineOne = "RotSpeed: ";
lineOne.concat(this->manualControl->getMaxRotation());
lineTwo = "Increase by 0.1";
lineOne = "Speed: ";
lineOne.concat(this->manualControl->getMaxSpeed());
lineTwo = "Decrease by 0.1";
break;
case 4:
lineOne = "RotSpeed: ";
lineOne.concat(this->manualControl->getMaxRotation());
lineTwo = "Decrease by 0.1";
lineTwo = "Increase by 0.1";
break;
case 5:
lineOne = "RotSpeed: ";
lineOne.concat(this->manualControl->getMaxRotation());
lineTwo = "Decrease by 0.1";
break;
case 6:
lineOne = "Dutycycle Left:";
lineTwo.concat(this->manualControl->getDutycycleLeft());
break;
case 6:
case 7:
lineOne = "Dutycycle Right:";
lineTwo.concat(this->manualControl->getDutycycleRight());
break;
case 7:
case 8:
lineOne = "Azimuth:";
lineTwo.concat(this->driveManager->getNavigation()->getAzimuth());
break;
case 8: {
case 9: {
UBX_NAV_PVT_data_t* gpsData = this->driveManager->getNavigation()->getUbxData();
lineOne = "magDec: ";
lineTwo = "magAcc: ";
@@ -91,28 +99,31 @@ void MenuManualControl::init() {
this->firstPrint = false;
this->driveManager->changeModus(Modi::ManualControl);
this->manualControl = (ManualControl*) this->driveManager->getDriveModiPtr();
this->setCountPages(9);
this->setCountPages(10);
this->updateDelay = 500;
}
void MenuManualControl::runCommand() const {
switch (this->getCurrentPage()) {
case 1:
this->manualControl->increaseMaxSpeed();
this->manualControl->switchInputMode();
break;
case 2:
this->manualControl->decreaseMaxSpeed();
this->manualControl->increaseMaxSpeed();
break;
case 3:
this->manualControl->increaseMaxRotation();
this->manualControl->decreaseMaxSpeed();
break;
case 4:
this->manualControl->increaseMaxRotation();
break;
case 5:
this->manualControl->increaseMaxRotation();
break;
default:
break;