Merge branch 'master' into ahrs_refactor

* master: (175 commits)
  [tests] fix math tests
  [fixedwing] use min/max_cruise_throttle variables instead of defines
  [conf] update some telemetry files
  [ext] update luftboot
  [ext] update libopencm3
  [mavlink] add sending of origin and waypoints
  [mavlink] rename SETTINGS to SETTINGS_NAMES_SHORT
  [mavlink] send quaternion
  [mavlink] parse PARAM_SET
  [conf] add AUTOPILOT_VERSION to some default telemetry files
  [conf] add python real time plotter to control panel
  [python] messagesapp: growable value column width
  [auto1-flaps] Please remove this as soon a better solution exits. For now it is critical to fly. closing #878
  [conf] vivify fix digital_cam_uart missing settings
  [conf] obc fix nav_airspeed names, and enable AMSL
  fourth release candidate for next stable release v5.4
  [server] close file even if file empty
  [build] improve build version stuff
  Add some more flexibility to conf and control_panel naming
  [paparazzicenter] fix GLib-CRITICAL warning when running clean/build/upload
  ...

Conflicts:
	sw/airborne/boards/ardrone/actuators_at.c
	sw/airborne/firmwares/fixedwing/main_ap.c
	sw/airborne/firmwares/rotorcraft/main.c
	sw/airborne/modules/geo_mag/geo_mag.c
	sw/airborne/modules/ins/ahrs_chimu_spi.c
	sw/airborne/modules/ins/ahrs_chimu_uart.c
	sw/airborne/subsystems/ins/ins_ardrone2.c
	sw/airborne/test/subsystems/test_ahrs.c
This commit is contained in:
Felix Ruess
2015-01-02 12:56:05 +01:00
1271 changed files with 85121 additions and 22857 deletions
+1 -2
View File
@@ -1,13 +1,12 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="ins">
<module name="ahrs_chimu_uart" dir="ins">
<doc>
<description>
CHimu (UART)
For older CHIMU v1.0 you should define CHIMU_BIG_ENDIAN
</description>
</doc>
<!-- <depend conflict="ins" -->
<header>
<file name="ins_module.h"/>
</header>