Skip to content
Snippets Groups Projects
Commit 5b59f6d5 authored by Franz Bethke's avatar Franz Bethke
Browse files

fixed typos -> now running

parent 0816eec7
No related merge requests found
......@@ -41,7 +41,7 @@ private:
bool wantsPlatoon = false;
// TODO check these values!
PlatoonConfig platoonConfig {50.0, 0.0}; // IPD=50.0 PS=0.0
platoonProtocol::PlatoonConfig platoonConfig {50.0, 0.0}; // IPD=50.0 PS=0.0
float desSpeed = 0.0;
// METHODS
......
......@@ -22,7 +22,7 @@ MainNode::MainNode(ros::NodeHandle & nh, std::string & name) :
egoMotion.cruiseControllerNotify = cruiseControllerNotify;
egoMotion.platoonControllerNotify = platoonControllerNotify;
platoonController.cruiseControllerNotify = cruiseControllerNotify;
// std::cout << "Called MainNode(ros::NodeHandle & nh, std::string & name)." << std::endl;
// pc->reciveCommands([this] (auto commandCode) {platoonControllerThread.notify();} )
}
MainNode::MainNode() :
......@@ -41,7 +41,7 @@ MainNode::MainNode() :
egoMotion.cruiseControllerNotify = cruiseControllerNotify;
egoMotion.platoonControllerNotify = platoonControllerNotify;
platoonController.cruiseControllerNotify = cruiseControllerNotify;
// std::cout << "Called MainNode()." << std::endl;
// pc->reciveCommands([this] (auto commandCode) {platoonControllerThread.notify();} )
}
MainNode::~MainNode()
......
......@@ -3,6 +3,7 @@
//
#include "../../include/mainNode/PlatoonController.h"
#include "PlatoonProtocolLib/FollowerVehicle.h"
#include <iostream>
namespace car
......@@ -46,7 +47,7 @@ void car::PlatoonController::run_ACC() {
void car::PlatoonController::run_CACC_FV() {
bool inPlatoon = c2c->isPlatoonRunning();
platoonConfig = c2c->getPlatoonConfig();
platoonConfig = std::dynamic_pointer_cast<platoonProtocol::FollowerVehicle>(c2c)->getPlatoonConfig();
wantsPlatoon = pc->isPlatoonEnabled().get();
......@@ -62,7 +63,7 @@ void car::PlatoonController::run_CACC_FV() {
c2c->leavePlatoon();
}
c2c
// TODO: c2c->reset()
curState = State::ACC;
cruiseControllerNotify();
run_ACC();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment