mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-30 03:27:33 +08:00
Fix for buidling indi_rate (#1993)
With this commit, you can only use indi rate, when you are using stabilization indi or indi_simple. Also fixing spelling of stabilization
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_attitude" dir="stabilization">
|
<module name="stabilization_attitude" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Legacy attitude and lateral (heading) control for fixedwing aircraft
|
Legacy attitude and lateral (heading) control for fixedwing aircraft
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_float_euler" dir="stabilization">
|
<module name="stabilization_float_euler" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Stabilization controller for rotorcraft using float euler implementation
|
Stabilization controller for rotorcraft using float euler implementation
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_float_quat" dir="stabilization">
|
<module name="stabilization_float_quat" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Stabilization controller for rotorcraft using float quaternion implementation
|
Stabilization controller for rotorcraft using float quaternion implementation
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_heli_indi" dir="stabilization">
|
<module name="stabilization_heli_indi" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
INDI stabilization controller for helicopters
|
INDI stabilization controller for helicopters
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_indi" dir="stabilization">
|
<module name="stabilization_indi" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Full INDI stabilization controller for rotorcraft
|
Full INDI stabilization controller for rotorcraft
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_indi_simple" dir="stabilization">
|
<module name="stabilization_indi_simple" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Simple INDI stabilization controller for rotorcraft
|
Simple INDI stabilization controller for rotorcraft
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_int_euler" dir="stabilization">
|
<module name="stabilization_int_euler" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Stabilization controller for rotorcraft using integer euler implementation
|
Stabilization controller for rotorcraft using integer euler implementation
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_int_quat" dir="stabilization">
|
<module name="stabilization_int_quat" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Stabilization controller for rotorcraft using integer quaternion implementation
|
Stabilization controller for rotorcraft using integer quaternion implementation
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_passthrough" dir="stabilization">
|
<module name="stabilization_passthrough" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Passthrough controller for rotorcraft
|
Passthrough controller for rotorcraft
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_rate" dir="stabilization">
|
<module name="stabilization_rate" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Rate controller for rotorcraft
|
Rate controller for rotorcraft
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
<!DOCTYPE module SYSTEM "module.dtd">
|
<!DOCTYPE module SYSTEM "module.dtd">
|
||||||
|
|
||||||
<module name="stabiliztion_rate_indi" dir="stabilization">
|
<module name="stabilization_rate_indi" dir="stabilization">
|
||||||
<doc>
|
<doc>
|
||||||
<description>
|
<description>
|
||||||
Rate INDI controller for rotorcraft
|
Rate INDI controller for rotorcraft
|
||||||
</description>
|
</description>
|
||||||
</doc>
|
</doc>
|
||||||
|
<depends>stabilization_indi|stabilization_indi_simple</depends>
|
||||||
<autoload name="stabilization" type="rotorcraft"/>
|
<autoload name="stabilization" type="rotorcraft"/>
|
||||||
<header>
|
<header>
|
||||||
<file name="stabilization_rate.h"/>
|
<file name="stabilization_rate.h"/>
|
||||||
</header>
|
</header>
|
||||||
<init fun="stabilization_rate_init()"/>
|
<init fun="stabilization_rate_init()"/>
|
||||||
<makefile target="ap|nps" firmware="rotorcraft">
|
<makefile target="ap|nps" firmware="rotorcraft">
|
||||||
<file name="stabilization_indi_simple.c" dir="$(SRC_FIRMWARE)/stabilization"/>
|
|
||||||
<file name="stabilization_rate_indi.c" dir="$(SRC_FIRMWARE)/stabilization"/>
|
<file name="stabilization_rate_indi.c" dir="$(SRC_FIRMWARE)/stabilization"/>
|
||||||
<define name="USE_STABILIZATION_RATE"/>
|
<define name="USE_STABILIZATION_RATE"/>
|
||||||
<define name="STABILIZATION_RATE_INDI" value="true"/>
|
<define name="STABILIZATION_RATE_INDI" value="true"/>
|
||||||
|
|||||||
@@ -24,7 +24,12 @@
|
|||||||
*/
|
*/
|
||||||
#include "firmwares/rotorcraft/stabilization.h"
|
#include "firmwares/rotorcraft/stabilization.h"
|
||||||
#include "firmwares/rotorcraft/stabilization/stabilization_rate.h"
|
#include "firmwares/rotorcraft/stabilization/stabilization_rate.h"
|
||||||
|
|
||||||
|
#ifdef STABILIZATION_ATTITUDE_INDI_SIMPLE
|
||||||
|
#include "firmwares/rotorcraft/stabilization/stabilization_indi_simple.h"
|
||||||
|
#else
|
||||||
#include "firmwares/rotorcraft/stabilization/stabilization_indi.h"
|
#include "firmwares/rotorcraft/stabilization/stabilization_indi.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
void stabilization_rate_init(void)
|
void stabilization_rate_init(void)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ extern void guidance_h_module_enter(void);
|
|||||||
extern void guidance_h_module_read_rc(void);
|
extern void guidance_h_module_read_rc(void);
|
||||||
extern void guidance_h_module_run(bool in_flight);
|
extern void guidance_h_module_run(bool in_flight);
|
||||||
|
|
||||||
// Update the stabiliztion commands based on a vision result
|
// Update the stabilization commands based on a vision result
|
||||||
extern void OA_update(void);
|
extern void OA_update(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user