diff --git a/conf/airframes/tudelft/rotwing5.xml b/conf/airframes/tudelft/rotwing5.xml index e3fbf3fc4d..3799450579 100644 --- a/conf/airframes/tudelft/rotwing5.xml +++ b/conf/airframes/tudelft/rotwing5.xml @@ -141,7 +141,6 @@ - diff --git a/conf/modules/rotwing_automation.xml b/conf/modules/rotwing_automation.xml deleted file mode 100644 index 2d87d275e6..0000000000 --- a/conf/modules/rotwing_automation.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - Functions to automate the navigation and guidance of the rotating wing drone -
- - - - - -
-
- - - - - - - - - - -
- -
- - - - - -
diff --git a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.h b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.h index 8e6cc783cb..c14986e55d 100644 --- a/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.h +++ b/sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.h @@ -46,7 +46,6 @@ extern float thrust_bx_state_filt; extern float act_pref[INDI_NUM_ACT]; -extern float indi_Wu[INDI_NUM_ACT]; struct Indi_gains { struct FloatRates att; struct FloatRates rate; diff --git a/sw/airborne/modules/ctrl/eff_scheduling_nederdrone.c b/sw/airborne/modules/ctrl/eff_scheduling_nederdrone.c index f4a8bd5ce4..6421f4f4ab 100644 --- a/sw/airborne/modules/ctrl/eff_scheduling_nederdrone.c +++ b/sw/airborne/modules/ctrl/eff_scheduling_nederdrone.c @@ -32,7 +32,7 @@ not use this module at the same time! #include "state.h" #include "autopilot.h" #include "modules/radio_control/radio_control.h" -#include "generated/radio.h" +//#include "generated/radio.h" #include "modules/actuators/actuators.h" #define INDI_SCHEDULING_LOWER_BOUND_G1 0.0001 @@ -232,15 +232,15 @@ void schdule_control_effectiveness(void) { if(airspeed > 15.0) { uint8_t i; for (i = 0; i < 4; i++) { - indi_Wu[i] = indi_Wu_original[i]*pref_flaps_factor; + wls_stab_p.Wu[i] = indi_Wu_original[i]*pref_flaps_factor; } for (i = 4; i < 8; i++) { - indi_Wu[i] = indi_Wu_original[i]/pref_flaps_factor; + wls_stab_p.Wu[i] = indi_Wu_original[i]/pref_flaps_factor; } } else { uint8_t i; for (i = 0; i < 8; i++) { - indi_Wu[i] = indi_Wu_original[i]; + wls_stab_p.Wu[i] = indi_Wu_original[i]; } } }