Merge branch 'release_v1.0.0' into beta

10 years ago · f6dcdc8b13
2 changed files with 6 additions and 4 deletions
--- a/makefiles/config_aerocore_default.mk
+++ b/makefiles/config_aerocore_default.mk
@ -48,11 +48,12 @@ MODULES		+= modules/navigator
				@@ -48,11 +48,12 @@ MODULES		+= modules/navigator
 MODULES		+= modules/mavlink

 #
-# Estimation modules (EKF/ SO3 / other filters)
+# Estimation modules (EKF / other filters)
 #
-MODULES		+= modules/attitude_estimator_ekf
-MODULES		+= modules/attitude_estimator_so3
+# Too high RAM usage due to static allocations
+#MODULES		+= modules/attitude_estimator_ekf
 MODULES		+= modules/ekf_att_pos_estimator
+MODULES		+= modules/attitude_estimator_q
 MODULES		+= modules/position_estimator_inav

 #
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@ -76,7 +76,8 @@ MODULES 	+= modules/land_detector
				@@ -76,7 +76,8 @@ MODULES 	+= modules/land_detector
 #
 # Estimation modules (EKF/ SO3 / other filters)
 #
-MODULES		+= modules/attitude_estimator_ekf
+# Too high RAM usage due to static allocations
+#MODULES		+= modules/attitude_estimator_ekf
 MODULES		+= modules/attitude_estimator_q
 MODULES		+= modules/ekf_att_pos_estimator
 MODULES		+= modules/position_estimator_inav