|
|
@ -72,6 +72,15 @@ bool FlightTaskManualPosition::activate(const vehicle_local_position_setpoint_s |
|
|
|
_velocity_setpoint(0) = _velocity_setpoint(1) = 0.0f; |
|
|
|
_velocity_setpoint(0) = _velocity_setpoint(1) = 0.0f; |
|
|
|
_velocity_scale = _constraints.speed_xy; |
|
|
|
_velocity_scale = _constraints.speed_xy; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static uint32_t last_2s,delt_time; |
|
|
|
|
|
|
|
uint32_t nowtime = hrt_absolute_time(); |
|
|
|
|
|
|
|
if( (nowtime - last_2s) > 2_s) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
mavlink_log_info(&_mavlink_log_pub, "activate(%d) : %.2f,%.2f\n",(nowtime - delt_time),(double)_position_setpoint(0),(double)_position_setpoint(1)); |
|
|
|
|
|
|
|
last_2s = nowtime; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
delt_time = hrt_absolute_time(); |
|
|
|
|
|
|
|
|
|
|
|
// for position-controlled mode, we need a valid position and velocity state
|
|
|
|
// for position-controlled mode, we need a valid position and velocity state
|
|
|
|
// in NE-direction
|
|
|
|
// in NE-direction
|
|
|
|
return ret; |
|
|
|
return ret; |
|
|
@ -121,7 +130,7 @@ void FlightTaskManualPosition::_scaleSticks() |
|
|
|
uint32_t nowtime = hrt_absolute_time(); |
|
|
|
uint32_t nowtime = hrt_absolute_time(); |
|
|
|
if( (nowtime - last_2s) > 2_s) |
|
|
|
if( (nowtime - last_2s) > 2_s) |
|
|
|
{ |
|
|
|
{ |
|
|
|
mavlink_log_info(&_mavlink_log_pub, "scaleSticks(%d) : %.2f,%.2f\n",delt_time,(double)vel_sp_xy(0),(double)vel_sp_xy(1)); |
|
|
|
mavlink_log_info(&_mavlink_log_pub, "scaleSticks(%d) : %.2f,%.2f\n",(nowtime - delt_time),(double)vel_sp_xy(0),(double)vel_sp_xy(1)); |
|
|
|
last_2s = nowtime; |
|
|
|
last_2s = nowtime; |
|
|
|
} |
|
|
|
} |
|
|
|
delt_time = hrt_absolute_time(); |
|
|
|
delt_time = hrt_absolute_time(); |
|
|
@ -152,6 +161,15 @@ void FlightTaskManualPosition::_updateXYlock() |
|
|
|
_position_setpoint(0) = NAN; |
|
|
|
_position_setpoint(0) = NAN; |
|
|
|
_position_setpoint(1) = NAN; |
|
|
|
_position_setpoint(1) = NAN; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static uint32_t last_2s,delt_time; |
|
|
|
|
|
|
|
uint32_t nowtime = hrt_absolute_time(); |
|
|
|
|
|
|
|
if( (nowtime - last_2s) > 2_s) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
mavlink_log_info(&_mavlink_log_pub, "_updateXYlock(%d) : %.2f,%.2f\n",(nowtime - delt_time),(double)_velocity(0),(double)_velocity(1)); |
|
|
|
|
|
|
|
last_2s = nowtime; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
delt_time = hrt_absolute_time(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void FlightTaskManualPosition::_updateSetpoints() |
|
|
|
void FlightTaskManualPosition::_updateSetpoints() |
|
|
@ -171,4 +189,13 @@ void FlightTaskManualPosition::_updateSetpoints() |
|
|
|
_yawspeed_setpoint += _weathervane_yaw_handler->get_weathervane_yawrate(); |
|
|
|
_yawspeed_setpoint += _weathervane_yaw_handler->get_weathervane_yawrate(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static uint32_t last_2s,delt_time; |
|
|
|
|
|
|
|
uint32_t nowtime = hrt_absolute_time(); |
|
|
|
|
|
|
|
if( (nowtime - last_2s) > 2_s) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
mavlink_log_info(&_mavlink_log_pub, "_updateSetpoints(%d) : %.2f,%.2f\n",(nowtime - delt_time),(double)_position_setpoint(0),(double)_position_setpoint(1)); |
|
|
|
|
|
|
|
last_2s = nowtime; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
delt_time = hrt_absolute_time(); |
|
|
|
} |
|
|
|
} |
|
|
|