diff --git a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp index 142d4feebb675e3b789ecb8f1d2e2d31639032ba..acc60f4784cd38c909d1581f198a7d77cdb7ed45 100644 --- a/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp +++ b/modules/catkin_ws/src/car/src/mainNode/PlatoonController.cpp @@ -19,7 +19,7 @@ PlatoonController::PlatoonController(platoonProtocol::VehicleFacade& c2c, {} -void car::PlatoonController::run() +void PlatoonController::run() { std::cout << "PlatoonController was run." << std::endl; @@ -43,18 +43,21 @@ void car::PlatoonController::run() } -void car::PlatoonController::run_ACC() { +void PlatoonController::run_ACC() { bool inPlatoon = c2c.isPlatoonRunning(); bool wantsPlatoon = pc->isPlatoonEnabled().get(); // platoonProtocol::PlatoonSpeed PS = pc.getPlatoonSpeed(); } -void car::PlatoonController::run_CACC_FV() { +void PlatoonController::run_CACC_FV() { bool inPlatoon = c2c.isPlatoonRunning(); - platoonProtocol::PlatoonConfig platoonConfig = c2c.getPlatoonConfig(); bool wantsPlatoon = pc->isPlatoonEnabled().get(); + // Although this value will not be used in this method it still + // needs to be updated, so the new value can be pulled be CC + platoonConfig = c2c.getPlatoonConfig(); + std::cout << "Running PlatoonController::run_CACC_FV: inPlatoon = " << inPlatoon << ", wantsPlatoon = " << wantsPlatoon << std::endl; @@ -74,7 +77,7 @@ void car::PlatoonController::run_CACC_FV() { return; } -void car::PlatoonController::run_CACC_LV() { +void PlatoonController::run_CACC_LV() { }