[paparazzi-commits] [paparazzi/paparazzi] 6cdfb7: Merge branch 'master' into ahrs_refactor

[GitHub]

  Branch: refs/heads/ahrs_refactor
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 6cdfb7d64932c61f6b32eb5081d2bcf90cb3f8de
      
https://github.com/paparazzi/paparazzi/commit/6cdfb7d64932c61f6b32eb5081d2bcf90cb3f8de
  Author: Felix Ruess <address@hidden>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M .gitmodules
    M .travis.yml
    M CHANGELOG.md
    M Makefile.ac
    M conf/Makefile.ardrone2
    M conf/Makefile.geode
    M conf/Makefile.lpc21
    M conf/Makefile.pentium-m
    M conf/airframes/CDW/TwoSeas.xml
    M conf/airframes/CDW/conf.xml
    M conf/airframes/CDW/conf_two_seas.xml
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/ENAC/fixed-wing/twinjet2.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/silverlit_lisas.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/ardrone2_raw_optitrack.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M conf/airframes/examples/quadrotor_navstik.xml
    R conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    R conf/firmwares/subsystems/fixedwing/ahrs_ic.makefile
    A conf/firmwares/subsystems/fixedwing/gps_furuno.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_cmpl.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_ic.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_furuno.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_ardrone2.makefile
    A conf/firmwares/subsystems/shared/ahrs_float_cmpl_quat.makefile
    A conf/firmwares/subsystems/shared/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/shared/ahrs_int_cmpl_euler.makefile
    A conf/firmwares/subsystems/shared/ahrs_int_cmpl_quat.makefile
    A conf/firmwares/subsystems/shared/imu_mpu9250_i2c.makefile
    M conf/firmwares/subsystems/shared/radio_control_sbus_dual.makefile
    M conf/firmwares/test_progs.makefile
    M conf/flight_plans/rotorcraft_basic_superbitrf.xml
    M conf/messages.dtd
    M conf/messages.xml
    M conf/modules/configure_actuators_mkk_v2.xml
    A conf/modules/digital_cam_shoot_rc.xml
    R conf/modules/flight_time.xml
    A conf/modules/imu_mpu9250.xml
    M conf/modules/mission_rotorcraft.xml
    A conf/modules/time_countdown.xml
    R conf/settings/modules/config_mkk_v2.xml
    M create_module
    M data/srtm/.gitignore
    M sw/airborne/arch/lpc21/test/Makefile
    M sw/airborne/arch/omap/mcu_periph/i2c_arch.c
    M sw/airborne/arch/omap/mcu_periph/i2c_arch.h
    A sw/airborne/arch/omap/mcu_periph/i2c_smbus.h
    A sw/airborne/arch/omap/mcu_periph/spi_arch.c
    A sw/airborne/arch/omap/mcu_periph/spi_arch.h
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.h
    M sw/airborne/arch/sim/sim_ap.c
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/uart_tunnel.c
    M sw/airborne/boards/ardrone/electrical_raw.c
    R sw/airborne/boards/ardrone/i2c-dev.h
    M sw/airborne/filters/low_pass_filter.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot_arming_throttle.h
    M sw/airborne/firmwares/rotorcraft/autopilot_arming_yaw.h
    M sw/airborne/firmwares/rotorcraft/datalink.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/math/Makefile
    M sw/airborne/math/pprz_algebra_int.c
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.h
    A sw/airborne/modules/digital_cam/dc_shoot_rc.c
    A sw/airborne/modules/digital_cam/dc_shoot_rc.h
    M sw/airborne/modules/light/light.c
    M sw/airborne/modules/light/light.h
    M sw/airborne/modules/mission/mission_common.c
    M sw/airborne/modules/mission/mission_common.h
    M sw/airborne/modules/mission/mission_fw_nav.c
    M sw/airborne/modules/mission/mission_rotorcraft_nav.c
    M sw/airborne/modules/sensors/airspeed_ms45xx_i2c.c
    A sw/airborne/modules/sensors/imu_mpu9250.c
    A sw/airborne/modules/sensors/imu_mpu9250.h
    M sw/airborne/modules/sensors/temp_adc.c
    R sw/airborne/modules/time/flight_time.c
    R sw/airborne/modules/time/flight_time.h
    A sw/airborne/modules/time/time_countdown.c
    A sw/airborne/modules/time/time_countdown.h
    A sw/airborne/peripherals/ak8963.c
    A sw/airborne/peripherals/ak8963.h
    A sw/airborne/peripherals/ak8963_regs.h
    M sw/airborne/peripherals/mpu60x0_i2c.c
    M sw/airborne/peripherals/mpu60x0_spi.c
    A sw/airborne/peripherals/mpu9250.c
    A sw/airborne/peripherals/mpu9250.h
    A sw/airborne/peripherals/mpu9250_i2c.c
    A sw/airborne/peripherals/mpu9250_i2c.h
    A sw/airborne/peripherals/mpu9250_regs.h
    A sw/airborne/peripherals/mpu9250_spi.c
    A sw/airborne/peripherals/mpu9250_spi.h
    M sw/airborne/peripherals/ms5611_i2c.c
    M sw/airborne/state.c
    M sw/airborne/state.h
    M sw/airborne/subsystems/datalink/ivy_transport.c
    M sw/airborne/subsystems/datalink/pprz_transport.c
    M sw/airborne/subsystems/datalink/pprzlog_transport.c
    M sw/airborne/subsystems/datalink/xbee.c
    A sw/airborne/subsystems/gps/gps_furuno.c
    M sw/airborne/subsystems/gps/gps_nmea.c
    M sw/airborne/subsystems/gps/gps_nmea.h
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu.h
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    A sw/airborne/subsystems/imu/imu_mpu9250_i2c.c
    A sw/airborne/subsystems/imu/imu_mpu9250_i2c.h
    M sw/airborne/subsystems/ins.c
    M sw/airborne/subsystems/ins/ins_gps_passthrough.c
    M sw/airborne/test/subsystems/test_ahrs.c
    M sw/ext/ardrone2_drivers/ardrone2.py
    A sw/ext/blackmagic/Makefile
    M sw/ground_segment/cockpit/gcs.ml
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/misc/Makefile
    M sw/ground_segment/tmtc/messages.ml
    M sw/ground_segment/tmtc/server.ml
    M sw/include/std.h
    M sw/lib/ocaml/env.ml
    M sw/lib/ocaml/env.mli
    M sw/lib/ocaml/gen_common.ml
    M sw/lib/ocaml/gen_common.mli
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/pprz.ml
    M sw/lib/python/messages_tool.py
    M sw/lib/python/settings_xml_parse.py
    R sw/simulator/launchsitl
    M sw/simulator/nps/nps_ivy_fixedwing.c
    M sw/simulator/nps/nps_ivy_mission_commands.c
    M sw/simulator/nps/nps_main.c
    M sw/simulator/pprzsim-launch
    M sw/simulator/sim_ac_flightgear.c
    M sw/simulator/sim_ac_jsbsim.c
    M sw/simulator/sim_ac_jsbsim.h
    M sw/simulator/sitl.ml
    M sw/supervision/pc_aircraft.ml
    M sw/tools/generators/gen_aircraft.ml
    M sw/tools/generators/gen_settings.ml
    M tests/Makefile
    M tests/examples/01_compile_all_aircrafts.t
    A tests/math/.gitignore
    A tests/math/Makefile
    A tests/math/tap.c
    A tests/math/tap.h
    A tests/math/test_pprz_math.c

  Log Message:
  -----------
  Merge branch 'master' into ahrs_refactor

* master: (86 commits)
  [ahrs] update/clean test_ahrs
  [python] fix settings path
  [messages] add some descriptions again
  fix name of git submodule
  [chibios] switch back to a repo that have to 2.6 stable
  [chibios] switch back to correct version
  [ocaml] filter for 'field' tag when looking at messages
  [submodules] updated to a new chibios repository
  [messages] remove description node again for now
  [modules] mission_rotorcraft: only check for ned_initialized_i
  [modules][messages] mission: LLA waypoints in 1e7deg instead of float
  [build] don't compile natnet if not needed
  [messages] possibility to add descriptions
  [modules] rename flight_time to time_countdown
  [sim] remove launchsitl symlink
  [rotorcraft] navigation: fix NavCircleCount
  [modules] rotorcraft_cam: fix DEFAULT_MODE
  [omap] start basic spi driver
  [rotorcraft] arming: only check if motors can be armed if ahrs_is_aligned
  [rotorcraft] force MODE_STARTUP instead of KILL until ahrs is aligned
  ...