Skip to content
Snippets Groups Projects
Commit 3ee57de6 authored by muelmarc's avatar muelmarc
Browse files

update on publisher nodes for crazyradio - still not running

parent 3cf91de8
No related branches found
No related tags found
No related merge requests found
...@@ -66,16 +66,13 @@ void viconCallback(const d_fall_pps::ViconData& data){ ...@@ -66,16 +66,13 @@ void viconCallback(const d_fall_pps::ViconData& data){
//Send to Crayzradio>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> //Send to Crayzradio>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
void CControlMgr::callbackRunRateController(const ros::TimerEvent&) void callbackRunRateController(const ros::TimerEvent&)
{ {
if(m_pRateController!=NULL) DistributePowerAndSendToCrazyflie(m_pRateController->computeOutput());
if(m_pRateController->fIsInit())
{
DistributePowerAndSendToCrazyflie(m_pRateController->computeOutput());
}
} }
void CControlMgr::DistributePowerAndSendToCrazyflie(ControllerOutput rateControllerOutput) void DistributePowerAndSendToCrazyflie(ControllerOutput rateControllerOutput)
{ {
assert(rateControllerOutput.onboardControllerType=eOnboardMotorCmdController); assert(rateControllerOutput.onboardControllerType=eOnboardMotorCmdController);
assert(m_isRateOffboard==true); assert(m_isRateOffboard==true);
...@@ -89,7 +86,7 @@ void CControlMgr::DistributePowerAndSendToCrazyflie(ControllerOutput rateControl ...@@ -89,7 +86,7 @@ void CControlMgr::DistributePowerAndSendToCrazyflie(ControllerOutput rateControl
SendToCrazyflie(rateControllerOutput); SendToCrazyflie(rateControllerOutput);
} }
void CControlMgr::SendToCrazyflie(ControllerOutput package) void SendToCrazyflie(ControllerOutput package)
{ {
if(m_isStopped) if(m_isStopped)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment