Skip to content

Commit ef98f3a

Browse files
roman-dvorakslimonslimon
authored andcommitted
autogyro takeoff updats
1 parent 8ebc6a3 commit ef98f3a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/modules/fw_pos_control_l1/autogyro_takeoff/AutogyroTakeoff.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,13 @@ float AutogyroTakeoff::getPitch(float tecsPitch)
305305
switch (_state) {
306306

307307
case AutogyroTakeoffState::TAKEOFF_ERROR:
308-
case AutogyroTakeoffState::PRE_TAKEOFF_PREROTATE_START: // 0 Null pitch
309308
return 0;
310309

310+
case AutogyroTakeoffState::PRE_TAKEOFF_PREROTATE_START: // 0 Null pitch
311311
case AutogyroTakeoffState::PRE_TAKEOFF_PREROTATE: // 1 maximal pitch
312312
case AutogyroTakeoffState::PRE_TAKEOFF_DONE: // 2
313-
return math::radians(_param_rwto_max_pitch.get());
313+
//return math::radians(_param_rwto_max_pitch.get());
314+
return math::radians(_param_rwto_psp.get());
314315

315316
// FLy
316317
default:

src/modules/logger/logged_topics.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ void LoggedTopics::add_default_topics()
5454
add_optional_topic("actuator_controls_status_0", 300);
5555
add_topic("airspeed", 1000);
5656
add_optional_topic("airspeed_validated", 200);
57-
add_optional_topic("autogyro_takeoff_status", 100);
5857
add_optional_topic("autotune_attitude_control_status", 100);
5958
add_optional_topic("camera_capture");
6059
add_optional_topic("camera_trigger");
@@ -97,7 +96,7 @@ void LoggedTopics::add_default_topics()
9796
add_topic("sensor_selection");
9897
add_topic("sensors_status_imu", 200);
9998
add_topic("system_power", 500);
100-
add_optional_topic("takeoff_status", 1000);
99+
add_topic("takeoff_status");
101100
add_optional_topic("tecs_status", 200);
102101
add_topic("trajectory_setpoint", 200);
103102
add_topic("transponder_report");

0 commit comments

Comments
 (0)