Browse Source

WIP on controllers

sbg
Lorenz Meier 12 years ago
parent
commit
8398de7515
  1. 6
      src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp
  2. 2
      src/lib/ecl/attitude_fw/ecl_roll_controller.cpp
  3. 6
      src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp

6
src/lib/ecl/attitude_fw/ecl_pitch_controller.cpp

@ -51,6 +51,12 @@ ECL_PitchController::ECL_PitchController() : @@ -51,6 +51,12 @@ ECL_PitchController::ECL_PitchController() :
float ECL_PitchController::control(float pitch_setpoint, float pitch, float pitch_rate, float roll, float scaler,
bool lock_integrator, float airspeed_min, float airspeed_max, float aspeed)
{
/* get the usual dt estimate */
uint64_t dt_micros = ecl_elapsed_time(&_last_run);
_last_run = ecl_absolute_time();
float dt = (dt_micros > 500000) ? 0.0f : dt_micros / 1000000;
return 0.0f;
}

2
src/lib/ecl/attitude_fw/ecl_roll_controller.cpp

@ -61,7 +61,7 @@ float ECL_RollController::control(float roll_setpoint, float roll, float roll_ra @@ -61,7 +61,7 @@ float ECL_RollController::control(float roll_setpoint, float roll, float roll_ra
float dt = (dt_micros > 500000) ? 0.0f : dt_micros / 1000000;
float integrator_limit_scaled = 0.0f;
return 0.0f;
}

6
src/lib/ecl/attitude_fw/ecl_yaw_controller.cpp

@ -54,6 +54,12 @@ ECL_YawController::ECL_YawController() : @@ -54,6 +54,12 @@ ECL_YawController::ECL_YawController() :
float ECL_YawController::control(float roll, float yaw_rate, float accel_y, float scaler, bool lock_integrator,
float airspeed_min, float airspeed_max, float aspeed)
{
/* get the usual dt estimate */
uint64_t dt_micros = ecl_elapsed_time(&_last_run);
_last_run = ecl_absolute_time();
float dt = (dt_micros > 500000) ? 0.0f : dt_micros / 1000000;
return 0.0f;
}

Loading…
Cancel
Save