Split stabilization into separate bits euler and quaternion

This commit is contained in:
Allen
2011-05-23 18:05:03 -07:00
parent 849d47234c
commit c5f2dd968c
20 changed files with 19 additions and 7 deletions
@@ -29,6 +29,7 @@
<subsystem name="actuators" type="asctec"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
@@ -34,6 +34,7 @@
<subsystem name="gps" type="ublox">
<configure name="GPS_BAUD" value="B57600"/>
</subsystem>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -16,6 +16,7 @@
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -15,6 +15,7 @@
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -206,6 +206,7 @@
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.0"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -235,6 +235,7 @@
<configure name="GPS_BAUD" value="B57600"/>
</subsystem>
<!--subsystem name="ahrs" type="cmpl"/-->
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="ic"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -185,6 +185,7 @@
<!-- <subsystem name="imu" type="b2_v1.1"/> -->
<subsystem name="imu" type="aspirin"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
@@ -293,6 +293,7 @@ second attempt
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="crista"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
@@ -202,6 +202,7 @@
<subsystem name="actuators" type="heli"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
@@ -252,6 +252,7 @@
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<subsystem name="ins" type="hff"/>
</firmware>
+1
View File
@@ -18,6 +18,7 @@
<subsystem name="gps" type="ublox"/>
<subsystem name="actuators" type="mkk"/>
<subsystem name="imu" type="b2_v1.0"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
+1
View File
@@ -208,6 +208,7 @@
<subsystem name="actuators" type="asctec"/>
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
<firmware name="booz_test_progs">
+1
View File
@@ -194,6 +194,7 @@
<subsystem name="imu" type="aspirin"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="ahrs" type="ic"/>
<subsystem name="stabilization" type="quaternion"/>
</firmware>
+1
View File
@@ -202,6 +202,7 @@
<subsystem name="imu" type="b2_v1.1"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
@@ -204,6 +204,7 @@
<subsystem name="imu" type="aspirin"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
+1
View File
@@ -225,6 +225,7 @@
<subsystem name="imu" type="aspirin"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="ic"/>
</firmware>
@@ -204,6 +204,7 @@
<subsystem name="gps" type="ublox">
<configure name="GPS_BAUD" value="B57600"/>
</subsystem>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
<!--<subsystem name="ahrs" type="ic"/>-->
</firmware>
+1
View File
@@ -208,6 +208,7 @@
<configure name="GPS_BAUD" value="B57600"/>
</subsystem>
<!--subsystem name="ahrs" type="cmpl"/-->
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="ic"/>
</firmware>
+1
View File
@@ -203,6 +203,7 @@
<subsystem name="gps" type="ublox">
<configure name="GPS_PORT" value="UART3"/>
</subsystem>
<subsystem name="stabilization" type="euler"/>
<subsystem name="ahrs" type="cmpl"/>
</firmware>
-7
View File
@@ -189,13 +189,6 @@ ap.srcs += math/pprz_trig_int.c
ap.srcs += $(SRC_FIRMWARE)/stabilization.c
ap.srcs += $(SRC_FIRMWARE)/stabilization/stabilization_rate.c
ap.CFLAGS += -DSTABILISATION_ATTITUDE_TYPE_INT
ap.CFLAGS += -DSTABILISATION_ATTITUDE_H=\"stabilization/stabilization_attitude_int.h\"
ap.CFLAGS += -DSTABILISATION_ATTITUDE_REF_H=\"stabilization/stabilization_attitude_ref_euler_int.h\"
ap.srcs += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_ref_euler_int.c
ap.srcs += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_euler_int.c
ap.CFLAGS += -DUSE_NAVIGATION
ap.srcs += $(SRC_FIRMWARE)/guidance/guidance_h.c
ap.srcs += $(SRC_FIRMWARE)/guidance/guidance_v.c