From d0c5421ad9239132e9ff6ba8761937d45e74e6d8 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Sat, 23 Sep 2023 16:38:34 +0200 Subject: [PATCH] - fix driveManager quit mode - change com port - edit todos --- doc/TODO allgemein.txt | 6 ------ platformio.ini | 4 ++-- src/driveModi/driveManager.cpp | 3 ++- src/driveModi/driveManager.h | 6 ------ 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/doc/TODO allgemein.txt b/doc/TODO allgemein.txt index b704681..cd314ed 100644 --- a/doc/TODO allgemein.txt +++ b/doc/TODO allgemein.txt @@ -49,13 +49,7 @@ Code: Latex: Anhang: Liste mit allen Komponenten und Kurzbeschreibung Unterschied funktionale und nicht funktionale Anforderungen - Weniger / Keine Füllwörter Strom nicht über Zeit sondern Rampe - ESP Pulsecounter Name Richtig? - Zittern? Besseres Wort Signal kann Springen - Rad Umfang gerundet - Trick Debugging mit dem Stream - Gyroskop für Bachelor aufheben 3D: diff --git a/platformio.ini b/platformio.ini index c5bc22d..802f7b1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,7 +15,7 @@ board_build.partitions = no_ota.csv framework = arduino monitor_speed = 115200 upload_speed = 921600 -monitor_port = COM6 +monitor_port = COM3 lib_deps = https://git.kleiax.de/PlatformIO-Libs/SparkFunGNSS.git knolleary/PubSubClient@^2.8 @@ -26,7 +26,7 @@ lib_deps = https://git.kleiax.de/PlatformIO-Libs/Menu.git nrf24/RF24@^1.4.5 jrowberg/I2Cdevlib-MPU6050@^1.0.0 -upload_port = COM6 +upload_port = COM3 test_ignore = test_desktop build_type = debug monitor_filters = esp32_exception_decoder diff --git a/src/driveModi/driveManager.cpp b/src/driveModi/driveManager.cpp index 1631264..dc948ee 100644 --- a/src/driveModi/driveManager.cpp +++ b/src/driveModi/driveManager.cpp @@ -34,9 +34,10 @@ void DriveManager::changeModus(DriveModi* modus) { this->currentModusPtr = modus; - if (this->currentModusPtr) + if (this->currentModusPtr) { this->currentModusPtr->activate(this->driveModiParams); this->addChildComponent(this->currentModusPtr); + } } void DriveManager::init() { diff --git a/src/driveModi/driveManager.h b/src/driveModi/driveManager.h index f62c4e2..ab70f61 100644 --- a/src/driveModi/driveManager.h +++ b/src/driveModi/driveManager.h @@ -32,12 +32,6 @@ class DriveManager : public Component { DriveManager(MoveControl *moveControl, const SensorData* sensorData, const ControlPadInput *input); DriveManager(DriveModiParams params); - /** - * @brief Destroy the Drive Manager object - * - */ - ~DriveManager(); - /** * @brief Change the DriveModi to a specific value *