paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] 1bff48: [telemetry] new period


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] 1bff48: [telemetry] new periodic telemetry system
Date: Sun, 05 Jan 2014 17:40:08 -0800

  Branch: refs/heads/rt_paparazzi
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 1bff48ec2d96d0eaab65da46db30acb1e64b3855
      
https://github.com/paparazzi/paparazzi/commit/1bff48ec2d96d0eaab65da46db30acb1e64b3855
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/telemetry/default_fixedwing.xml
    M conf/telemetry/default_fixedwing_imu.xml
    M conf/telemetry/default_fixedwing_imu_9k6.xml
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/datalink.c
    M sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
    M sw/airborne/link_mcu_spi.c
    M sw/airborne/modules/cam_control/cam.c
    M sw/airborne/modules/cam_control/cam.h
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/subsystems/ahrs/ahrs_infrared.c
    A sw/airborne/subsystems/datalink/telemetry.c
    A sw/airborne/subsystems/datalink/telemetry_common.h
    M sw/airborne/subsystems/gps.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/radio_control/ppm.c
    M sw/include/std.h
    M sw/tools/gen_periodic.ml

  Log Message:
  -----------
  [telemetry] new periodic telemetry system

- only FW currently, rotorcraft coming soon
- compared to before:
 - no macros (easier to debug)
 - the default channel/device cannot be set for all the messages at the
   same time (it will be possible when we finally replace messages
   macros and define proper C struct for that)
 - the register function only register for a single process (not
   possible to reuse the function for an other process unless you
   explicitely register for it)


  Commit: 8377d601845c7bbc54229120b47963678fe743bc
      
https://github.com/paparazzi/paparazzi/commit/8377d601845c7bbc54229120b47963678fe743bc
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/subsystems/ahrs/ahrs_aligner.c
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/gps.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c

  Log Message:
  -----------
  [telemetry] adapt rotorcraft to new telemetry system


  Commit: 813660036a16c7853f4de4c1a9b10c0d96079fff
      
https://github.com/paparazzi/paparazzi/commit/813660036a16c7853f4de4c1a9b10c0d96079fff
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
    M sw/airborne/subsystems/datalink/downlink.h

  Log Message:
  -----------
  increase first start interrupt and default device in downlink.h


  Commit: 6ec20fd83463824e7f6844cf1a42cd4361fd937a
      
https://github.com/paparazzi/paparazzi/commit/6ec20fd83463824e7f6844cf1a42cd4361fd937a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h

  Log Message:
  -----------
  [nav] change GRAVITY to NAV_GRAVITY to avoid collision


  Commit: 116faaeda68c3d722524b6adaebf23549755ea9f
      
https://github.com/paparazzi/paparazzi/commit/116faaeda68c3d722524b6adaebf23549755ea9f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-16 (Sun, 16 Jun 2013)

  Changed paths:
    M conf/firmwares/setup.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    M sw/airborne/link_mcu_spi.c
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/modules/cam_control/cam.c
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/subsystems/ahrs/ahrs_aligner.c
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
    M sw/airborne/subsystems/ahrs/ahrs_infrared.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/gps.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/radio_control/ppm.c

  Log Message:
  -----------
  [telemetry] protect telemetry code with #if DOWNLINK

- also get rid of AP_DOWNLINK and FBW_DOWNLINK
- still needs to make it work again (for the only remaining classix in
  the world...)


  Commit: 09680b07e97a749560548ee276d0e44fb198c620
      
https://github.com/paparazzi/paparazzi/commit/09680b07e97a749560548ee276d0e44fb198c620
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
    M sw/airborne/arch/sim/sim_ap.c
    R sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/datalink.c
    R sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    A sw/airborne/firmwares/rotorcraft/rotorcraft_telemetry.c
    R sw/airborne/firmwares/rotorcraft/telemetry.c
    R sw/airborne/firmwares/rotorcraft/telemetry.h
    A sw/airborne/subsystems/datalink/telemetry.h

  Log Message:
  -----------
  [telemetry] fix some include and remove unnecessary files


  Commit: 0d25d2d8e10881c9c459f3344beb2cff686dd9d4
      
https://github.com/paparazzi/paparazzi/commit/0d25d2d8e10881c9c459f3344beb2cff686dd9d4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
    M sw/airborne/boards/lisa_m/baro_ms5611_spi.c
    M sw/airborne/boards/navgo/imu_navgo.c
    M sw/airborne/boards/umarim/imu_umarim.c
    M sw/airborne/firmwares/beth/rcv_telemetry.c
    M sw/airborne/firmwares/setup/setup_actuators.c
    M sw/airborne/modules/MPPT/MPPT.c
    M sw/airborne/modules/MPPT/sim_MPPT.c
    M sw/airborne/modules/adcs/adc_generic.c
    M sw/airborne/modules/benchmark/flight_benchmark.c
    M sw/airborne/modules/cartography/cartography.c
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/datalink/xtend_rssi.c
    M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
    M sw/airborne/modules/digital_cam/dc.c
    M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
    M sw/airborne/modules/enose/enose.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gsm/gsm.c
    M sw/airborne/modules/ins/ahrs_chimu_spi.c
    M sw/airborne/modules/ins/ahrs_chimu_uart.c
    M sw/airborne/modules/ins/alt_filter.c
    M sw/airborne/modules/ins/ins_arduimu.c
    M sw/airborne/modules/ins/ins_arduimu_basic.c
    M sw/airborne/modules/ins/ins_vn100.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/meteo/charge_sens.c
    M sw/airborne/modules/meteo/dust_gp2y.c
    M sw/airborne/modules/meteo/geiger_counter.c
    M sw/airborne/modules/meteo/humid_dpicco.c
    M sw/airborne/modules/meteo/humid_hih.c
    M sw/airborne/modules/meteo/humid_htm_b71.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/meteo/humid_sht.c
    M sw/airborne/modules/meteo/humid_sht_i2c.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/light_solar.c
    M sw/airborne/modules/meteo/light_temt.c
    M sw/airborne/modules/meteo/temp_lm75.c
    M sw/airborne/modules/meteo/temp_tcouple_adc.c
    M sw/airborne/modules/meteo/temp_temod.c
    M sw/airborne/modules/meteo/temp_tmp102.c
    M sw/airborne/modules/meteo/windturbine.c
    M sw/airborne/modules/multi/formation.c
    M sw/airborne/modules/multi/potential.c
    M sw/airborne/modules/multi/tcas.c
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/openlog/openlog.c
    M sw/airborne/modules/sensors/AOA_adc.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/alt_srf08.c
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    M sw/airborne/modules/sensors/imu_aspirin2.c
    M sw/airborne/modules/sensors/mag_hmc5843.c
    M sw/airborne/modules/sensors/mag_hmc58xx.c
    M sw/airborne/modules/sensors/mag_micromag_fw.c
    M sw/airborne/modules/sonar/sonar_adc.c
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c

  Log Message:
  -----------
  [telemetry] remove unnecessary DOWNLINK_DEVICE define


  Commit: c7f1299c98ba411fd12c7cdc52834d646889b60c
      
https://github.com/paparazzi/paparazzi/commit/c7f1299c98ba411fd12c7cdc52834d646889b60c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile

  Log Message:
  -----------
  [telemetry] support for fbw process (only transparent mode)


  Commit: 427fe0c45b0b168e38c8aeaff84c209591574e68
      
https://github.com/paparazzi/paparazzi/commit/427fe0c45b0b168e38c8aeaff84c209591574e68
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M sw/airborne/arch/sim/jsbsim_hw.h
    M sw/airborne/modules/enose/anemotaxis.c
    M sw/airborne/modules/enose/chemotaxis.c
    M sw/airborne/modules/max3100/max3100_hw.c
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/navigation/discsurvey.c

  Log Message:
  -----------
  [telemetry] replace ap_downlink. by new downlink header


  Commit: 2b3a1da82e60ff081579e0c16d7b90052b876576
      
https://github.com/paparazzi/paparazzi/commit/2b3a1da82e60ff081579e0c16d7b90052b876576
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ardrone2_sdk.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    A conf/airframes/examples/quadrotor_mlkf.xml
    M conf/control_panel.xml.example
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M conf/joystick/ms_sidewinder.xml
    A conf/joystick/xbox_gamepad.xml
    M conf/modules/airspeed_amsys.xml
    A conf/settings/control/stabilization_att_float_quat.xml
    A conf/system/preferences.d/paparazzi-uav-ppa
    M paparazzi_version
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/can_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone2_sdk.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/firmwares/beth/overo_sfb_controller.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/peripherals/mpu60x0.c
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_i2c.c
    M sw/airborne/peripherals/mpu60x0_i2c.h
    M sw/airborne/peripherals/mpu60x0_regs.h
    M sw/airborne/peripherals/mpu60x0_spi.c
    M sw/airborne/peripherals/mpu60x0_spi.h
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/electrical.c
    A sw/airborne/subsystems/gps/gps_ardrone2.c
    A sw/airborne/subsystems/gps/gps_ardrone2.h
    R sw/airborne/subsystems/imu/imu_aspirin_2.c
    R sw/airborne/subsystems/imu/imu_aspirin_2.h
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
    A sw/airborne/subsystems/imu/imu_mpu60x0_defaults.h
    M sw/airborne/subsystems/imu/imu_um6.c
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/navigation/traffic_info.c
    M sw/ext/libopencm3
    M sw/ext/luftboot
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/joystick/ml_sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_ivy.c
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into telemetry

Conflicts:
        sw/airborne/firmwares/rotorcraft/autopilot.c


  Commit: 871588eacc8083a487226637a281743cf4f76233
      
https://github.com/paparazzi/paparazzi/commit/871588eacc8083a487226637a281743cf4f76233
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    A conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/quadshot_asp21_spektrum.xml
    M conf/airframes/flixr_discovery.xml
    M conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
    M conf/firmwares/rotorcraft.makefile
    R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
    A conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    M conf/modules/airspeed_ets.xml
    M conf/modules/baro_amsys.xml
    M conf/modules/baro_ets.xml
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
    A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/ardrone/at_com.h
    A sw/airborne/boards/krooz/baro_board.c
    A sw/airborne/boards/krooz/baro_board.h
    A sw/airborne/boards/krooz/imu_krooz.c
    A sw/airborne/boards/krooz/imu_krooz.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/modules/digital_cam/led_cam_ctrl.c
    M sw/airborne/modules/digital_cam/led_cam_ctrl.h
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.h
    M sw/airborne/subsystems/actuators/motor_mixing.c
    M sw/airborne/subsystems/gps/gps_ardrone2.c
    M sw/airborne/subsystems/gps/gps_ardrone2.h
    R sw/airborne/subsystems/imu/imu_aspirin2.c
    R sw/airborne/subsystems/imu/imu_aspirin2.h
    M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    A sw/extras/chdk/pictuav.lua

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

to resolve conflicts and test again before merging back to master

* master:
  [extras] Add CHDK script to work with digital_cam module
  [modules] digital_cam: add DC_POWER_OFF_LED
  [imu] remove old aspirin2 driver
  [modules] ets baro/airspeed: cleanup and default delay of 0.2s
  [conf] add krooz_sd fixedwing example, thx Sergei
  [conf] update krooz_sd examples, thx Sergei
  [boards] update krooz_sd, thx Sergei
  [stm32][pwm] add PWM_SERVO_9
  [modules] baro_amsys: usable for ins_alt_float with USE_BARO_AMSYS
  [rotorcraft] motor_mixing: only lower throttle when hitting both min/max 
saturations
  [ardrone2] Parrot GPS show sattelite information.
  Added check if autopilot_motors_on do determine if you want to switch to 
AP_MODE_FAILSAFE
  [spi] update apogee and krooz board files for spi
  [spi] spi for stm32f4
  [rotorcraft] fix MODE_STARTUP
  [krooz] add imu driver for KroozSD board from Sergei
  [imu][aspirin_2_spi] clear naming for mag axes assignment
  [modules] airspeed ets start delay
  [modules] baro ets start delay

Conflicts:
        sw/airborne/firmwares/rotorcraft/autopilot.c
        sw/airborne/modules/sensors/baro_ets.c


  Commit: 315c7a24e4124b8724bdcfa94025535c885ca362
      
https://github.com/paparazzi/paparazzi/commit/315c7a24e4124b8724bdcfa94025535c885ca362
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
    M sw/airborne/subsystems/datalink/telemetry.c
    M sw/airborne/subsystems/datalink/telemetry.h
    M sw/airborne/subsystems/datalink/telemetry_common.h

  Log Message:
  -----------
  [telemetry] add documentation to telemetry system


  Commit: 2b0efb7f94d5cd703201f9c22bd1e4e0f25f52c3
      
https://github.com/paparazzi/paparazzi/commit/2b0efb7f94d5cd703201f9c22bd1e4e0f25f52c3
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/ENAC/fixed-wing/eternity1.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/fixed-wing/weasel.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    A conf/boards/apogee_1.0.makefile
    M conf/conf.xml.example
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
    A conf/firmwares/subsystems/shared/radio_control_sbus.makefile
    M conf/maps.xml.example
    A conf/radios/T10CG_SBUS.xml
    M data/maps/Makefile
    A data/pictures/Penguin.gif
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    A sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/umarim/imu_umarim.c
    M sw/airborne/firmwares/fixedwing/datalink.c
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/led.h
    M sw/airborne/mcu_periph/uart.h
    R sw/airborne/sd_card/main.c
    R sw/airborne/sd_card/sd_card.c
    R sw/airborne/sd_card/sd_card.h
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    A sw/airborne/subsystems/radio_control/sbus.c
    A sw/airborne/subsystems/radio_control/sbus.h
    A sw/tools/process_exif/README
    A sw/tools/process_exif/process_exif.py

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into telemetry

Conflicts:
        sw/airborne/firmwares/fixedwing/fbw_downlink.h


  Commit: c6cf898b583f88017bddbb57ea1bf6cfd84ca3b5
      
https://github.com/paparazzi/paparazzi/commit/c6cf898b583f88017bddbb57ea1bf6cfd84ca3b5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M sw/airborne/subsystems/radio_control/sbus.c

  Log Message:
  -----------
  [sbus] use new telemetry system for sbus


  Commit: e429db1dcf461052d2c3afb531e90f707f925804
      
https://github.com/paparazzi/paparazzi/commit/e429db1dcf461052d2c3afb531e90f707f925804
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M sw/airborne/boards/krooz/imu_krooz.c

  Log Message:
  -----------
  [telemetry] removed now unnecessary DOWNLINK_DEVICE define


  Commit: 52e86ec5dcc5e318125638d3bb57d82080c6e7b0
      
https://github.com/paparazzi/paparazzi/commit/52e86ec5dcc5e318125638d3bb57d82080c6e7b0
  Author: Felix Ruess <address@hidden>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/setup.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  [telemetry] fix compilaton of some jsbsim/nps/test targets


  Commit: 3e9231548846cb1b4d9fc8ab07e54221b5959f57
      
https://github.com/paparazzi/paparazzi/commit/3e9231548846cb1b4d9fc8ab07e54221b5959f57
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    M README.md
    M conf/Makefile.omap
    A conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/conf.xml
    A conf/airframes/CDW/tricopter_cdw.xml
    A conf/airframes/ENAC/fixed-wing/quark1.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/NoVa_L.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/182_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/184_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/186_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/188_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/189_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/190_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/191_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/192_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/193_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/194_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/195_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/196_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    A conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/conf.xml
    A conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    A conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/ardrone2_sdk.xml
    M conf/airframes/booz2_flixr.xml
    M conf/airframes/booz2_ppzuav.xml
    A conf/airframes/esden/calib/ls01-default.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/esden/qs_asp22.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    A conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/h_hex.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
    A conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    A conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/examples/quadshot_asp21_spektrum.xml
    A conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/Poine/booz2_a1.xml
    M conf/airframes/obsolete/Poine/booz2_a7.xml
    M conf/airframes/obsolete/Poine/h_hex.xml
    M conf/airframes/obsolete/Poine/test_libeknav.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/example_heli_lisam.xml
    M conf/airframes/obsolete/mm/rotor/qmk1.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
    M conf/boards/ardrone2_raw.makefile
    M conf/boards/ardrone2_sdk.makefile
    A conf/boards/lisa_s_0.1.makefile
    A conf/boards/px4fmu_1.7.makefile
    A conf/boards/stm32f4_discovery.makefile
    R conf/conf.xml.example
    R conf/conf.xml.tri
    A conf/conf_example.xml
    A conf/conf_tests.xml
    A conf/conf_tri.xml
    R conf/control_panel.xml.example
    A conf/control_panel_example.xml
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
    A conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
    M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
    M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
    M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
    M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
    M conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    R conf/firmwares/subsystems/fixedwing/joystick.makefile
    M conf/firmwares/subsystems/fixedwing/spi_slave_hs.makefile
    A conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/lisa_passthrough/radio_control_spektrum.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_extern_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_lkf.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_sirf.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_skytraq.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_ublox.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
    A conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_skiron.makefile
    R conf/firmwares/subsystems/shared/ahrs_gx3.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
    M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    A conf/firmwares/subsystems/shared/imu_gl1.makefile
    M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    A conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
    M conf/firmwares/subsystems/shared/imu_nps.makefile
    A conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
    M conf/firmwares/subsystems/shared/radio_control_datalink.makefile
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    M conf/firmwares/subsystems/shared/radio_control_sbus.makefile
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
    A conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
    M conf/flight_plans/rotorcraft_basic.xml
    A conf/flight_plans/rotorcraft_basic_superbitrf.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    A conf/flight_plans/zamboni_survey_test.xml
    R conf/maps.xml.example
    A conf/maps_example.xml
    M conf/messages.xml
    M conf/modules/AOA_adc.xml
    M conf/modules/baro_bmp.xml
    M conf/modules/baro_ms5611_i2c.xml
    A conf/modules/baro_ms5611_spi.xml
    A conf/modules/flight_time.xml
    A conf/modules/gumstix_qr_code_spi_link.xml
    M conf/modules/light.xml
    A conf/modules/osd_max7456.xml
    M conf/modules/sys_mon.xml
    A conf/modules/zamboni_survey.xml
    M conf/settings/control/rotorcraft_guidance.xml
    R conf/settings/estimation/booz2_ahrs_lkf.xml
    A conf/settings/modules/flight_time.xml
    M conf/settings/nps.xml
    A conf/simulator/jsbsim/aircraft/Engines/18x8.xml
    A conf/simulator/jsbsim/aircraft/Engines/Zenoah_G-26A.xml
    A conf/simulator/jsbsim/aircraft/LisaAspirin2.xml
    M conf/system/udev/rules/50-paparazzi.rules
    M conf/telemetry/default_rotorcraft.xml
    R conf/tests_conf.xml
    M data/maps/Makefile
    A make-release-tarball.sh
    M paparazzi_version
    A select_conf.py
    M sw/airborne/arch/lpc21/mcu_periph/gpio_arch.h
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
    M sw/airborne/arch/lpc21/subsystems/actuators/servos_ppm_hw.h
    M sw/airborne/arch/omap/led_hw.h
    A sw/airborne/arch/omap/mcu_periph/gpio_arch.h
    M sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.h
    A sw/airborne/arch/omap/serial_port.c
    A sw/airborne/arch/omap/serial_port.h
    R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
    R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
    A sw/airborne/arch/stm32/lisa-s.ld
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
    M sw/airborne/boards/ardrone/at_com.c
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.h
    A sw/airborne/boards/ardrone/electrical_raw.c
    A sw/airborne/boards/ardrone/electrical_raw.h
    M sw/airborne/boards/ardrone/gpio_ardrone.c
    R sw/airborne/boards/ardrone/gpio_ardrone.h
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    R sw/airborne/boards/krooz/baro_board.c
    M sw/airborne/boards/krooz/baro_board.h
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/boards/krooz/imu_krooz.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.h
    R sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
    R sw/airborne/boards/lisa_m/baro_ms5611_spi.c
    A sw/airborne/boards/lisa_s/baro_board.h
    A sw/airborne/boards/lisa_s_0.1.h
    A sw/airborne/boards/px4fmu/baro_board.h
    A sw/airborne/boards/px4fmu_1.7.h
    A sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/firmwares/beth/overo_test_uart.c
    M sw/airborne/firmwares/beth/uart_hw.c
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    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.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.h
    R sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
    R 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
    R sw/airborne/fms/fms_serial_port.c
    R sw/airborne/fms/fms_serial_port.h
    M sw/airborne/lisa/test/lisa_test_hmc5843.c
    M sw/airborne/lisa/test/lisa_test_itg3200.c
    M sw/airborne/lisa/test/test_board.c
    M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
    M sw/airborne/lisa/test_baro_i2c.c
    M sw/airborne/lisa/tunnel_hw.c
    M sw/airborne/math/pprz_algebra.h
    M sw/airborne/math/pprz_algebra_double.h
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/math/pprz_geodetic_double.h
    M sw/airborne/math/pprz_geodetic_float.h
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    M sw/airborne/math/pprz_simple_matrix.h
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/gpio.h
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/i2c.h
    M sw/airborne/mcu_periph/spi.h
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/bat_checker/bat_checker.c
    M sw/airborne/modules/bat_checker/bat_checker.h
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/core/sys_mon.h
    M sw/airborne/modules/geo_mag/geo_mag.c
    A sw/airborne/modules/gumstix_interface/qr_code_spi_link.c
    A sw/airborne/modules/gumstix_interface/qr_code_spi_link.h
    M sw/airborne/modules/ins/imu_chimu.c
    A sw/airborne/modules/max7456/max7456.c
    A sw/airborne/modules/max7456/max7456.h
    A sw/airborne/modules/max7456/max7456_regs.h
    A sw/airborne/modules/nav/zamboni_survey.c
    A sw/airborne/modules/nav/zamboni_survey.h
    R sw/airborne/modules/sensors/AOA_adc.c
    R sw/airborne/modules/sensors/AOA_adc.h
    M sw/airborne/modules/sensors/airspeed_adc.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    A sw/airborne/modules/sensors/aoa_adc.c
    A sw/airborne/modules/sensors/aoa_adc.h
    M sw/airborne/modules/sensors/baro_MS5534A.h
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_bmp.h
    M sw/airborne/modules/sensors/baro_board_module.h
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.h
    A sw/airborne/modules/sensors/baro_ms5611_spi.c
    A sw/airborne/modules/sensors/baro_ms5611_spi.h
    M sw/airborne/modules/sensors/baro_scp.h
    A sw/airborne/modules/time/flight_time.c
    A sw/airborne/modules/time/flight_time.h
    A sw/airborne/peripherals/bmp085.c
    A sw/airborne/peripherals/bmp085.h
    A sw/airborne/peripherals/bmp085_regs.h
    A sw/airborne/peripherals/cyrf6936.c
    A sw/airborne/peripherals/cyrf6936.h
    A sw/airborne/peripherals/cyrf6936_regs.h
    M sw/airborne/peripherals/l3g4200.c
    M sw/airborne/peripherals/l3g4200.h
    M sw/airborne/peripherals/l3g4200_regs.h
    A sw/airborne/peripherals/ms5611.c
    M sw/airborne/peripherals/ms5611.h
    A sw/airborne/peripherals/ms5611_i2c.c
    A sw/airborne/peripherals/ms5611_i2c.h
    A sw/airborne/peripherals/ms5611_regs.h
    A sw/airborne/peripherals/ms5611_spi.c
    A sw/airborne/peripherals/ms5611_spi.h
    M sw/airborne/state.h
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    R sw/airborne/subsystems/ahrs/ahrs_extern_quat.c
    R sw/airborne/subsystems/ahrs/ahrs_extern_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    R sw/airborne/subsystems/ahrs/ahrs_float_ekf.c
    R sw/airborne/subsystems/ahrs/ahrs_float_ekf.h
    R sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
    R sw/airborne/subsystems/ahrs/ahrs_float_lkf.h
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/ahrs/ahrs_gx3.c
    M sw/airborne/subsystems/ahrs/ahrs_gx3.h
    M sw/airborne/subsystems/datalink/datalink.h
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/pprz_transport.h
    A sw/airborne/subsystems/datalink/superbitrf.c
    A sw/airborne/subsystems/datalink/superbitrf.h
    M sw/airborne/subsystems/datalink/udp.c
    M sw/airborne/subsystems/electrical.c
    M sw/airborne/subsystems/electrical.h
    M sw/airborne/subsystems/gps/gps_ardrone2.c
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    M sw/airborne/subsystems/gps/gps_sim_nps.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
    M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    A sw/airborne/subsystems/imu/imu_gl1.c
    A sw/airborne/subsystems/imu/imu_gl1.h
    A sw/airborne/subsystems/imu/imu_gl1_defaults.h
    M sw/airborne/subsystems/imu/imu_nps.h
    A sw/airborne/subsystems/imu/imu_px4fmu.c
    A sw/airborne/subsystems/imu/imu_px4fmu.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    M sw/airborne/subsystems/ins/ins_int_extended.c
    A sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/common_nav.h
    M sw/airborne/subsystems/radio_control/sbus.c
    A sw/airborne/subsystems/radio_control/superbitrf_rc.c
    A sw/airborne/subsystems/radio_control/superbitrf_rc.h
    A sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    A sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    A sw/airborne/subsystems/sonar.h
    M sw/airborne/test/subsystems/test_ahrs.c
    M sw/airborne/test/subsystems/test_imu.c
    M sw/ext/ardrone2_drivers/cdc-acm.ko
    A sw/ext/ardrone2_drivers/check_update.sh
    R sw/ext/ardrone2_drivers/cp210x.ko
    R sw/ext/ardrone2_drivers/ftdi-sio.ko
    R sw/ext/ardrone2_drivers/pl2303.ko
    R sw/ext/ardrone2_drivers/usbserial.ko
    A sw/ext/ardrone2_drivers/wifi_setup.sh
    M sw/ground_segment/cockpit/editFP.ml
    M sw/lib/ocaml/maps_support.ml
    A sw/simulator/nps/nps_atmosphere.c
    M sw/simulator/nps/nps_atmosphere.h
    A sw/simulator/nps/nps_autopilot_fixedwing.c
    A sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_autopilot_rotorcraft.h
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h
    M sw/simulator/nps/nps_fdm.h
    M sw/simulator/nps/nps_fdm_jsbsim.c
    R sw/simulator/nps/nps_ivy.c
    M sw/simulator/nps/nps_ivy.h
    A sw/simulator/nps/nps_ivy_common.c
    A sw/simulator/nps/nps_ivy_fixedwing.c
    A sw/simulator/nps/nps_ivy_rotorcraft.c
    M sw/simulator/nps/nps_main.c
    M sw/simulator/nps/nps_radio_control_joystick.c
    M sw/simulator/pprzsim-launch
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/calibration/calibrate.py
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/dfu/stm32_mem.py
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_settings.ml
    M tests/examples/01_compile_all_test_targets.t

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into telemetry

Conflicts:
        conf/firmwares/subsystems/fixedwing/autopilot.makefile
        sw/airborne/boards/ardrone/navdata.c
        sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
        sw/airborne/boards/lisa_m/baro_ms5611_spi.c
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/fixedwing/main_ap.c
        sw/airborne/firmwares/rotorcraft/telemetry.h
        sw/airborne/mcu_periph/i2c.c
        sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
        sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
        sw/airborne/subsystems/datalink/downlink.h
        sw/tools/gen_periodic.ml


  Commit: cce8b99e4bd513b698756fa3869ff217a1bb4655
      
https://github.com/paparazzi/paparazzi/commit/cce8b99e4bd513b698756fa3869ff217a1bb4655
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M conf/messages.xml
    M sw/airborne/subsystems/datalink/telemetry.c
    M sw/airborne/subsystems/datalink/telemetry_common.h
    M sw/tools/gen_periodic.ml

  Log Message:
  -----------
  [telemetry] add error report


  Commit: 8de915bbf26cf0083b19ea56480534481cee58ea
      
https://github.com/paparazzi/paparazzi/commit/8de915bbf26cf0083b19ea56480534481cee58ea
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/setup.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/telemetry' into telemetry

Conflicts:
        conf/firmwares/subsystems/fixedwing/autopilot.makefile
        conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile


  Commit: 8ac5fd8d5bbe5416e68fe34e2f89afe5777a016e
      
https://github.com/paparazzi/paparazzi/commit/8ac5fd8d5bbe5416e68fe34e2f89afe5777a016e
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M Makefile
    M README.md
    M conf/Makefile.omap
    A conf/abi.xml
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/fixed-wing/weasel.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    R conf/airframes/NoVa_L.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/ardrone2_sdk.xml
    R conf/airframes/booz2_flixr.xml
    R conf/airframes/booz2_ppzuav.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/esden/qs_asp22.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/h_hex.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/examples/quadshot_asp21_spektrum.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    R conf/airframes/mentor_tum.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    A conf/airframes/obsolete/NoVa_L.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
    M conf/airframes/obsolete/Poine/booz2_a1.xml
    M conf/airframes/obsolete/Poine/booz2_a7.xml
    M conf/airframes/obsolete/Poine/h_hex.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    A conf/airframes/obsolete/booz2_flixr.xml
    A conf/airframes/obsolete/booz2_ppzuav.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.xml
    M conf/airframes/obsolete/example_heli_lisam.xml
    A conf/airframes/obsolete/mentor_tum.xml
    M conf/airframes/obsolete/mm/rotor/qmk1.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
    M conf/boards/stm32f4_discovery.makefile
    M conf/conf_example.xml
    M conf/conf_tests.xml
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
    A conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/flight_plans/flight_plan.dtd
    A conf/flight_plans/mission_fw.xml
    M conf/messages.xml
    M conf/modules/baro_amsys.xml
    R conf/modules/baro_board.xml
    M conf/modules/baro_ets.xml
    M conf/modules/baro_hca.xml
    M conf/modules/baro_mpl3115.xml
    M conf/modules/baro_ms5611_spi.xml
    A conf/modules/baro_sim.xml
    A conf/modules/mission_fw.xml
    M conf/settings/control/rotorcraft_guidance.xml
    A conf/settings/estimation/ahrs_float_cmpl.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M conf/settings/nps.xml
    M conf/simulator/nps/nps_sensors_params_aspirin_1.5.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
    M conf/simulator/nps/nps_sensors_params_default.h
    R sw/airborne/arch/sim/sim_baro.c
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/apogee/baro_board.h
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.h
    R sw/airborne/boards/ardrone/baro_board_dummy.c
    M sw/airborne/boards/ardrone2_raw.h
    M sw/airborne/boards/ardrone2_sdk.h
    A sw/airborne/boards/baro_board_ms5611_i2c.c
    A sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/booz/baro_board.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/krooz/baro_board.h
    M sw/airborne/boards/krooz_sd.h
    R sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_l/baro_board.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_s/baro_board.h
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/pc/baro_board.c
    M sw/airborne/boards/pc/baro_board.h
    M sw/airborne/boards/pc_sim.h
    M sw/airborne/boards/px4fmu/baro_board.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/boards/umarim/baro_board.h
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/datalink.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    R 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_saturate.h
    M sw/airborne/lisa/test_baro_i2c.c
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    A sw/airborne/math/pprz_isa.h
    M sw/airborne/modules/cam_control/cam_track.c
    A sw/airborne/modules/mission/mission.c
    A sw/airborne/modules/mission/mission.h
    A sw/airborne/modules/mission/mission_fw_nav.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/modules/sensors/baro_MS5534A.h
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_bmp.h
    R sw/airborne/modules/sensors/baro_board_module.c
    R sw/airborne/modules/sensors/baro_board_module.h
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/modules/sensors/baro_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_mpl3115.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.h
    M sw/airborne/modules/sensors/baro_ms5611_spi.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.h
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp.h
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    A sw/airborne/modules/sensors/baro_sim.c
    A sw/airborne/modules/sensors/baro_sim.h
    M sw/airborne/modules/sensors/pressure_board_navarro.c
    M sw/airborne/modules/sensors/pressure_board_navarro.h
    M sw/airborne/modules/vehicle_interface/vi_test_signal.c
    M sw/airborne/peripherals/mpl3115.c
    M sw/airborne/peripherals/mpl3115.h
    M sw/airborne/state.c
    M sw/airborne/subsystems/abi.h
    M sw/airborne/subsystems/abi_common.h
    A sw/airborne/subsystems/abi_sender_ids.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    A sw/airborne/subsystems/air_data.c
    A sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/hf_float.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/ins/ins_ardrone2.h
    M sw/airborne/subsystems/ins/ins_gps_passthrough.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    R sw/airborne/subsystems/ins/ins_int_extended.c
    R sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/sensors/baro.h
    R sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    R sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    M sw/airborne/test/Makefile
    M sw/airborne/test/test_geodetic.c
    M sw/in_progress/python/attitude_viz.py
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/expr_syntax.mli
    M sw/lib/ocaml/latlong.ml
    M sw/simulator/fg.c
    M sw/simulator/nps/nps_autopilot.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    R sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    R sw/simulator/nps/nps_autopilot_rotorcraft.h
    M sw/simulator/nps/nps_ivy_rotorcraft.c
    M sw/simulator/nps/nps_sensor_baro.c
    M sw/simulator/nps/nps_sensor_baro.h
    M sw/tools/calibration/calibrate.py
    M sw/tools/calibration/calibrate_gyro.py
    M sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/gen_abi.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_settings.ml

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

* master: (125 commits)
  [abi] define ABI x_SENDER_IDs in abi_sender_ids.h
  [sim] flight gear viz: daytime on all spots on the planet, not only France
  [abi] split abi messages from telemetry messages
  [fix] fix typo in actuators asctec v2
  [baro] fix baro scaling for booz and navgo
  [boards] sim pc: only USE_BARO_BOARD for nps
  [conf] move some airframes to obsolete
  [modules] add baro_sim
  [sim] remove unused sim_baro
  [apogee] fix baro mpl3115 init on apogee
  Update README for recommended gcc-arm-embedded toolchain
  [boards] stm32f4_discovery typo in description
  [boards] roughly correct BOOZ_BARO_SENS
  [modules] baro_ets: BARO_ETS_SCALE
  [modules] baro modules for real sensors only for ap target, not sim
  [conf] remove baro_board.xml module file
  [boards] update stm32f4_discovery
  [lib/ocaml] update leap_seconds
  [mission] fix segmentation fault and add generic mission FP
  [generator] generate arrays of the settings and fp blocks names
  ...

Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/fixedwing/main_ap.c
        sw/airborne/firmwares/rotorcraft/telemetry.h
        sw/airborne/modules/sensors/baro_MS5534A.c


  Commit: 72ea3b6aa623dea319946102ec7e50cec94e6058
      
https://github.com/paparazzi/paparazzi/commit/72ea3b6aa623dea319946102ec7e50cec94e6058
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M conf/messages.xml
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h

  Log Message:
  -----------
  [telemetry] update HOVER_LOOP

remove unused cmd_body and nav_err


  Commit: 61cb9a568ee2d80b14bf2eac891dfed4785b6cb7
      
https://github.com/paparazzi/paparazzi/commit/61cb9a568ee2d80b14bf2eac891dfed4785b6cb7
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/air_data.c
    M sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/ins/ins_int.c

  Log Message:
  -----------
  [telemetry] some updates for baro, ins, etc..

after merging master


  Commit: 7c8be3839cb993a6173b6268235c620023172c22
      
https://github.com/paparazzi/paparazzi/commit/7c8be3839cb993a6173b6268235c620023172c22
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M sw/airborne/mcu_periph/i2c.c

  Log Message:
  -----------
  [fix] typo in i2c.c


  Commit: 3614f53c0244744c8fc94c196f06e5191c71adff
      
https://github.com/paparazzi/paparazzi/commit/3614f53c0244744c8fc94c196f06e5191c71adff
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M conf/telemetry/default_fixedwing.xml
    M conf/telemetry/default_fixedwing_imu.xml
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/modules/cam_control/cam.c

  Log Message:
  -----------
  [telemetry] fix some messages downlink in main_ap and cam


  Commit: c384bc158ffaecec383827e443351c352debbfd3
      
https://github.com/paparazzi/paparazzi/commit/c384bc158ffaecec383827e443351c352debbfd3
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M .gitignore
    M conf/Makefile.stm32
    A conf/Makefile.stm32-upload
    M conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/ENAC/fixed-wing/crrcsim.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    A conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M conf/firmwares/subsystems/shared/imu_gl1.makefile
    A conf/settings/control/stabilization_att_float_euler.xml
    R conf/simulator/jsbsim/aircraft/BOOZ2_A1.xml
    R conf/simulator/jsbsim/aircraft/BOOZ2_A1P.xml
    R conf/simulator/jsbsim/aircraft/BOOZ2_F1.xml
    R conf/simulator/jsbsim/aircraft/Quad_LisaM_2.xml
    R conf/simulator/jsbsim/aircraft/fraser.xml
    A conf/simulator/jsbsim/aircraft/simple_quad.xml
    A conf/simulator/jsbsim/aircraft/simple_quad_ccw.xml
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/baro_board_ms5611_i2c.c
    M sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
    M sw/airborne/peripherals/mpl3115.c
    M sw/airborne/state.c
    M sw/airborne/subsystems/ahrs/ahrs_gx3.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/page_settings.ml
    M sw/ground_segment/python/settings_app/settingsapp.py
    M sw/ground_segment/tmtc/settings.ml
    M sw/simulator/nps/nps_autopilot.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_fdm.h
    A sw/simulator/nps/nps_fdm_crrcsim.c
    M sw/simulator/nps/nps_fdm_jsbsim.c
    M sw/simulator/nps/nps_main.c
    M sw/tools/gen_periodic.ml

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

fix ahrs_gx3 and stabilization_attitude_euler_float


  Commit: dd718fb597296162cbe15a1c00ab98933d4632cf
      
https://github.com/paparazzi/paparazzi/commit/dd718fb597296162cbe15a1c00ab98933d4632cf
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c

  Log Message:
  -----------
  [telemetry] send STAB_ATTITUDE and STAB_ATTITUDE_REF in quat_float

and fix body_rate and att_euler sending for euler_float


  Commit: fcb7949147e2153caf0fd01709b010e1d2f6a728
      
https://github.com/paparazzi/paparazzi/commit/fcb7949147e2153caf0fd01709b010e1d2f6a728
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c

  Log Message:
  -----------
  [telemetry] fix ARDRONE_NAVDATA


  Commit: 4310e5f743de26666b99b9bc7ead92f4e55d7a20
      
https://github.com/paparazzi/paparazzi/commit/4310e5f743de26666b99b9bc7ead92f4e55d7a20
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c

  Log Message:
  -----------
  [telemetry] fix TUNE_VERT


  Commit: bc3848104e9f266334fd3502dbf5a206fdb43b82
      
https://github.com/paparazzi/paparazzi/commit/bc3848104e9f266334fd3502dbf5a206fdb43b82
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M conf/messages.xml

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

get INS_Z fix from master


  Commit: 3717ead582baf69dee522c1a609d8f6a1df0c0b2
      
https://github.com/paparazzi/paparazzi/commit/3717ead582baf69dee522c1a609d8f6a1df0c0b2
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M sw/airborne/subsystems/datalink/telemetry.c
    M sw/airborne/subsystems/datalink/telemetry_common.h
    M sw/include/std.h

  Log Message:
  -----------
  [fix] fix compile warning with c++ (nps)


  Commit: 0bcdaeaaa603aaa853cd263101cb7f78caf9006f
      
https://github.com/paparazzi/paparazzi/commit/0bcdaeaaa603aaa853cd263101cb7f78caf9006f
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/modules/rotorcraft_cam.xml

  Log Message:
  -----------
  [conf] remove some now obsolete flags


  Commit: 4e86e7c89b785f28aa701cb8ff653b2e833cddb5
      
https://github.com/paparazzi/paparazzi/commit/4e86e7c89b785f28aa701cb8ff653b2e833cddb5
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/modules/gps_ubx_ucenter.xml
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_mpl3115.h
    M sw/airborne/test/ahrs/Makefile
    M sw/airborne/test/ahrs/ahrs_utils.py
    M sw/airborne/test/ahrs/compare_ahrs.py
    M sw/airborne/test/ahrs/run_ahrs_on_synth.c

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

to resolve
Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h


  Commit: 7d87b888a808deaaf15f0b86f12551797a78f9c0
      
https://github.com/paparazzi/paparazzi/commit/7d87b888a808deaaf15f0b86f12551797a78f9c0
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M sw/airborne/subsystems/imu.c

  Log Message:
  -----------
  [telemetry] allow sending of MAG message even if not USE_MAGNETOMETER


  Commit: 931cefe43e3558b76621ece1d423cc062d852015
      
https://github.com/paparazzi/paparazzi/commit/931cefe43e3558b76621ece1d423cc062d852015
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-28 (Mon, 28 Oct 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h

  Log Message:
  -----------
  [rotorcraft] attempt at some cleaner stabilization includes


  Commit: 81631c2f8e28804791bc01816bf79da9e6edc7fa
      
https://github.com/paparazzi/paparazzi/commit/81631c2f8e28804791bc01816bf79da9e6edc7fa
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sw/airborne/test/ahrs/ahrs_utils.py
    M sw/airborne/test/ahrs/compare_ahrs.py

  Log Message:
  -----------
  [test] some python cleanup


  Commit: 2f37affd61c8fd931eed22b971647a788de3b1db
      
https://github.com/paparazzi/paparazzi/commit/2f37affd61c8fd931eed22b971647a788de3b1db
  Author: Ben Laurie <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M conf/modules/gps_ubx_ucenter.xml
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.h
    M sw/airborne/subsystems/gps/gps_ubx.c
    M sw/airborne/subsystems/gps/gps_ubx.h

  Log Message:
  -----------
  [modules] Compile gps_ubx_ucenter.c independently.

closes #571


  Commit: 314d4f6e64e1a684359db819c4ae7c9745160a59
      
https://github.com/paparazzi/paparazzi/commit/314d4f6e64e1a684359db819c4ae7c9745160a59
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sw/tools/calibration/calibrate_gyro.py
    M sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py

  Log Message:
  -----------
  [tool] some more python cleanup


  Commit: 48e9072a7e7d6c8c17718eefcc8f6bb51d1e515e
      
https://github.com/paparazzi/paparazzi/commit/48e9072a7e7d6c8c17718eefcc8f6bb51d1e515e
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    M sw/airborne/math/Makefile
    M sw/airborne/math/README

  Log Message:
  -----------
  [math] minor update for math lib building

use PAPARAZZI_HOME and install to /usr/local by default


  Commit: 69feae7dc62c75a53425a4894d2ce7b466546e7f
      
https://github.com/paparazzi/paparazzi/commit/69feae7dc62c75a53425a4894d2ce7b466546e7f
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    R conf/firmwares/booz2_common.makefile
    R conf/firmwares/booz2_test_progs.makefile
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/rotorcraft.makefile
    R conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
    R sw/airborne/booz/test/Makefile
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.h
    R sw/airborne/booz/test/booz2_test_crista.c
    R sw/airborne/booz/test/booz2_test_gps.c
    R sw/airborne/booz/test/booz2_test_max1168.c
    R sw/airborne/booz/test/booz2_test_usb.c
    R sw/airborne/booz/test/plot_scaling.sce
    R sw/airborne/booz/test/plot_test_vg_adpt.sce
    R sw/airborne/booz/test/plot_test_vg_ref.sce
    R sw/airborne/booz/test/test_mlkf.c
    R sw/airborne/booz/test/test_mlkf.sce
    R sw/airborne/booz/test/test_scaling.c
    R sw/airborne/booz/test/test_vg_adpt.c
    R sw/airborne/booz/test/test_vg_ref.c
    R sw/airborne/booz/test/vert_loop.dat.bz2
    M sw/airborne/test/Makefile
    R sw/airborne/test/nova_test_imu.c

  Log Message:
  -----------
  [conf][test] cleanup: remove old booz stuff


  Commit: c9fa0b46924bad8c7cfd4640bdc31ab62c0d0dda
      
https://github.com/paparazzi/paparazzi/commit/c9fa0b46924bad8c7cfd4640bdc31ab62c0d0dda
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-29 (Tue, 29 Oct 2013)

  Changed paths:
    R sw/simulator/old_booz/booz2_sim_main.c
    R sw/simulator/old_booz/booz_flight_model.c
    R sw/simulator/old_booz/booz_flight_model.h
    R sw/simulator/old_booz/booz_flight_model_params.h
    R sw/simulator/old_booz/booz_flight_model_utils.c
    R sw/simulator/old_booz/booz_flight_model_utils.h
    R sw/simulator/old_booz/booz_flightgear.c
    R sw/simulator/old_booz/booz_flightgear.h
    R sw/simulator/old_booz/booz_joystick.c
    R sw/simulator/old_booz/booz_joystick.h
    R sw/simulator/old_booz/booz_joystick_fake.h
    R sw/simulator/old_booz/booz_r250.c
    R sw/simulator/old_booz/booz_r250.h
    R sw/simulator/old_booz/booz_randlcg.c
    R sw/simulator/old_booz/booz_randlcg.h
    R sw/simulator/old_booz/booz_rc_sim.h
    R sw/simulator/old_booz/booz_sensors_model.c
    R sw/simulator/old_booz/booz_sensors_model.h
    R sw/simulator/old_booz/booz_sensors_model_accel.c
    R sw/simulator/old_booz/booz_sensors_model_baro.c
    R sw/simulator/old_booz/booz_sensors_model_gps.c
    R sw/simulator/old_booz/booz_sensors_model_gyro.c
    R sw/simulator/old_booz/booz_sensors_model_mag.c
    R sw/simulator/old_booz/booz_sensors_model_params_booz2.h
    R sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
    R sw/simulator/old_booz/booz_sensors_model_rangemeter.c
    R sw/simulator/old_booz/booz_sensors_model_utils.c
    R sw/simulator/old_booz/booz_sensors_model_utils.h
    R sw/simulator/old_booz/booz_wind_model.c
    R sw/simulator/old_booz/booz_wind_model.h
    R sw/simulator/old_booz/tests/Makefile
    R sw/simulator/old_booz/tests/test_fdm.c
    R sw/simulator/old_booz/tests/test_sensors.c
    R sw/simulator/sim_ac_booz.c

  Log Message:
  -----------
  [simulator] cleanup: remove old_booz sim


  Commit: 84cf87cfa5f37a0ab5537c1ff9358df9df472fa9
      
https://github.com/paparazzi/paparazzi/commit/84cf87cfa5f37a0ab5537c1ff9358df9df472fa9
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    A conf/settings/estimation/ahrs_float_mlkf.xml
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h

  Log Message:
  -----------
  [ahrs] float_mlkf: configurable mag measurement noise


  Commit: 880791866833a5389e7b45c141dbfe1c8de81b92
      
https://github.com/paparazzi/paparazzi/commit/880791866833a5389e7b45c141dbfe1c8de81b92
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M conf/Makefile.geode
    M conf/Makefile.jsbsim
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.pentium-m
    M conf/Makefile.sim
    M conf/Makefile.stm32

  Log Message:
  -----------
  [conf] fix/improve dependecy generation


  Commit: 93e3839b5faea6ad6053a92a9aed9f1793ddeaad
      
https://github.com/paparazzi/paparazzi/commit/93e3839b5faea6ad6053a92a9aed9f1793ddeaad
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c

  Log Message:
  -----------
  [stm32] add support for TIM3,4,5,8 for ppm input

Thanks to Chris!
This finally closes #557


  Commit: f66af2943c9e92b52fca59f2cf38ae46a2b637bf
      
https://github.com/paparazzi/paparazzi/commit/f66af2943c9e92b52fca59f2cf38ae46a2b637bf
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml

  Log Message:
  -----------
  [paparazzicenter] move target button to menu and print simple error message


  Commit: d00a30464fc44ffefa407e8abeb282b3b38a172c
      
https://github.com/paparazzi/paparazzi/commit/d00a30464fc44ffefa407e8abeb282b3b38a172c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/supervision/paparazzicenter.glade

  Log Message:
  -----------
  [paparazzicenter] add tooltip to 'new build target'


  Commit: 74dc09c43e2d5f574d546593f1085edf7bb4f3d0
      
https://github.com/paparazzi/paparazzi/commit/74dc09c43e2d5f574d546593f1085edf7bb4f3d0
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapWaypoints.ml

  Log Message:
  -----------
  [GCS] Added outlines to labels on the 2dmap.


  Commit: bca3fea1cfb0e228c0b3e20bf3be0cb803840f37
      
https://github.com/paparazzi/paparazzi/commit/bca3fea1cfb0e228c0b3e20bf3be0cb803840f37
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/lib/ocaml/Makefile
    A sw/lib/ocaml/contrastLabel.ml
    A sw/lib/ocaml/contrastLabel.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/mapWaypoints.mli

  Log Message:
  -----------
  [GCS] Made the contrast label it's own class.

The outlines should now also be less jagged as I am covering all pixel
directions.


  Commit: 7d2e85e77e7c42fa0d63d8fdde47025ce2bcf208
      
https://github.com/paparazzi/paparazzi/commit/7d2e85e77e7c42fa0d63d8fdde47025ce2bcf208
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/lib/ocaml/Makefile
    A sw/lib/ocaml/acIcon.ml
    A sw/lib/ocaml/acIcon.mli
    M sw/lib/ocaml/mapTrack.ml

  Log Message:
  -----------
  [GCS] Added outline to the aircraft icon.

Also extracted the aircraft icon into it's own class for future
expansion.


  Commit: 7a18330ab6c2beb36dbc505c48495d0856edefdb
      
https://github.com/paparazzi/paparazzi/commit/7a18330ab6c2beb36dbc505c48495d0856edefdb
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/live.ml
    M sw/lib/ocaml/acIcon.ml
    M sw/lib/ocaml/acIcon.mli
    M sw/lib/ocaml/contrastLabel.ml
    M sw/lib/ocaml/contrastLabel.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapTrack.mli

  Log Message:
  -----------
  [GCS] improve icon handling

add new icon for rotorcraft and home
can be set from airframe file
using firmware name as possible default


  Commit: e3830578fb024a66a5a458ac25fc852489897979
      
https://github.com/paparazzi/paparazzi/commit/e3830578fb024a66a5a458ac25fc852489897979
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M conf/messages.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/firmwares/fixedwing/datalink.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c

  Log Message:
  -----------
  [telemetry] fix some remaining telemetry messages


  Commit: e0c3b23c7b994b691f72fb0143ad4017f4d9b082
      
https://github.com/paparazzi/paparazzi/commit/e0c3b23c7b994b691f72fb0143ad4017f4d9b082
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/airborne/math/pprz_algebra_int.h
    A sw/airborne/peripherals/lis302dl.h
    A sw/airborne/peripherals/lis302dl_regs.h
    A sw/airborne/peripherals/lis302dl_spi.c
    A sw/airborne/peripherals/lis302dl_spi.h

  Log Message:
  -----------
  [peripherals] initial LIS302DL driver


  Commit: dd38f018d264e1f3f031567eb6e60a5aa4901690
      
https://github.com/paparazzi/paparazzi/commit/dd38f018d264e1f3f031567eb6e60a5aa4901690
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M conf/airframes/examples/stm32f4_discovery_test.xml
    A conf/firmwares/test_progs.makefile
    M sw/airborne/boards/stm32f4_discovery.h
    A sw/airborne/test/peripherals/test_lis302dl_spi.c

  Log Message:
  -----------
  add some tests


  Commit: 083ec6be83bd2e6c8f6a1ca7edad368babca15d5
      
https://github.com/paparazzi/paparazzi/commit/083ec6be83bd2e6c8f6a1ca7edad368babca15d5
  Author: Stephen Dwyer <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c

  Log Message:
  -----------
  [stm32][gpio] Add clock enable for ports E - I


  Commit: f6d2b476f598df7330cb59b23eb750e4106fae2c
      
https://github.com/paparazzi/paparazzi/commit/f6d2b476f598df7330cb59b23eb750e4106fae2c
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    A sw/airborne/test/stabilization/.gitignore
    A sw/airborne/test/stabilization/README.md
    A sw/airborne/test/stabilization/algebra_float.pxd
    A sw/airborne/test/stabilization/algebra_float.pyx
    A sw/airborne/test/stabilization/algebra_int.pxd
    A sw/airborne/test/stabilization/algebra_int.pyx
    A sw/airborne/test/stabilization/compare_ref_quat.py
    A sw/airborne/test/stabilization/generated/airframe.h
    A sw/airborne/test/stabilization/pprz_algebra_double_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_float_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_int_c.pxd
    A sw/airborne/test/stabilization/ref_quat_float.pyx
    A sw/airborne/test/stabilization/ref_quat_int.pyx
    A sw/airborne/test/stabilization/setup.py

  Log Message:
  -----------
  [test] playing around with cython wrappers


  Commit: a0350247b39a7742ee9bad7e388292a043a4e3e4
      
https://github.com/paparazzi/paparazzi/commit/a0350247b39a7742ee9bad7e388292a043a4e3e4
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M .gitignore
    A Vagrantfile
    A sw/extras/bootstrap_vm.sh
    A sw/extras/setup_git_aliases.sh

  Log Message:
  -----------
  add files to start a new VM via Vagrant

closes #573


  Commit: 7ee4fd764c9791dddf409decc7694937d9b8ae77
      
https://github.com/paparazzi/paparazzi/commit/7ee4fd764c9791dddf409decc7694937d9b8ae77
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M conf/telemetry/default_fixedwing_imu.xml

  Log Message:
  -----------
  [telemetry] slightly changing alive freq

it seems to work better, to many messages was sent on the same time slot
before, and ALIVE was often skiped


  Commit: be993f6b64a214bd9665095a49a68fa770c5f33f
      
https://github.com/paparazzi/paparazzi/commit/be993f6b64a214bd9665095a49a68fa770c5f33f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M sw/airborne/subsystems/air_data.c
    M sw/airborne/subsystems/air_data.h

  Log Message:
  -----------
  [air_data] use static function for telemetry


  Commit: c37d31a39047fcb5583df8d8ade56c50fa38e350
      
https://github.com/paparazzi/paparazzi/commit/c37d31a39047fcb5583df8d8ade56c50fa38e350
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .gitignore
    A Vagrantfile
    M conf/Makefile.geode
    M conf/Makefile.jsbsim
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.pentium-m
    M conf/Makefile.sim
    M conf/Makefile.stm32
    M conf/airframes/examples/stm32f4_discovery_test.xml
    R conf/firmwares/booz2_common.makefile
    R conf/firmwares/booz2_test_progs.makefile
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/rotorcraft.makefile
    R conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
    A conf/firmwares/test_progs.makefile
    M conf/modules/gps_ubx_ucenter.xml
    A conf/settings/estimation/ahrs_float_mlkf.xml
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/boards/stm32f4_discovery.h
    R sw/airborne/booz/test/Makefile
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.h
    R sw/airborne/booz/test/booz2_test_crista.c
    R sw/airborne/booz/test/booz2_test_gps.c
    R sw/airborne/booz/test/booz2_test_max1168.c
    R sw/airborne/booz/test/booz2_test_usb.c
    R sw/airborne/booz/test/plot_scaling.sce
    R sw/airborne/booz/test/plot_test_vg_adpt.sce
    R sw/airborne/booz/test/plot_test_vg_ref.sce
    R sw/airborne/booz/test/test_mlkf.c
    R sw/airborne/booz/test/test_mlkf.sce
    R sw/airborne/booz/test/test_scaling.c
    R sw/airborne/booz/test/test_vg_adpt.c
    R sw/airborne/booz/test/test_vg_ref.c
    R sw/airborne/booz/test/vert_loop.dat.bz2
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
    M sw/airborne/math/Makefile
    M sw/airborne/math/README
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.h
    A sw/airborne/peripherals/lis302dl.h
    A sw/airborne/peripherals/lis302dl_regs.h
    A sw/airborne/peripherals/lis302dl_spi.c
    A sw/airborne/peripherals/lis302dl_spi.h
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/gps/gps_ubx.c
    M sw/airborne/subsystems/gps/gps_ubx.h
    M sw/airborne/test/Makefile
    M sw/airborne/test/ahrs/ahrs_utils.py
    M sw/airborne/test/ahrs/compare_ahrs.py
    R sw/airborne/test/nova_test_imu.c
    A sw/airborne/test/peripherals/test_lis302dl_spi.c
    A sw/airborne/test/stabilization/.gitignore
    A sw/airborne/test/stabilization/README.md
    A sw/airborne/test/stabilization/algebra_float.pxd
    A sw/airborne/test/stabilization/algebra_float.pyx
    A sw/airborne/test/stabilization/algebra_int.pxd
    A sw/airborne/test/stabilization/algebra_int.pyx
    A sw/airborne/test/stabilization/compare_ref_quat.py
    A sw/airborne/test/stabilization/generated/airframe.h
    A sw/airborne/test/stabilization/pprz_algebra_double_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_float_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_int_c.pxd
    A sw/airborne/test/stabilization/ref_quat_float.pyx
    A sw/airborne/test/stabilization/ref_quat_int.pyx
    A sw/airborne/test/stabilization/setup.py
    A sw/extras/bootstrap_vm.sh
    A sw/extras/setup_git_aliases.sh
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/live.ml
    M sw/lib/ocaml/Makefile
    A sw/lib/ocaml/acIcon.ml
    A sw/lib/ocaml/acIcon.mli
    A sw/lib/ocaml/contrastLabel.ml
    A sw/lib/ocaml/contrastLabel.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapTrack.mli
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/mapWaypoints.mli
    R sw/simulator/old_booz/booz2_sim_main.c
    R sw/simulator/old_booz/booz_flight_model.c
    R sw/simulator/old_booz/booz_flight_model.h
    R sw/simulator/old_booz/booz_flight_model_params.h
    R sw/simulator/old_booz/booz_flight_model_utils.c
    R sw/simulator/old_booz/booz_flight_model_utils.h
    R sw/simulator/old_booz/booz_flightgear.c
    R sw/simulator/old_booz/booz_flightgear.h
    R sw/simulator/old_booz/booz_joystick.c
    R sw/simulator/old_booz/booz_joystick.h
    R sw/simulator/old_booz/booz_joystick_fake.h
    R sw/simulator/old_booz/booz_r250.c
    R sw/simulator/old_booz/booz_r250.h
    R sw/simulator/old_booz/booz_randlcg.c
    R sw/simulator/old_booz/booz_randlcg.h
    R sw/simulator/old_booz/booz_rc_sim.h
    R sw/simulator/old_booz/booz_sensors_model.c
    R sw/simulator/old_booz/booz_sensors_model.h
    R sw/simulator/old_booz/booz_sensors_model_accel.c
    R sw/simulator/old_booz/booz_sensors_model_baro.c
    R sw/simulator/old_booz/booz_sensors_model_gps.c
    R sw/simulator/old_booz/booz_sensors_model_gyro.c
    R sw/simulator/old_booz/booz_sensors_model_mag.c
    R sw/simulator/old_booz/booz_sensors_model_params_booz2.h
    R sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
    R sw/simulator/old_booz/booz_sensors_model_rangemeter.c
    R sw/simulator/old_booz/booz_sensors_model_utils.c
    R sw/simulator/old_booz/booz_sensors_model_utils.h
    R sw/simulator/old_booz/booz_wind_model.c
    R sw/simulator/old_booz/booz_wind_model.h
    R sw/simulator/old_booz/tests/Makefile
    R sw/simulator/old_booz/tests/test_fdm.c
    R sw/simulator/old_booz/tests/test_sensors.c
    R sw/simulator/sim_ac_booz.c
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/tools/calibration/calibrate_gyro.py
    M sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into telemetry


  Commit: 6b34ad12e150853ead6279394c23a6805c33a23b
      
https://github.com/paparazzi/paparazzi/commit/6b34ad12e150853ead6279394c23a6805c33a23b
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M conf/Makefile.arm-embedded-toolchain

  Log Message:
  -----------
  [conf] print meaninful error if arm toolchain is not found


  Commit: 8191fe45be31bdeb8b2e100dbe12652230e20332
      
https://github.com/paparazzi/paparazzi/commit/8191fe45be31bdeb8b2e100dbe12652230e20332
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M conf/Makefile.arm-embedded-toolchain

  Log Message:
  -----------
  ups, fix typo from last commit


  Commit: cc9e08538cf32abefb710018579ddbbce125900a
      
https://github.com/paparazzi/paparazzi/commit/cc9e08538cf32abefb710018579ddbbce125900a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/setup.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
    M conf/messages.xml
    M conf/modules/rotorcraft_cam.xml
    M conf/telemetry/default_fixedwing.xml
    M conf/telemetry/default_fixedwing_imu.xml
    M conf/telemetry/default_fixedwing_imu_9k6.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/sim/jsbsim_hw.h
    M sw/airborne/arch/sim/sim_ap.c
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/boards/navgo/imu_navgo.c
    M sw/airborne/boards/umarim/imu_umarim.c
    M sw/airborne/firmwares/beth/rcv_telemetry.c
    R sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/datalink.c
    R sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    A sw/airborne/firmwares/rotorcraft/rotorcraft_telemetry.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    R sw/airborne/firmwares/rotorcraft/telemetry.c
    R sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/firmwares/setup/setup_actuators.c
    M sw/airborne/link_mcu_spi.c
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/modules/MPPT/MPPT.c
    M sw/airborne/modules/MPPT/sim_MPPT.c
    M sw/airborne/modules/adcs/adc_generic.c
    M sw/airborne/modules/benchmark/flight_benchmark.c
    M sw/airborne/modules/cam_control/cam.c
    M sw/airborne/modules/cam_control/cam.h
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/modules/cartography/cartography.c
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/datalink/xtend_rssi.c
    M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
    M sw/airborne/modules/digital_cam/dc.c
    M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
    M sw/airborne/modules/enose/anemotaxis.c
    M sw/airborne/modules/enose/chemotaxis.c
    M sw/airborne/modules/enose/enose.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gsm/gsm.c
    M sw/airborne/modules/ins/ahrs_chimu_spi.c
    M sw/airborne/modules/ins/ahrs_chimu_uart.c
    M sw/airborne/modules/ins/alt_filter.c
    M sw/airborne/modules/ins/ins_arduimu.c
    M sw/airborne/modules/ins/ins_arduimu_basic.c
    M sw/airborne/modules/ins/ins_vn100.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/max3100/max3100_hw.c
    M sw/airborne/modules/meteo/charge_sens.c
    M sw/airborne/modules/meteo/dust_gp2y.c
    M sw/airborne/modules/meteo/geiger_counter.c
    M sw/airborne/modules/meteo/humid_dpicco.c
    M sw/airborne/modules/meteo/humid_hih.c
    M sw/airborne/modules/meteo/humid_htm_b71.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/meteo/humid_sht.c
    M sw/airborne/modules/meteo/humid_sht_i2c.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/light_solar.c
    M sw/airborne/modules/meteo/light_temt.c
    M sw/airborne/modules/meteo/temp_lm75.c
    M sw/airborne/modules/meteo/temp_tcouple_adc.c
    M sw/airborne/modules/meteo/temp_temod.c
    M sw/airborne/modules/meteo/temp_tmp102.c
    M sw/airborne/modules/meteo/windturbine.c
    M sw/airborne/modules/multi/formation.c
    M sw/airborne/modules/multi/potential.c
    M sw/airborne/modules/multi/tcas.c
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/openlog/openlog.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/alt_srf08.c
    M sw/airborne/modules/sensors/aoa_adc.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    M sw/airborne/modules/sensors/imu_aspirin2.c
    M sw/airborne/modules/sensors/mag_hmc5843.c
    M sw/airborne/modules/sensors/mag_hmc58xx.c
    M sw/airborne/modules/sensors/mag_micromag_fw.c
    M sw/airborne/modules/sonar/sonar_adc.c
    M sw/airborne/subsystems/ahrs/ahrs_aligner.c
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    M sw/airborne/subsystems/ahrs/ahrs_gx3.c
    M sw/airborne/subsystems/ahrs/ahrs_infrared.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/air_data.c
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/superbitrf.c
    A sw/airborne/subsystems/datalink/telemetry.c
    A sw/airborne/subsystems/datalink/telemetry.h
    A sw/airborne/subsystems/datalink/telemetry_common.h
    M sw/airborne/subsystems/gps.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/navigation/discsurvey.c
    M sw/airborne/subsystems/radio_control/ppm.c
    M sw/airborne/subsystems/radio_control/sbus.c
    M sw/include/std.h
    M sw/tools/gen_periodic.ml

  Log Message:
  -----------
  Merge pull request #472 from paparazzi/telemetry

Telemetry


  Commit: 3c9dd7c9375d5a98952c2364a7b3debb93688e4d
      
https://github.com/paparazzi/paparazzi/commit/3c9dd7c9375d5a98952c2364a7b3debb93688e4d
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile

  Log Message:
  -----------
  [conf] no telemetry for fbw target


  Commit: 90dcff721d7a045b063ab89e8ccf9be289e6f2ad
      
https://github.com/paparazzi/paparazzi/commit/90dcff721d7a045b063ab89e8ccf9be289e6f2ad
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M sw/airborne/subsystems/imu.c

  Log Message:
  -----------
  [telemetry] workaround for disabling send_mag_calib on dualApFbw


  Commit: cd712fc9079dd86d670b77faa38d294e0b1f31c4
      
https://github.com/paparazzi/paparazzi/commit/cd712fc9079dd86d670b77faa38d294e0b1f31c4
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    A conf/modules/send_imu_mag_current.xml
    M conf/telemetry/default_rotorcraft.xml
    A sw/airborne/modules/calibration/send_imu_mag_current.c
    A sw/airborne/modules/calibration/send_imu_mag_current.h
    M sw/airborne/subsystems/imu.c

  Log Message:
  -----------
  [modules] move sending of IMU_MAG_CURRENT_CALIBRATION to a module


  Commit: da012dc9b57a1d6e2259c56422b52730ca3b533d
      
https://github.com/paparazzi/paparazzi/commit/da012dc9b57a1d6e2259c56422b52730ca3b533d
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M sw/airborne/modules/calibration/send_imu_mag_current.h

  Log Message:
  -----------
  [modules] fix filename in dox


  Commit: 69684d1994bb067c7314fe06e38dd1e19932a3ed
      
https://github.com/paparazzi/paparazzi/commit/69684d1994bb067c7314fe06e38dd1e19932a3ed
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M create_module

  Log Message:
  -----------
  [tool] fix create module script


  Commit: 3035d9f517958e03de9167a80140bf204e80f267
      
https://github.com/paparazzi/paparazzi/commit/3035d9f517958e03de9167a80140bf204e80f267
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M conf/telemetry/default_fixedwing_imu.xml

  Log Message:
  -----------
  [telemetry] change period of some messages

so they are not multiples of each others
the uart transmit buffer is slightly to small when using xbee_api and
svinfo is send with gps message


  Commit: eb4e235dc4feb4ca26780412cbf3ca1dedd53a02
      
https://github.com/paparazzi/paparazzi/commit/eb4e235dc4feb4ca26780412cbf3ca1dedd53a02
  Author: mayrit <address@hidden>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M conf/airframes/examples/microjet.xml
    M sw/lib/ocaml/acIcon.ml
    M sw/lib/ocaml/acIcon.mli
    M sw/lib/ocaml/mapTrack.ml

  Log Message:
  -----------
  Added a flying-wing A/C Icon, and showed an exaple on microjet airframe


  Commit: 61349d29f1033a0f7b6e596b98e3ed2e1a6f2054
      
https://github.com/paparazzi/paparazzi/commit/61349d29f1033a0f7b6e596b98e3ed2e1a6f2054
  Author: mayrit <address@hidden>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M sw/lib/ocaml/mapTrack.ml

  Log Message:
  -----------
  Corrected the typo which prevents the conventional A/C icon selection


  Commit: a9eccf6b41ecd7dd385c9526dd0df0e0fc8ce00c
      
https://github.com/paparazzi/paparazzi/commit/a9eccf6b41ecd7dd385c9526dd0df0e0fc8ce00c
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  [tools] stm32_mem.py: add option to only list devices

and make the dry run option an alias for list


  Commit: 174168b6e9915fa1de1d4e6a24eebd8e14cffd4d
      
https://github.com/paparazzi/paparazzi/commit/174168b6e9915fa1de1d4e6a24eebd8e14cffd4d
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h

  Log Message:
  -----------
  [rotorcraft] include airframe.h in guidance_x_ref.h


  Commit: 116a0fdd8a96a93d65fb1c27b198a8c16b67af84
      
https://github.com/paparazzi/paparazzi/commit/116a0fdd8a96a93d65fb1c27b198a8c16b67af84
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M sw/tools/gen_periodic.ml

  Log Message:
  -----------
  [telemetry] reverse order of messages to send periodicaly

This way, messages that are send at low frequency have less chance to be
discarded if the uart buffer is filled by too many messages at the same
time. Higher frequency messages are most likely to find an empty slot.


  Commit: f8334066bb8421bd50a79910076241cd6ee49fd8
      
https://github.com/paparazzi/paparazzi/commit/f8334066bb8421bd50a79910076241cd6ee49fd8
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile

  Log Message:
  -----------
  [conf] fixedwing ahrs use gps course instead of mag for heading by default


  Commit: 0c7c09c740e9528cedbeba82f7947d5c5c109f52
      
https://github.com/paparazzi/paparazzi/commit/0c7c09c740e9528cedbeba82f7947d5c5c109f52
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] warn if PERIODIC_FREQUENCY is lower than AHRS freqs


  Commit: a0fcc68b7ea4de34eb224829a7abdf1a44bf5074
      
https://github.com/paparazzi/paparazzi/commit/a0fcc68b7ea4de34eb224829a7abdf1a44bf5074
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  [config] better warning message and update example airframe


  Commit: c3b41db698fd5984021f37f783a0900bde5f79d0
      
https://github.com/paparazzi/paparazzi/commit/c3b41db698fd5984021f37f783a0900bde5f79d0
  Author: podhrmic <address@hidden>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c

  Log Message:
  -----------
  [stabilization] Float euler bounding and scaling fix
- added BoundAbs to properly bound the commands
- removed gain denominators in the control loop (i.e. now the gains should be 
more consistent with other stabilization systems)

First, it is easier to set your gains now, as the values set by GCS/airframe 
config are the ones actually used (no division).
Second, the gains are in the same range as for other stabilization systems (no 
need to change xml settings files for GCS to get proper range).


  Commit: 0d7f4f5724215d1231f03668ccaf788aa315b6aa
      
https://github.com/paparazzi/paparazzi/commit/0d7f4f5724215d1231f03668ccaf788aa315b6aa
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M sw/logalizer/plotter.ml

  Log Message:
  -----------
  [plotter] open new plotter with parent settings


  Commit: 380482311059e1caf363d55a9048fd7ebb00eee8
      
https://github.com/paparazzi/paparazzi/commit/380482311059e1caf363d55a9048fd7ebb00eee8
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M sw/logalizer/plot.ml

  Log Message:
  -----------
  [plot] draw curves at low resolution when moving/selecting in log plotter

much faster when dealing with huge logs


  Commit: 6e5469d0cdd65e54406375e462a6c9226ec84cb8
      
https://github.com/paparazzi/paparazzi/commit/6e5469d0cdd65e54406375e462a6c9226ec84cb8
  Author: podhrmic <address@hidden>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c

  Log Message:
  -----------
  [stabilization] fixed MAX_SUM_ERR


  Commit: 8a782ca3e22e94c2e6dd1a6d198c94d91314cb8c
      
https://github.com/paparazzi/paparazzi/commit/8a782ca3e22e94c2e6dd1a6d198c94d91314cb8c
  Author: softsr <address@hidden>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    A conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    A conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/boards/krooz/imu_krooz.h
    A sw/airborne/boards/krooz/imu_krooz_memsic.c
    A sw/airborne/boards/krooz/imu_krooz_memsic.h

  Log Message:
  -----------
  [boards] add driver for KroozSD BigRotorcraftEdition

- IMU with memsic MXR9500 accelerometer
- set mag correct freq to 75Hz for krooz_sd_x

closes #586


  Commit: f5704110365492836cbbff7b39908eb5bcac3951
      
https://github.com/paparazzi/paparazzi/commit/f5704110365492836cbbff7b39908eb5bcac3951
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M conf/Makefile.arm-common
    M conf/Makefile.arm-embedded
    M conf/Makefile.arm-embedded-toolchain
    M conf/Makefile.arm-linux
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.stm32-upload
    M sw/ext/Makefile

  Log Message:
  -----------
  [build] ARM toolchain/Makefile cleanup

- possible to explicitly pass a PREFIX to use other toolchain
  default for PREFIX is arm-none-eabi or arm-linux-gnueabi
- print meaninfull error if arm-linux toolchain is not found
- printcommands prints only CC and GCC version
- remove obsolete find OpenOCD stuff


  Commit: 9613239e8109a23b77817bda87a6de2812c097f3
      
https://github.com/paparazzi/paparazzi/commit/9613239e8109a23b77817bda87a6de2812c097f3
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M sw/ground_segment/tmtc/link.ml
    M sw/lib/ocaml/convert.c
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/pprz.mli
    M sw/logalizer/plot.ml
    M sw/logalizer/plotter.ml

  Log Message:
  -----------
  [types] add support for new telemetry types

Comming from the old 'messages' branch:
- support for char and 64 bytes
- support for fixed length arrays


  Commit: a50180a23f26d9dcb1d0b4633d70f4cc95a378c4
      
https://github.com/paparazzi/paparazzi/commit/a50180a23f26d9dcb1d0b4633d70f4cc95a378c4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-14 (Thu, 14 Nov 2013)

  Changed paths:
    M sw/lib/ocaml/convert.c

  Log Message:
  -----------
  [convert] support for ARCH_ALIGN_INT64


  Commit: 96d7347f4ac29fe1d92f431ba646077687ea7d5c
      
https://github.com/paparazzi/paparazzi/commit/96d7347f4ac29fe1d92f431ba646077687ea7d5c
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c

  Log Message:
  -----------
  [rotorcraft] fix some attitude ref telemety message sending


  Commit: 16294da4ee5f003efb257bb02bcf1c9a5ae1369b
      
https://github.com/paparazzi/paparazzi/commit/16294da4ee5f003efb257bb02bcf1c9a5ae1369b
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M sw/supervision/pc_common.ml

  Log Message:
  -----------
  [PPRZ CENTER] Added some more verbose io watch callbacks.

Trying to investigate the issue of immediately closing processes in
paparazzi center on mac os x Mountain Lion and Mavericks.


  Commit: a9c05c6f1ccad43a8d3df200800d417a1bdb8bc9
      
https://github.com/paparazzi/paparazzi/commit/a9c05c6f1ccad43a8d3df200800d417a1bdb8bc9
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M sw/supervision/pc_common.ml

  Log Message:
  -----------
  [PPRZ CENTER] Different approach for io_watch signal handling.

This time we have only one watch reacting to OUT and HUP, wheras it is
ignoring OUT signal and running callback only for HUP.


  Commit: 05e18e04d97babb0068ffe784490e91cf4e7ba41
      
https://github.com/paparazzi/paparazzi/commit/05e18e04d97babb0068ffe784490e91cf4e7ba41
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M sw/supervision/pc_common.ml

  Log Message:
  -----------
  [PPRZ CENTER] Capture more of the IO signals.

Trying to gather a bit more data on the signal behavior.


  Commit: e59603f7f9a54ea8a23ed7cc70793c86b3335cdd
      
https://github.com/paparazzi/paparazzi/commit/e59603f7f9a54ea8a23ed7cc70793c86b3335cdd
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-11-16 (Sat, 16 Nov 2013)

  Changed paths:
    M sw/supervision/pc_common.ml

  Log Message:
  -----------
  [PPRZ CENTER] Fixed detection of child processes exitting on Mac OS.

We are now checking if the input channel is empty when receiving the IN
callback. If that is the case we assume that the child process exitted,
ond call the close process callback that normally is treggered by the
HUP callback.

Some background: On OS X glib is using it's own implementation of poll
that does not generate the HUP signal. (It would be possible to add this
functionality modelled after the SSH implementation of bsd_poll) The
glib implementation does generate IN signal when the pipe get's closed.
So we can just check if the input channel is empty and if that is the
case infer that the pipe got closed.


  Commit: f6a720f18cbdc4c61eca8e667bbf9e5d7253265e
      
https://github.com/paparazzi/paparazzi/commit/f6a720f18cbdc4c61eca8e667bbf9e5d7253265e
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c

  Log Message:
  -----------
  Merge pull request #588 from podhrmic/master

[stabilization] Float euler bounding and scaling fix

you need to divide the old dd-gain by 512 and the old i-gain by 1024.


  Commit: b2cff86cd83094e97e0973dfc628d51f527d318c
      
https://github.com/paparazzi/paparazzi/commit/b2cff86cd83094e97e0973dfc628d51f527d318c
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M sw/supervision/pc_common.ml

  Log Message:
  -----------
  Merge pull request #592 from esden/pprz_center_osx_fix

Paparazzi Center on Mac OS X: fixes #290

The missing HUP signal was found in the simulated poll function in glib. The 
glib implementation is copied from glibc which does not implement HUP but only 
generates an IN event instead (Mac OS default behavior would be to generate HUP 
& IN events together). The solution I went for was to just check if the channel 
is empty on IN event, and call the HUP callback.


  Commit: 89b0036169bdb2e8e56a6d55c649b9cd08eafd32
      
https://github.com/paparazzi/paparazzi/commit/89b0036169bdb2e8e56a6d55c649b9cd08eafd32
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/quark1.xml
    M conf/control_panel_example.xml
    M conf/flight_plans/zamboni_survey_test.xml
    M conf/messages.xml
    M conf/modules/mission_fw.xml

  Log Message:
  -----------
  [conf] cleanup some trailing whitespaces


  Commit: 73a801c3d3d6d551a12722ee750dfbcdaff77b61
      
https://github.com/paparazzi/paparazzi/commit/73a801c3d3d6d551a12722ee750dfbcdaff77b61
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M Makefile
    M sw/airborne/arch/sim/ivy_transport.h
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/pprz_transport.h
    M sw/airborne/subsystems/datalink/w5100.h
    M sw/airborne/subsystems/datalink/xbee.h
    M sw/tools/Makefile
    M sw/tools/gen_messages.ml

  Log Message:
  -----------
  [messages] add char, fixed size array and int64 support to transports and 
gen_messages.ml


  Commit: 7c425ae76bddb10b8520fa06c58efb915b52da36
      
https://github.com/paparazzi/paparazzi/commit/7c425ae76bddb10b8520fa06c58efb915b52da36
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c

  Log Message:
  -----------
  [rotorcraft] fix RC quaternion setpoint reading

orientation vector angles should not be dividied by two,
thats handled correctly in FLOAT_QUAT_OF_ORIENTATION_VECT


  Commit: affc62ee41c533a1ecb7395920ae73af141ddac6
      
https://github.com/paparazzi/paparazzi/commit/affc62ee41c533a1ecb7395920ae73af141ddac6
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/ardrone2_raw.xml

  Log Message:
  -----------
  [conf] remove unneeded USE_BAROMETER for rotorcraft airframes


  Commit: d5dd82b6ca9bdaacb24c1b5c8c17cfd61d06c2e4
      
https://github.com/paparazzi/paparazzi/commit/d5dd82b6ca9bdaacb24c1b5c8c17cfd61d06c2e4
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M make-release-tarball.sh

  Log Message:
  -----------
  update make-release-tarball.sh

latest improvements from https://github.com/meitar/git-archive-all.sh
- support for osx: use gnutar instead of tar to have support for --concatenate
- fix basename 'too many arguments' error when working directory path contains 
spaces


  Commit: 74bb27abc54c5edf627ccc40cba2a4017285d9f1
      
https://github.com/paparazzi/paparazzi/commit/74bb27abc54c5edf627ccc40cba2a4017285d9f1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M Makefile
    M sw/airborne/arch/sim/ivy_transport.h
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/pprz_transport.h
    M sw/airborne/subsystems/datalink/w5100.h
    M sw/airborne/subsystems/datalink/xbee.h
    M sw/ground_segment/tmtc/link.ml
    M sw/lib/ocaml/convert.c
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/pprz.mli
    M sw/logalizer/plot.ml
    M sw/logalizer/plotter.ml
    M sw/tools/Makefile
    M sw/tools/gen_messages.ml

  Log Message:
  -----------
  Merge pull request #589 from gautierhattenberger/pprz_type

[types] add support for new telemetry types


  Commit: a6b8f054ce0725a9f4a3b777ee1dda746cc1672b
      
https://github.com/paparazzi/paparazzi/commit/a6b8f054ce0725a9f4a3b777ee1dda746cc1672b
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M conf/airframes/examples/microjet_lisa_m.xml
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/subsystems/ins/ins_alt_float.c

  Log Message:
  -----------
  [baro] PRINT_CONFIG_MSG for USE_BARO_BOARD and USE_BAROMETER


  Commit: 408416875396b9dc2f02897bd5ea0205f91cb957
      
https://github.com/paparazzi/paparazzi/commit/408416875396b9dc2f02897bd5ea0205f91cb957
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M conf/modules/rotorcraft_cam.xml
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.h
    M sw/airborne/subsystems/datalink/telemetry.h

  Log Message:
  -----------
  [dox] some doxygen updates


  Commit: 52d909d47999bad343d689c300860f2db0eba1c9
      
https://github.com/paparazzi/paparazzi/commit/52d909d47999bad343d689c300860f2db0eba1c9
  Author: hendrixgr <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h

  Log Message:
  -----------
  [stm32] support for all 3 ADCs of f4


  Commit: 0ea59eca8ba56eae813fb6f287376c56e3202bbe
      
https://github.com/paparazzi/paparazzi/commit/0ea59eca8ba56eae813fb6f287376c56e3202bbe
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M sw/airborne/boards/stm32f4_discovery.h

  Log Message:
  -----------
  [boards] update stm32f4_discovery for new adc support


  Commit: 3f75ab1a6a32b1e950867004013b68d54c43417b
      
https://github.com/paparazzi/paparazzi/commit/3f75ab1a6a32b1e950867004013b68d54c43417b
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    A CONTRIBUTING.md

  Log Message:
  -----------
  add CONTRIBUTING.md


  Commit: 485887a82223764b836f21e3f2ef06898b31461a
      
https://github.com/paparazzi/paparazzi/commit/485887a82223764b836f21e3f2ef06898b31461a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M conf/ubx.xml
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.h
    M sw/airborne/subsystems/gps/gps_ubx.c
    M sw/airborne/subsystems/gps/gps_ubx.h
    M sw/tools/gen_ubx.ml

  Log Message:
  -----------
  [ubx] improve ubx parser and ubx_ucenter module

- configurable data output rate
- configurable baud rate (taken from GPS_BAUD variable)
- add support of double and float to ubx parser
- add option to configure RXM_RAW messages (on LEA-T versions)


  Commit: 2b12c99376227bf725cac73021f29a18bf28889e
      
https://github.com/paparazzi/paparazzi/commit/2b12c99376227bf725cac73021f29a18bf28889e
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M conf/modules/gps_ubx_ucenter.xml

  Log Message:
  -----------
  [dox] add some doc for ubx_ucenter


  Commit: d1d5d32ce3155a6dedecfb583c0d1bc81cb2e5c5
      
https://github.com/paparazzi/paparazzi/commit/d1d5d32ce3155a6dedecfb583c0d1bc81cb2e5c5
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    A make-release-tarball.sh
    R make-release-tarball.sh

  Log Message:
  -----------
  make-release-tarball.sh executable


  Commit: bc7510d9634dac6dba7e64b61a17ff972d9b82ad
      
https://github.com/paparazzi/paparazzi/commit/bc7510d9634dac6dba7e64b61a17ff972d9b82ad
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-23 (Sat, 23 Nov 2013)

  Changed paths:
    M conf/airframes/ardrone2_raw.xml

  Log Message:
  -----------
  [conf] ardrone2_raw: remove wrong NPS_JSBSIM_MODEL

We are still missing a JSBSim model for a quadrotor in X configuration (like 
the ARDrone2).
The "simple_quad" model is for + configuration.

Now you will get an error starting the NPS sim
(JSBSim failed to open the configuration file: 
foo/paparazzi/conf/simulator/jsbsim/aircraft/ardrone2_raw.xml).
But IMHO that is better than NPS just not working for no obvious reason.


  Commit: b780d3a2bdb56bd654bb235332c864f20c7655df
      
https://github.com/paparazzi/paparazzi/commit/b780d3a2bdb56bd654bb235332c864f20c7655df
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M .gitignore
    M conf/Makefile.omap
    A sw/ext/ardrone2_drivers/ardrone2.py

  Log Message:
  -----------
  [ardrone] upload script without errors


  Commit: f46df1cd675e632ae4664c5954a5d9cc0e9a8997
      
https://github.com/paparazzi/paparazzi/commit/f46df1cd675e632ae4664c5954a5d9cc0e9a8997
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M sw/ext/ardrone2_drivers/ardrone2.py

  Log Message:
  -----------
  [ardrone] pep8 for python script


  Commit: 713456b15390f4232c2a00c4bbb767cf0c47606a
      
https://github.com/paparazzi/paparazzi/commit/713456b15390f4232c2a00c4bbb767cf0c47606a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_m_common.h
    M sw/airborne/boards/lisa_s_0.1.h
    M sw/airborne/boards/px4fmu_1.7.h
    M sw/airborne/boards/stm32f4_discovery.h

  Log Message:
  -----------
  [adc] cleaner ADC driver configuration and updated board files


  Commit: 9c6ade67502d7cc253817afaadd652daacff83d9
      
https://github.com/paparazzi/paparazzi/commit/9c6ade67502d7cc253817afaadd652daacff83d9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h

  Log Message:
  -----------
  [adc] add support for analog watchdog (stm32f4) with callback


  Commit: 11976e9b735a789a4ffb80bb015817423d2f0784
      
https://github.com/paparazzi/paparazzi/commit/11976e9b735a789a4ffb80bb015817423d2f0784
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/ext/ardrone2_drivers/ardrone2.py

  Log Message:
  -----------
  [ardrone] harder kill and no led prints


  Commit: 315225c350f7c151ad2a05a42817493bcc2daa10
      
https://github.com/paparazzi/paparazzi/commit/315225c350f7c151ad2a05a42817493bcc2daa10
  Author: Felix Ruess <address@hidden>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M CONTRIBUTING.md

  Log Message:
  -----------
  [docs] update url for styleguide in CONTRIBUTING.md


  Commit: 898745b7bf5b07ab40a27a5aefff5cf342666d71
      
https://github.com/paparazzi/paparazzi/commit/898745b7bf5b07ab40a27a5aefff5cf342666d71
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-11-29 (Fri, 29 Nov 2013)

  Changed paths:
    M conf/messages.xml
    M conf/modules/mission_fw.xml
    M sw/airborne/modules/mission/mission.c
    M sw/airborne/modules/mission/mission.h

  Log Message:
  -----------
  [mission] add status report for mission module


  Commit: 7326645c0df171ba85b21a76c653942ac8d41572
      
https://github.com/paparazzi/paparazzi/commit/7326645c0df171ba85b21a76c653942ac8d41572
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M conf/boards/apogee_0.99.makefile
    M conf/boards/apogee_1.0.makefile

  Log Message:
  -----------
  [board] by default apogee boards don't use luftboot


  Commit: 04954377db67b6d939e48009e014d63ff9d010a5
      
https://github.com/paparazzi/paparazzi/commit/04954377db67b6d939e48009e014d63ff9d010a5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M sw/airborne/modules/mission/mission.c
    M sw/airborne/modules/mission/mission.h

  Log Message:
  -----------
  [mission] send 0 as dummy type in status instead of 255


  Commit: 97394da057e8b286b971014d8db30a5687f7f8e0
      
https://github.com/paparazzi/paparazzi/commit/97394da057e8b286b971014d8db30a5687f7f8e0
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M sw/supervision/pc_aircraft.ml

  Log Message:
  -----------
  [supervision] force color format to #rrrrggggbbbb


  Commit: 4978164027158e9000a783ca414b9c9f23b8fe9f
      
https://github.com/paparazzi/paparazzi/commit/4978164027158e9000a783ca414b9c9f23b8fe9f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-05 (Thu, 05 Dec 2013)

  Changed paths:
    A conf/airframes/ENAC/fixed-wing/jp.xml
    A conf/firmwares/subsystems/fixedwing/ins_float_invariant.makefile
    M conf/firmwares/subsystems/shared/imu_apogee.makefile
    M conf/messages.xml
    M conf/modules/mag_hmc58xx.xml
    A conf/settings/estimation/ins_float_invariant.xml
    A conf/simulator/nps/nps_sensors_params_invariant.h
    M sw/airborne/math/pprz_algebra.h
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_geodetic.h
    A sw/airborne/math/pprz_rk_float.h
    M sw/airborne/modules/sensors/mag_hmc58xx.c
    M sw/airborne/state.c
    M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
    A sw/airborne/subsystems/ins/ins_float_invariant.c
    A sw/airborne/subsystems/ins/ins_float_invariant.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/simulator/nps/nps_fdm_jsbsim.c

  Log Message:
  -----------
  [ins] add new ins based on invariant filter

- experimental invariant filter for complet ins
- tested on fixed-wing only, but should work on rotorcraft as well
- generic vector and rung-kutta library
- fix alt init in utm local frame
- settable channel order on mag hmc58xx module


  Commit: 1bf492032ee546abe076e6d1ad0aadef9215c155
      
https://github.com/paparazzi/paparazzi/commit/1bf492032ee546abe076e6d1ad0aadef9215c155
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-05 (Thu, 05 Dec 2013)

  Changed paths:
    M sw/ext/ardrone2_drivers/ardrone2.py

  Log Message:
  -----------
  Improved input parsing


  Commit: c2de9410691c0b67ba522813040f9171182d081c
      
https://github.com/paparazzi/paparazzi/commit/c2de9410691c0b67ba522813040f9171182d081c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-10 (Tue, 10 Dec 2013)

  Changed paths:
    M conf/control_panel_example.xml
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml

  Log Message:
  -----------
  [supervision] add a 'flash mode' combo box

allow to select the flash mode from the paparazzi center or use board
defaults
new boards/modes have to be added to the control panel xml file (example
file reflect more or less the current state of the board makefiles)


  Commit: a6b886760e30ce30a841a1f298c57159ba2ee764
      
https://github.com/paparazzi/paparazzi/commit/a6b886760e30ce30a841a1f298c57159ba2ee764
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-11 (Wed, 11 Dec 2013)

  Changed paths:
    M .gitignore
    M conf/Makefile.omap
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    A sw/ext/ardrone2_drivers/ardrone2.py

  Log Message:
  -----------
  Merge pull request #598 from paparazzi/ardrone_upload

Ardrone upload v2.0


  Commit: fbaff566d27dc2c494df751f2a4b8e205b2c8cf0
      
https://github.com/paparazzi/paparazzi/commit/fbaff566d27dc2c494df751f2a4b8e205b2c8cf0
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h

  Log Message:
  -----------
  [ardrone] lost imu frame counter


  Commit: 906271e1e8367d4cc19e5c118cac22bec64cb0b7
      
https://github.com/paparazzi/paparazzi/commit/906271e1e8367d4cc19e5c118cac22bec64cb0b7
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-13 (Fri, 13 Dec 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c

  Log Message:
  -----------
  [ardrone] print baro logic errors


  Commit: f8d1a352cf1b3f8413d0fd3f064a9496806b9be1
      
https://github.com/paparazzi/paparazzi/commit/f8d1a352cf1b3f8413d0fd3f064a9496806b9be1
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c

  Log Message:
  -----------
  [rotorcraft] removed unused fms input from guidance_v


  Commit: 792e043345316dc5026ea560ae5b16d36a08f5a0
      
https://github.com/paparazzi/paparazzi/commit/792e043345316dc5026ea560ae5b16d36a08f5a0
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c

  Log Message:
  -----------
  [ardrone] 
baro-temp-press-swap-due-to-non-understood-sensorboard-interrupt-delay-bug 
solved with specialized spike filter


  Commit: 2be00c735b742a88807e98c108ea2a61885d6a81
      
https://github.com/paparazzi/paparazzi/commit/2be00c735b742a88807e98c108ea2a61885d6a81
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-16 (Mon, 16 Dec 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c

  Log Message:
  -----------
  [fixedwing] cosmetic: untabify


  Commit: 7a0cf03a7948b9861f8721bc3cc7be8929493d63
      
https://github.com/paparazzi/paparazzi/commit/7a0cf03a7948b9861f8721bc3cc7be8929493d63
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M conf/airframes/CDW/ChimuTinyFwSpi.xml
    M conf/airframes/CDW/DualBoardApFbw.xml
    M conf/airframes/CDW/test/ChimuJTinyFwSpi.xml
    M conf/airframes/CDW/test/ChimuLisaFw.xml
    M conf/airframes/CDW/test/ChimuTinyFw.xml
    M conf/airframes/CDW/test/yapa3_aspirin2.xml
    M conf/airframes/CDW/tiny2_chimu_spi_pt.xml
    M conf/airframes/CDW/yapa_xsens.xml
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/ENAC/fixed-wing/crrcsim.xml
    M conf/airframes/ENAC/fixed-wing/eternity1.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    M conf/airframes/ENAC/fixed-wing/merlin.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/fixed-wing/quark1.xml
    M conf/airframes/ENAC/fixed-wing/twinjet2.xml
    M conf/airframes/ENAC/fixed-wing/weasel.xml
    M conf/airframes/LAAS/mmlaas_N1.xml
    M conf/airframes/LAAS/mmlaas_N2.xml
    M conf/airframes/LAAS/mmlaas_N3.xml
    M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
    M conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/bixler_lisa_m_2.xml
    M conf/airframes/examples/easy_glider.xml
    M conf/airframes/examples/easystar.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
    M conf/airframes/examples/lisa_l_chimu.xml
    M conf/airframes/examples/microjet.xml
    M conf/airframes/examples/microjet_lisa_m.xml
    M conf/airframes/examples/microjet_lisa_m_xsens.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    M conf/airframes/examples/twog_analogimu.xml
    M conf/airframes/examples/umarim_lite_v2.xml
    M conf/airframes/examples/yapaChimuSpi.xml
    M conf/airframes/flixr_discovery.xml
    M conf/airframes/jsbsim.xml
    R conf/settings/estimation/fw_baro_kalman.xml
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h

  Log Message:
  -----------
  [ins] alt_float: remove ALT_KALMAN_ENABLED

There is really no benefit in keeping the ALT_KALMAN_ENABLED define (and 
setting it to FALSE by default).
If USE_BAROMETER alt_kalman is always enabled and if you don't want to use 
altitude/climb_rate filtering,
use the ins type "gps_passthrough".
Now if you use the alt_float INS, it's always enabled (which is what most 
people expect anyway).

In theory it was possible to disable the alt_kalman in flight before (if ! 
USE_BAROMETER),
but I very much doubt that was used since there also was no settings file for 
it.

closes #594


  Commit: d914b3273eb12fde6453a294400c8cad151d65ae
      
https://github.com/paparazzi/paparazzi/commit/d914b3273eb12fde6453a294400c8cad151d65ae
  Author: softsr <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    A conf/modules/hott_telemetry.xml
    M sw/airborne/mcu_periph/uart.h
    A sw/airborne/modules/hott/hott.c
    A sw/airborne/modules/hott/hott.h
    A sw/airborne/modules/hott/hott_eam.h
    A sw/airborne/modules/hott/hott_gam.h

  Log Message:
  -----------
  [modules] HOTT telemetry module added

closes #591


  Commit: 3010e8254029bac329c94237e8c499bdcfe67315
      
https://github.com/paparazzi/paparazzi/commit/3010e8254029bac329c94237e8c499bdcfe67315
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M sw/airborne/subsystems/ins/ins_alt_float.c

  Log Message:
  -----------
  [ins] alt_float: fix includes


  Commit: 9bef1228da86101ef9458197a4d35a7fd281dd7f
      
https://github.com/paparazzi/paparazzi/commit/9bef1228da86101ef9458197a4d35a7fd281dd7f
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: additional checks and error messages


  Commit: 9da492e22df85afae2ac50f77b2c104586a5b6bb
      
https://github.com/paparazzi/paparazzi/commit/9da492e22df85afae2ac50f77b2c104586a5b6bb
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile

  Log Message:
  -----------
  [conf] ahrs subsytems: more robuts USE_MAGNETOMETER check


  Commit: 2f0060456b3cb75e04cf89547bfb031ad8dc1af3
      
https://github.com/paparazzi/paparazzi/commit/2f0060456b3cb75e04cf89547bfb031ad8dc1af3
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-17 (Tue, 17 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32
    M conf/Makefile.stm32-upload
    M conf/airframes/CDW/DualBoardApFbw.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    M conf/boards/apogee_0.99.makefile
    M conf/boards/apogee_1.0.makefile
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_l_1.0.makefile
    M conf/boards/lisa_l_1.1.makefile
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    M conf/control_panel_example.xml
    A conf/flash_modes.xml
    M sw/supervision/pc_control_panel.ml

  Log Message:
  -----------
  [flash modes] change some mode names and luftboot unused by default


  Commit: 96b2d0f2416c154eba53e3e6727d8b684e0b9cd9
      
https://github.com/paparazzi/paparazzi/commit/96b2d0f2416c154eba53e3e6727d8b684e0b9cd9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_m_2.0.makefile

  Log Message:
  -----------
  better test for luftboot on lisam2 and lia boards


  Commit: 4e9c66d26979b25628562191a99fe3dc36625bb9
      
https://github.com/paparazzi/paparazzi/commit/4e9c66d26979b25628562191a99fe3dc36625bb9
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32
    M conf/Makefile.stm32-upload
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_m_2.0.makefile

  Log Message:
  -----------
  [conf] move some flash mode vars

- lia_1.1: HAS_LUFTBOOT


  Commit: 4dfba18f5b2a8b9c3923191289094fd826dd138a
      
https://github.com/paparazzi/paparazzi/commit/4dfba18f5b2a8b9c3923191289094fd826dd138a
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32-upload
    M conf/flash_modes.xml

  Log Message:
  -----------
  [conf] separate JTAG_BMP FLASH_MODE


  Commit: 5d59b84130c004f301d07b1ca7c0bcf5ea0368c2
      
https://github.com/paparazzi/paparazzi/commit/5d59b84130c004f301d07b1ca7c0bcf5ea0368c2
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32-upload

  Log Message:
  -----------
  [conf] stm32-upload: print available FLASH_MODEs


  Commit: 20afea552d4199ec90c2b6ed478541a67b8902c6
      
https://github.com/paparazzi/paparazzi/commit/20afea552d4199ec90c2b6ed478541a67b8902c6
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    A conf/Makefile.ardrone2
    M conf/Makefile.omap
    M conf/boards/ardrone2_raw.makefile
    M conf/boards/ardrone2_sdk.makefile

  Log Message:
  -----------
  [conf] separate Makefile.ardrone2

instead of putting ARDrone2 specific upload rules into Makefile.omap


  Commit: 2d5cde0a91fac77d69477243fc5a5d4af76fb404
      
https://github.com/paparazzi/paparazzi/commit/2d5cde0a91fac77d69477243fc5a5d4af76fb404
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    R conf/Makefile.arm-common
    R conf/Makefile.arm-embedded
    A conf/Makefile.arm-embedded-common
    R conf/Makefile.arm-linux
    A conf/Makefile.arm-linux-toolchain
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.stm32

  Log Message:
  -----------
  [conf] toolchain makefile cleanup


  Commit: e010ee04a0fb40403f727d4a4fd715b435e7dc2f
      
https://github.com/paparazzi/paparazzi/commit/e010ee04a0fb40403f727d4a4fd715b435e7dc2f
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  [conf] remove FLASH_MODE from some example airframes

as it is now selectable from paparazzi center


  Commit: cfd143a1877ec093a006952d04b37983a3d0f1b6
      
https://github.com/paparazzi/paparazzi/commit/cfd143a1877ec093a006952d04b37983a3d0f1b6
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.h
    M sw/airborne/subsystems/ins/ins_ardrone2.h

  Log Message:
  -----------
  [rotorcraft] fixes for ardrone2_sdk


  Commit: e96095d9303f2d372b3a50b6268ad7b91024ebbc
      
https://github.com/paparazzi/paparazzi/commit/e96095d9303f2d372b3a50b6268ad7b91024ebbc
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/airframes/ardrone2_raw.xml

  Log Message:
  -----------
  [conf] ardrone2_raw: only one IMU section


  Commit: 4eeddf5c5323377c65575a0a2d6202ef5ce9979d
      
https://github.com/paparazzi/paparazzi/commit/4eeddf5c5323377c65575a0a2d6202ef5ce9979d
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/flash_modes.xml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml

  Log Message:
  -----------
  [flash_mode] parse boards' name as regexp


  Commit: cc8c009d966182f078b88ddb75254fd06f8d408b
      
https://github.com/paparazzi/paparazzi/commit/cc8c009d966182f078b88ddb75254fd06f8d408b
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/airframes/ardrone2_sdk.xml

  Log Message:
  -----------
  [conf] untabify, indent ardrone2_sdk


  Commit: 2b26c288aab30c8434952983fe874f4de1f3cd41
      
https://github.com/paparazzi/paparazzi/commit/2b26c288aab30c8434952983fe874f4de1f3cd41
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M tests/examples/01_compile_all_test_targets.t

  Log Message:
  -----------
  [tests] fix perl script compile_all_test_targets

Firmwares with only a single target were not built before.
Thanks for the fix Alexandre.


  Commit: c2a7a029d9e8ccfeca977565fea2b17f0fa18b8e
      
https://github.com/paparazzi/paparazzi/commit/c2a7a029d9e8ccfeca977565fea2b17f0fa18b8e
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/conf_tests.xml

  Log Message:
  -----------
  [conf] remove outdated tiny2_chimu_spi airframe from tests file


  Commit: a8e2542516079c551cd96f0f6ab2648ce7ccabfa
      
https://github.com/paparazzi/paparazzi/commit/a8e2542516079c551cd96f0f6ab2648ce7ccabfa
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32-upload

  Log Message:
  -----------
  [conf] fix Makefile.stm32-upload


  Commit: be2d4d0dc0e9e2b4cdb38b37a91e94f1e28a8fc7
      
https://github.com/paparazzi/paparazzi/commit/be2d4d0dc0e9e2b4cdb38b37a91e94f1e28a8fc7
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    M conf/Makefile.stm32
    M conf/Makefile.stm32-upload
    M conf/airframes/CDW/DualBoardApFbw.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/boards/apogee_0.99.makefile
    M conf/boards/apogee_1.0.makefile
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_l_1.0.makefile
    M conf/boards/lisa_l_1.1.makefile
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    A conf/flash_modes.xml
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml

  Log Message:
  -----------
  Merge pull request #597 from paparazzi/flash_mode

[supervision] add a 'flash mode' combo box

Allow to select the flash mode from the paparazzi center or use board
defaults.
New boards/modes have to be added to the flash_modes.xml file (regex for the 
boards supported).

It is also possible to add custom modes in the personal control_panel.xml file.

Specifying the FLASH_MODE in the airframe file, e.g. <configure 
name="FLASH_MODE" value="JTAG"/> makes that the "default" for that airframe.


  Commit: e568d6158bb944a3cd7e10048c879cbf56170d6a
      
https://github.com/paparazzi/paparazzi/commit/e568d6158bb944a3cd7e10048c879cbf56170d6a
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-18 (Wed, 18 Dec 2013)

  Changed paths:
    A conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile
    A sw/airborne/subsystems/imu/imu_mpu6000_hmc5883.c
    A sw/airborne/subsystems/imu/imu_mpu6000_hmc5883.h

  Log Message:
  -----------
  [subsystems] IMU with MPU6000 (SPI) and HMC5883 (I2C)


  Commit: 452d7a52cb3d948615e7eec27ee5234d50bbcb30
      
https://github.com/paparazzi/paparazzi/commit/452d7a52cb3d948615e7eec27ee5234d50bbcb30
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile

  Log Message:
  -----------
  [conf] update adc selection for lisa firmwares


  Commit: 0d7316580e3bfb5b661e620e80477fea408a9463
      
https://github.com/paparazzi/paparazzi/commit/0d7316580e3bfb5b661e620e80477fea408a9463
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/hb_1.1.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_common.h
    M sw/airborne/boards/lisa_s_0.1.h
    M sw/airborne/boards/logom_2.6.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/px4fmu_1.7.h
    M sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/tiny_0.99.h
    M sw/airborne/boards/tiny_1.1.h
    M sw/airborne/boards/tiny_2.0.h
    M sw/airborne/boards/tiny_2.1.h
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/boards/umarim_lite_2.0.h
    M sw/airborne/mcu.c

  Log Message:
  -----------
  [adc] replace #ifdef USE_ADC_x by #if USE_ADC_x

this makes it possible to explicitly disable them with -DUSE_ADC_x=0


  Commit: 5e241837c561f5bde487d0983293dba307b2e32c
      
https://github.com/paparazzi/paparazzi/commit/5e241837c561f5bde487d0983293dba307b2e32c
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [stm32] update ADC usage comment


  Commit: 4fb277c556ceb90ddece30340d58f34390af1058
      
https://github.com/paparazzi/paparazzi/commit/4fb277c556ceb90ddece30340d58f34390af1058
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M conf/modules/infrared_adc.xml

  Log Message:
  -----------
  [modules] update infrared_adc for new ADC_x usage


  Commit: e9f498ba2bc7d0d7a62214c348e6dcf77b3787bb
      
https://github.com/paparazzi/paparazzi/commit/e9f498ba2bc7d0d7a62214c348e6dcf77b3787bb
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [stm32] ADC2 for F1 as well


  Commit: a086533ee5e5492271aafeb4af1f152b3a0e8afd
      
https://github.com/paparazzi/paparazzi/commit/a086533ee5e5492271aafeb4af1f152b3a0e8afd
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/modules/infrared_adc.xml
    M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/hb_1.1.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_m_common.h
    M sw/airborne/boards/lisa_s_0.1.h
    M sw/airborne/boards/logom_2.6.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/px4fmu_1.7.h
    M sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/tiny_0.99.h
    M sw/airborne/boards/tiny_1.1.h
    M sw/airborne/boards/tiny_2.0.h
    M sw/airborne/boards/tiny_2.1.h
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/boards/umarim_lite_2.0.h
    M sw/airborne/mcu.c

  Log Message:
  -----------
  Merge branch 'stm32f4_adc'

* stm32f4_adc:
  [stm32] ADC2 for F1 as well
  [modules] update infrared_adc for new ADC_x usage
  [stm32] update ADC usage comment
  [adc] replace #ifdef USE_ADC_x by #if USE_ADC_x
  [conf] update adc selection for lisa firmwares
  [adc] add support for analog watchdog (stm32f4) with callback
  [adc] cleaner ADC driver configuration and updated board files
  [boards] update stm32f4_discovery for new adc support
  [stm32] support for all 3 ADCs of f4


  Commit: a8043e176053ae46acc0287a41832b08c49b68c5
      
https://github.com/paparazzi/paparazzi/commit/a8043e176053ae46acc0287a41832b08c49b68c5
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c

  Log Message:
  -----------
  [stm32] silence warnings


  Commit: c467a445dcd0d5799ac9c89d5160eaa09a8d4a9a
      
https://github.com/paparazzi/paparazzi/commit/c467a445dcd0d5799ac9c89d5160eaa09a8d4a9a
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M conf/airframes/CDW/DualBoardApFbw.xml
    M conf/airframes/CDW/classix.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    M conf/boards/hb_1.1.makefile
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_l_1.0.makefile
    M conf/boards/lisa_l_1.1.makefile
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    M conf/boards/lisa_s_0.1.makefile
    M conf/boards/logom_2.6.makefile
    M conf/boards/navgo_1.0.makefile
    M conf/boards/tiny_0.99.makefile
    M conf/boards/tiny_1.1.makefile
    M conf/boards/tiny_2.1.makefile
    M conf/boards/tiny_2.11.makefile
    M conf/boards/twog_1.0.makefile
    M conf/boards/umarim_1.0.makefile
    M conf/boards/umarim_lite_2.0.makefile
    M conf/boards/yapa_2.0.makefile
    M conf/firmwares/subsystems/shared/imu_analog.makefile
    M conf/modules/infrared_adc.xml

  Log Message:
  -----------
  [conf] cleanup ADC board defaults


  Commit: f02fb44158a40729125bfeb1e6c4ba2ebcba932e
      
https://github.com/paparazzi/paparazzi/commit/f02fb44158a40729125bfeb1e6c4ba2ebcba932e
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [lpc21] fix USE_AD[01]


  Commit: e7379f4bcd3a6498a62a0b8a989ababb87737807
      
https://github.com/paparazzi/paparazzi/commit/e7379f4bcd3a6498a62a0b8a989ababb87737807
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c

  Log Message:
  -----------
  [lpc21][i2c] silence warning


  Commit: 41d95c431e08a41e41fa51f17b5444747558bf6c
      
https://github.com/paparazzi/paparazzi/commit/41d95c431e08a41e41fa51f17b5444747558bf6c
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/settings_arch.c

  Log Message:
  -----------
  [stm32] settings_arch: silence warning on F4

persisent settings is not implemented on F4 yet,
pflash_program_bytes is a no-op.


  Commit: 2842220b17be4bf7adc24ddb86edc336c86d2c3f
      
https://github.com/paparazzi/paparazzi/commit/2842220b17be4bf7adc24ddb86edc336c86d2c3f
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/modules/hott/hott.c

  Log Message:
  -----------
  [modules] hott: fix hott_telemetry_sendig_msgs_id

type range was to small resulting in:
modules/hott/hott.c:127:3: warning: comparison is always true due to limited 
range of data type [-Wtype-limits]


  Commit: 7c466ff14cf9c18955daa4fe0e91a8a517e8c8bc
      
https://github.com/paparazzi/paparazzi/commit/7c466ff14cf9c18955daa4fe0e91a8a517e8c8bc
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-19 (Thu, 19 Dec 2013)

  Changed paths:
    M sw/airborne/peripherals/ami601.h

  Log Message:
  -----------
  [peripherals] ami601: silence warning


  Commit: d2f80135280c90bde7e74390f5829be400e28138
      
https://github.com/paparazzi/paparazzi/commit/d2f80135280c90bde7e74390f5829be400e28138
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c

  Log Message:
  -----------
  [ardrone] updated filter: use more data in case of spikes: only 1 package 
lost instead of 3


  Commit: 08e17ee731a155a035089adbb5e8b5ae7a9e7e82
      
https://github.com/paparazzi/paparazzi/commit/08e17ee731a155a035089adbb5e8b5ae7a9e7e82
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/ardrone2_raw.xml
    A conf/simulator/jsbsim/aircraft/simple_ardrone2.xml
    M conf/simulator/jsbsim/aircraft/simple_quad.xml
    A conf/simulator/jsbsim/aircraft/simple_x_quad.xml
    A conf/simulator/jsbsim/aircraft/simple_x_quad_ccw.xml

  Log Message:
  -----------
  [conf] add simple x-mode quad jsbsim models


  Commit: a100f2edb26aed68947ac4e45906d2ae2186943c
      
https://github.com/paparazzi/paparazzi/commit/a100f2edb26aed68947ac4e45906d2ae2186943c
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M conf/simulator/jsbsim/aircraft/simple_ardrone2.xml
    M conf/simulator/jsbsim/aircraft/simple_x_quad.xml
    M conf/simulator/jsbsim/aircraft/simple_x_quad_ccw.xml

  Log Message:
  -----------
  [conf] fix moments on x-quad jsbsim models


  Commit: 112326143a9d9052993aacfe53b3557212b8d8b0
      
https://github.com/paparazzi/paparazzi/commit/112326143a9d9052993aacfe53b3557212b8d8b0
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml

  Log Message:
  -----------
  [conf] update krooz_sd fixedwing example

untested...


  Commit: d8f1954bb7715139d01ad5c30f6f14cd0a78c432
      
https://github.com/paparazzi/paparazzi/commit/d8f1954bb7715139d01ad5c30f6f14cd0a78c432
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M sw/airborne/boards/stm32f4_discovery.h

  Log Message:
  -----------
  [boards] stm32f4_discovery: fix typo in ADC_3

thanks Chris


  Commit: e285f0221c6c0e539cef1e74e5988a7d1f5d2c12
      
https://github.com/paparazzi/paparazzi/commit/e285f0221c6c0e539cef1e74e5988a7d1f5d2c12
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M sw/airborne/boards/ardrone/navdata.c

  Log Message:
  -----------
  [ardrone] solved both type1 and type2 spikes: delayed temp versus delayed 
press


  Commit: 89ba697f11e4fb76e27e06f31f95c040da3ce4ac
      
https://github.com/paparazzi/paparazzi/commit/89ba697f11e4fb76e27e06f31f95c040da3ce4ac
  Author: Martin Mueller <address@hidden>
  Date:   2013-12-20 (Fri, 20 Dec 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [stm32] fix typo


  Commit: 505e9f8e85a06e6b79ed359545e52cd8340e6998
      
https://github.com/paparazzi/paparazzi/commit/505e9f8e85a06e6b79ed359545e52cd8340e6998
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    A conf/boards/lisa_mx_2.0.makefile
    M conf/firmwares/subsystems/shared/baro_board.makefile
    A sw/airborne/arch/stm32/lisa-mx.ld
    A sw/airborne/boards/lisa_mx/baro_board.h
    A sw/airborne/boards/lisa_mx_2.0.h

  Log Message:
  -----------
  [boards] Initial support for Lisa/MX

the Cortex-M4 version of Lisa/M


  Commit: daeb58f9bb103a5c7a61f9c26e63b6426b8f9f10
      
https://github.com/paparazzi/paparazzi/commit/daeb58f9bb103a5c7a61f9c26e63b6426b8f9f10
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    A conf/airframes/examples/quadrotor_lisa_mx.xml

  Log Message:
  -----------
  [conf] add lisa_mx quad example


  Commit: dee2ee53a33b5295514312bf711661e1aff6be65
      
https://github.com/paparazzi/paparazzi/commit/dee2ee53a33b5295514312bf711661e1aff6be65
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    M sw/airborne/subsystems/datalink/uart_print.h

  Log Message:
  -----------
  [datalink] add missing macros for UART4 and 6


  Commit: 0166f097ad19cf341321966ca0ebb8cfe383eb3c
      
https://github.com/paparazzi/paparazzi/commit/0166f097ad19cf341321966ca0ebb8cfe383eb3c
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    M conf/modules/ahrs_chimu_uart.xml
    M conf/modules/extra_dl.xml
    M conf/modules/ins_xsens_MTiG_Uart0.xml
    M conf/modules/ins_xsens_MTi_Uart0.xml
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/lpc21/usb_ser_hw.c
    M sw/airborne/arch/lpc21/usb_tunnel.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/firmwares/beth/overo_test_uart.c
    M sw/airborne/firmwares/beth/uart_hw.c
    M sw/airborne/firmwares/beth/uart_hw.h
    M sw/airborne/firmwares/logger/main_logger.c
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/subsystems/datalink/uart_print.h
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
    M sw/airborne/test/test_adcs.c

  Log Message:
  -----------
  [uart] replace #ifdef USE_UARTx with #if USE_UARTx


  Commit: 4e2dc86ed76e8ac6bc5e4477bca1e3a5ba51e399
      
https://github.com/paparazzi/paparazzi/commit/4e2dc86ed76e8ac6bc5e4477bca1e3a5ba51e399
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-27 (Fri, 27 Dec 2013)

  Changed paths:
    M sw/tools/calibration/calibrate.py

  Log Message:
  -----------
  [tools] calibrate.py: exit with meaningfull error if optimization fails


  Commit: b3556f23bbc939de102734d1c7505ea440a51655
      
https://github.com/paparazzi/paparazzi/commit/b3556f23bbc939de102734d1c7505ea440a51655
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_mx.xml

  Log Message:
  -----------
  [conf] use quad_lisa_mx as quad x-configuration example


  Commit: 2aa9ed3ff3e6872b73c6f4e72516b8400978f3a4
      
https://github.com/paparazzi/paparazzi/commit/2aa9ed3ff3e6872b73c6f4e72516b8400978f3a4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M conf/flight_plans/EMAV2008.xml
    M conf/flight_plans/EMAV2009.xml
    M conf/flight_plans/basic.xml
    M conf/flight_plans/ccc_gl.xml
    M conf/flight_plans/creidlitz.xml
    M conf/flight_plans/fp_tp_auto.xml
    M conf/flight_plans/joystick.xml
    M conf/flight_plans/kv_svalbard.xml
    M conf/flight_plans/mav08.xml
    M conf/flight_plans/tcas.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    M conf/flight_plans/versatile_carto_fixe_muret.xml
    M conf/flight_plans/xsens_cachejunction.xml

  Log Message:
  -----------
  use correct word in FP button to circle around a point


  Commit: ad75f15bf634770ae07570da288dd9724b72ba6e
      
https://github.com/paparazzi/paparazzi/commit/ad75f15bf634770ae07570da288dd9724b72ba6e
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c

  Log Message:
  -----------
  [fixedwing] settable LOW_BATTERY_KILL_DELAY

should probably be replaced by electrical.bat_critical instead of 
re-implementing the delay for the critical check there...
closes #610


  Commit: 6f22616cf7d4daae2efa3e4d933f3fc195b13ebe
      
https://github.com/paparazzi/paparazzi/commit/6f22616cf7d4daae2efa3e4d933f3fc195b13ebe
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M sw/airborne/arch/omap/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/firmwares/beth/uart_hw.h
    M sw/airborne/mcu.c

  Log Message:
  -----------
  [uart] if USE_UARTx instead of defined USE_UARTx


  Commit: 788b887179ab3bc44178f9fbce0eac05157fadc9
      
https://github.com/paparazzi/paparazzi/commit/788b887179ab3bc44178f9fbce0eac05157fadc9
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-28 (Sat, 28 Dec 2013)

  Changed paths:
    M sw/tools/calibration/calibration_utils.py

  Log Message:
  -----------
  [tools] fix typo in get_id of calibration_utils


  Commit: 8259716fc3bb241bb42beccd84dbcc4d069f147c
      
https://github.com/paparazzi/paparazzi/commit/8259716fc3bb241bb42beccd84dbcc4d069f147c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-29 (Sun, 29 Dec 2013)

  Changed paths:
    M sw/airborne/subsystems/nav.h

  Log Message:
  -----------
  [nav] GetPosX and GetPosY in nav.h (FW) are in local coordinates

allows to use the macro with sectors detection

fix #602


  Commit: 9153c23a9cc3cb56ce7b5404b077657b7d0f1fca
      
https://github.com/paparazzi/paparazzi/commit/9153c23a9cc3cb56ce7b5404b077657b7d0f1fca
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-12-29 (Sun, 29 Dec 2013)

  Changed paths:
    M sw/airborne/modules/nav/nav_catapult.c

  Log Message:
  -----------
  [catapult] don't use GetPos macros but state interface directly


  Commit: 3ef6e852b49ed17ad197993d31d32649057d3693
      
https://github.com/paparazzi/paparazzi/commit/3ef6e852b49ed17ad197993d31d32649057d3693
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-29 (Sun, 29 Dec 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  [rotorcraft] send motor_mixing.nb_failure in ROTORCRAFT_STATUS


  Commit: d32d171b946b2a681028a845e09fbcf949dcbfb9
      
https://github.com/paparazzi/paparazzi/commit/d32d171b946b2a681028a845e09fbcf949dcbfb9
  Author: Felix Ruess <address@hidden>
  Date:   2013-12-30 (Mon, 30 Dec 2013)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c

  Log Message:
  -----------
  [imu] drotek_10dof_v2: more defaults according to PERIODIC_FREQUENCY


  Commit: e00eb11b8728b96af4f67723ab325e2eb3b22b04
      
https://github.com/paparazzi/paparazzi/commit/e00eb11b8728b96af4f67723ab325e2eb3b22b04
  Author: Gautier Hattenberger <address@hidden>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c

  Log Message:
  -----------
  [drotek] add missing endif


  Commit: 9ee99169aa7941a59ace6163df8c251e4e1c88c6
      
https://github.com/paparazzi/paparazzi/commit/9ee99169aa7941a59ace6163df8c251e4e1c88c6
  Author: Gautier Hattenberger <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  [tools] improve servo parsing in gen_airframe

separated macros to commit all actuators
servo order in global actuators array is kept from original airframe file


  Commit: 796afc65fe8900b0e4b7c94111c7bc156ef77e20
      
https://github.com/paparazzi/paparazzi/commit/796afc65fe8900b0e4b7c94111c7bc156ef77e20
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    M conf/airframes/examples/setup_lisam2.xml
    M conf/conf_example.xml
    M conf/conf_tests.xml
    M conf/firmwares/setup.makefile
    A conf/settings/setup_actuators.xml
    R conf/settings/test_fixedwing_actuators.xml
    M sw/airborne/firmwares/setup/setup_actuators.c

  Log Message:
  -----------
  [setup] fix setup_actuators with a workaround

not very nice, but should work...
fixes #359


  Commit: a2e94c36f079fe49a764f525e44de3bcb6b9ae64
      
https://github.com/paparazzi/paparazzi/commit/a2e94c36f079fe49a764f525e44de3bcb6b9ae64
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/h_hex.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/setup_lisam2.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/test_progs.makefile
    A conf/settings/test_actuators_pwm.xml
    R sw/airborne/lisa/test_servos.c
    R sw/airborne/test/test_actuators.c
    A sw/airborne/test/test_actuators_pwm.c
    A sw/airborne/test/test_actuators_pwm_sin.c
    M sw/airborne/test/test_esc_asctecv1_simple.c
    M sw/airborne/test/test_telemetry.c

  Log Message:
  -----------
  [test progs] start with some cleanup

- add a quick test_actuators_pwm


  Commit: 2de0831914e3c35f6e8a0ceb9d42cf680bab1050
      
https://github.com/paparazzi/paparazzi/commit/2de0831914e3c35f6e8a0ceb9d42cf680bab1050
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/test_progs.makefile
    A sw/airborne/test/test_manual.c

  Log Message:
  -----------
  [test] add preliminary test_manual


  Commit: f1304117c1ac362d408ebacb44e2a1c6cdbfefd6
      
https://github.com/paparazzi/paparazzi/commit/f1304117c1ac362d408ebacb44e2a1c6cdbfefd6
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M sw/airborne/test/test_manual.c

  Log Message:
  -----------
  [test] finish test_manual

now RC works (including radio_control type datalink)


  Commit: b9fac2e710300819c38c7893acfd0526cc3c3391
      
https://github.com/paparazzi/paparazzi/commit/b9fac2e710300819c38c7893acfd0526cc3c3391
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml

  Log Message:
  -----------
  [conf] remove test_manual from quad example


  Commit: 3143f38629550b04a77ac64fcca0188be90f45bb
      
https://github.com/paparazzi/paparazzi/commit/3143f38629550b04a77ac64fcca0188be90f45bb
  Author: Felix Ruess <address@hidden>
  Date:   2014-01-05 (Sun, 05 Jan 2014)

  Changed paths:
    M .gitignore
    A CONTRIBUTING.md
    M Makefile
    A Vagrantfile
    A conf/Makefile.ardrone2
    R conf/Makefile.arm-common
    R conf/Makefile.arm-embedded
    A conf/Makefile.arm-embedded-common
    M conf/Makefile.arm-embedded-toolchain
    R conf/Makefile.arm-linux
    A conf/Makefile.arm-linux-toolchain
    M conf/Makefile.geode
    M conf/Makefile.jsbsim
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.pentium-m
    M conf/Makefile.sim
    M conf/Makefile.stm32
    M conf/Makefile.stm32-upload
    M conf/airframes/CDW/ChimuTinyFwSpi.xml
    M conf/airframes/CDW/DualBoardApFbw.xml
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/classix.xml
    M conf/airframes/CDW/test/ChimuJTinyFwSpi.xml
    M conf/airframes/CDW/test/ChimuLisaFw.xml
    M conf/airframes/CDW/test/ChimuTinyFw.xml
    M conf/airframes/CDW/test/yapa3_aspirin2.xml
    M conf/airframes/CDW/tiny2_chimu_spi_pt.xml
    M conf/airframes/CDW/yapa_xsens.xml
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/ENAC/fixed-wing/crrcsim.xml
    M conf/airframes/ENAC/fixed-wing/eternity1.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    A conf/airframes/ENAC/fixed-wing/jp.xml
    M conf/airframes/ENAC/fixed-wing/merlin.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/fixed-wing/quark1.xml
    M conf/airframes/ENAC/fixed-wing/twinjet2.xml
    M conf/airframes/ENAC/fixed-wing/weasel.xml
    M conf/airframes/LAAS/mmlaas_N1.xml
    M conf/airframes/LAAS/mmlaas_N2.xml
    M conf/airframes/LAAS/mmlaas_N3.xml
    M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_fw.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/ardrone2_sdk.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/bixler_lisa_m_2.xml
    M conf/airframes/examples/easy_glider.xml
    M conf/airframes/examples/easystar.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/h_hex.xml
    M conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_bre_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/lisa_l_chimu.xml
    M conf/airframes/examples/microjet.xml
    M conf/airframes/examples/microjet_lisa_m.xml
    M conf/airframes/examples/microjet_lisa_m_xsens.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    A conf/airframes/examples/quadrotor_lisa_mx.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    M conf/airframes/examples/setup_lisam2.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/examples/twog_analogimu.xml
    M conf/airframes/examples/umarim_lite_v2.xml
    M conf/airframes/examples/yapaChimuSpi.xml
    M conf/airframes/flixr_discovery.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/airframes/jsbsim.xml
    M conf/boards/apogee_0.99.makefile
    M conf/boards/apogee_1.0.makefile
    M conf/boards/ardrone2_raw.makefile
    M conf/boards/ardrone2_sdk.makefile
    M conf/boards/hb_1.1.makefile
    M conf/boards/lia_1.1.makefile
    M conf/boards/lisa_l_1.0.makefile
    M conf/boards/lisa_l_1.1.makefile
    M conf/boards/lisa_m_1.0.makefile
    M conf/boards/lisa_m_2.0.makefile
    A conf/boards/lisa_mx_2.0.makefile
    M conf/boards/lisa_s_0.1.makefile
    M conf/boards/logom_2.6.makefile
    M conf/boards/navgo_1.0.makefile
    M conf/boards/tiny_0.99.makefile
    M conf/boards/tiny_1.1.makefile
    M conf/boards/tiny_2.1.makefile
    M conf/boards/tiny_2.11.makefile
    M conf/boards/twog_1.0.makefile
    M conf/boards/umarim_1.0.makefile
    M conf/boards/umarim_lite_2.0.makefile
    M conf/boards/yapa_2.0.makefile
    M conf/conf_example.xml
    M conf/conf_tests.xml
    M conf/control_panel_example.xml
    R conf/firmwares/booz2_common.makefile
    R conf/firmwares/booz2_test_progs.makefile
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/setup.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/fixedwing/ins_float_invariant.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
    M conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
    R conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
    M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
    M conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/firmwares/subsystems/shared/imu_analog.makefile
    M conf/firmwares/subsystems/shared/imu_apogee.makefile
    M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    A conf/firmwares/subsystems/shared/imu_krooz_sd_memsic.makefile
    A conf/firmwares/subsystems/shared/imu_mpu6000_hmc5883.makefile
    A conf/firmwares/test_progs.makefile
    A conf/flash_modes.xml
    M conf/flight_plans/EMAV2008.xml
    M conf/flight_plans/EMAV2009.xml
    M conf/flight_plans/basic.xml
    M conf/flight_plans/ccc_gl.xml
    M conf/flight_plans/creidlitz.xml
    M conf/flight_plans/fp_tp_auto.xml
    M conf/flight_plans/joystick.xml
    M conf/flight_plans/kv_svalbard.xml
    M conf/flight_plans/mav08.xml
    M conf/flight_plans/tcas.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    M conf/flight_plans/versatile_carto_fixe_muret.xml
    M conf/flight_plans/xsens_cachejunction.xml
    M conf/flight_plans/zamboni_survey_test.xml
    M conf/messages.xml
    M conf/modules/ahrs_chimu_uart.xml
    M conf/modules/extra_dl.xml
    M conf/modules/gps_ubx_ucenter.xml
    A conf/modules/hott_telemetry.xml
    M conf/modules/infrared_adc.xml
    M conf/modules/ins_xsens_MTiG_Uart0.xml
    M conf/modules/ins_xsens_MTi_Uart0.xml
    M conf/modules/mag_hmc58xx.xml
    M conf/modules/mission_fw.xml
    M conf/modules/rotorcraft_cam.xml
    A conf/modules/send_imu_mag_current.xml
    A conf/settings/estimation/ahrs_float_mlkf.xml
    R conf/settings/estimation/fw_baro_kalman.xml
    A conf/settings/estimation/ins_float_invariant.xml
    A conf/settings/setup_actuators.xml
    A conf/settings/test_actuators_pwm.xml
    R conf/settings/test_fixedwing_actuators.xml
    A conf/simulator/jsbsim/aircraft/simple_ardrone2.xml
    M conf/simulator/jsbsim/aircraft/simple_quad.xml
    A conf/simulator/jsbsim/aircraft/simple_x_quad.xml
    A conf/simulator/jsbsim/aircraft/simple_x_quad_ccw.xml
    A conf/simulator/nps/nps_sensors_params_invariant.h
    M conf/telemetry/default_fixedwing.xml
    M conf/telemetry/default_fixedwing_imu.xml
    M conf/telemetry/default_fixedwing_imu_9k6.xml
    M conf/telemetry/default_rotorcraft.xml
    M conf/ubx.xml
    M create_module
    M make-release-tarball.sh
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/lpc21/usb_ser_hw.c
    M sw/airborne/arch/lpc21/usb_tunnel.c
    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/ivy_transport.h
    M sw/airborne/arch/sim/jsbsim_hw.h
    M sw/airborne/arch/sim/sim_ap.c
    A sw/airborne/arch/stm32/lisa-mx.ld
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/hb_1.1.h
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/boards/krooz/imu_krooz.h
    A sw/airborne/boards/krooz/imu_krooz_memsic.c
    A sw/airborne/boards/krooz/imu_krooz_memsic.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_m_common.h
    A sw/airborne/boards/lisa_mx/baro_board.h
    A sw/airborne/boards/lisa_mx_2.0.h
    M sw/airborne/boards/lisa_s_0.1.h
    M sw/airborne/boards/logom_2.6.h
    M sw/airborne/boards/navgo/imu_navgo.c
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/px4fmu_1.7.h
    M sw/airborne/boards/sdlog_1.0.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/tiny_0.99.h
    M sw/airborne/boards/tiny_1.1.h
    M sw/airborne/boards/tiny_2.0.h
    M sw/airborne/boards/tiny_2.1.h
    M sw/airborne/boards/umarim/imu_umarim.c
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/boards/umarim_lite_2.0.h
    R sw/airborne/booz/test/Makefile
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
    R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.h
    R sw/airborne/booz/test/booz2_test_crista.c
    R sw/airborne/booz/test/booz2_test_gps.c
    R sw/airborne/booz/test/booz2_test_max1168.c
    R sw/airborne/booz/test/booz2_test_usb.c
    R sw/airborne/booz/test/plot_scaling.sce
    R sw/airborne/booz/test/plot_test_vg_adpt.sce
    R sw/airborne/booz/test/plot_test_vg_ref.sce
    R sw/airborne/booz/test/test_mlkf.c
    R sw/airborne/booz/test/test_mlkf.sce
    R sw/airborne/booz/test/test_scaling.c
    R sw/airborne/booz/test/test_vg_adpt.c
    R sw/airborne/booz/test/test_vg_ref.c
    R sw/airborne/booz/test/vert_loop.dat.bz2
    M sw/airborne/firmwares/beth/overo_test_uart.c
    M sw/airborne/firmwares/beth/rcv_telemetry.c
    M sw/airborne/firmwares/beth/uart_hw.c
    M sw/airborne/firmwares/beth/uart_hw.h
    R sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/datalink.c
    R sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
    M sw/airborne/firmwares/logger/main_logger.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    A sw/airborne/firmwares/rotorcraft/rotorcraft_telemetry.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    R sw/airborne/firmwares/rotorcraft/telemetry.c
    R sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/firmwares/setup/setup_actuators.c
    M sw/airborne/link_mcu_spi.c
    R sw/airborne/lisa/test_servos.c
    M sw/airborne/math/Makefile
    M sw/airborne/math/README
    M sw/airborne/math/pprz_algebra.h
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/math/pprz_geodetic.h
    A sw/airborne/math/pprz_rk_float.h
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/MPPT/MPPT.c
    M sw/airborne/modules/MPPT/sim_MPPT.c
    M sw/airborne/modules/adcs/adc_generic.c
    M sw/airborne/modules/benchmark/flight_benchmark.c
    A sw/airborne/modules/calibration/send_imu_mag_current.c
    A sw/airborne/modules/calibration/send_imu_mag_current.h
    M sw/airborne/modules/cam_control/cam.c
    M sw/airborne/modules/cam_control/cam.h
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.c
    M sw/airborne/modules/cam_control/rotorcraft_cam.h
    M sw/airborne/modules/cartography/cartography.c
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/datalink/xtend_rssi.c
    M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
    M sw/airborne/modules/digital_cam/dc.c
    M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
    M sw/airborne/modules/enose/anemotaxis.c
    M sw/airborne/modules/enose/chemotaxis.c
    M sw/airborne/modules/enose/enose.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.h
    M sw/airborne/modules/gsm/gsm.c
    A sw/airborne/modules/hott/hott.c
    A sw/airborne/modules/hott/hott.h
    A sw/airborne/modules/hott/hott_eam.h
    A sw/airborne/modules/hott/hott_gam.h
    M sw/airborne/modules/ins/ahrs_chimu_spi.c
    M sw/airborne/modules/ins/ahrs_chimu_uart.c
    M sw/airborne/modules/ins/alt_filter.c
    M sw/airborne/modules/ins/ins_arduimu.c
    M sw/airborne/modules/ins/ins_arduimu_basic.c
    M sw/airborne/modules/ins/ins_vn100.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/max3100/max3100_hw.c
    M sw/airborne/modules/meteo/charge_sens.c
    M sw/airborne/modules/meteo/dust_gp2y.c
    M sw/airborne/modules/meteo/geiger_counter.c
    M sw/airborne/modules/meteo/humid_dpicco.c
    M sw/airborne/modules/meteo/humid_hih.c
    M sw/airborne/modules/meteo/humid_htm_b71.c
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/meteo/humid_sht.c
    M sw/airborne/modules/meteo/humid_sht_i2c.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/light_solar.c
    M sw/airborne/modules/meteo/light_temt.c
    M sw/airborne/modules/meteo/temp_lm75.c
    M sw/airborne/modules/meteo/temp_tcouple_adc.c
    M sw/airborne/modules/meteo/temp_temod.c
    M sw/airborne/modules/meteo/temp_tmp102.c
    M sw/airborne/modules/meteo/windturbine.c
    M sw/airborne/modules/mission/mission.c
    M sw/airborne/modules/mission/mission.h
    M sw/airborne/modules/multi/formation.c
    M sw/airborne/modules/multi/potential.c
    M sw/airborne/modules/multi/tcas.c
    M sw/airborne/modules/nav/nav_catapult.c
    M sw/airborne/modules/openlog/openlog.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    M sw/airborne/modules/sensors/alt_srf08.c
    M sw/airborne/modules/sensors/aoa_adc.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    M sw/airborne/modules/sensors/imu_aspirin2.c
    M sw/airborne/modules/sensors/mag_hmc5843.c
    M sw/airborne/modules/sensors/mag_hmc58xx.c
    M sw/airborne/modules/sensors/mag_micromag_fw.c
    M sw/airborne/modules/sonar/sonar_adc.c
    M sw/airborne/peripherals/ami601.h
    A sw/airborne/peripherals/lis302dl.h
    A sw/airborne/peripherals/lis302dl_regs.h
    A sw/airborne/peripherals/lis302dl_spi.c
    A sw/airborne/peripherals/lis302dl_spi.h
    M sw/airborne/state.c
    M sw/airborne/subsystems/ahrs/ahrs_aligner.c
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
    M sw/airborne/subsystems/ahrs/ahrs_gx3.c
    M sw/airborne/subsystems/ahrs/ahrs_infrared.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/air_data.c
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/pprz_transport.h
    M sw/airborne/subsystems/datalink/superbitrf.c
    A sw/airborne/subsystems/datalink/telemetry.c
    A sw/airborne/subsystems/datalink/telemetry.h
    A sw/airborne/subsystems/datalink/telemetry_common.h
    M sw/airborne/subsystems/datalink/uart_print.h
    M sw/airborne/subsystems/datalink/w5100.h
    M sw/airborne/subsystems/datalink/xbee.h
    M sw/airborne/subsystems/gps.c
    M sw/airborne/subsystems/gps/gps_ubx.c
    M sw/airborne/subsystems/gps/gps_ubx.h
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
    M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
    A sw/airborne/subsystems/imu/imu_mpu6000_hmc5883.c
    A sw/airborne/subsystems/imu/imu_mpu6000_hmc5883.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_ardrone2.h
    A sw/airborne/subsystems/ins/ins_float_invariant.c
    A sw/airborne/subsystems/ins/ins_float_invariant.h
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/discsurvey.c
    M sw/airborne/subsystems/radio_control/ppm.c
    M sw/airborne/subsystems/radio_control/sbus.c
    M sw/airborne/test/Makefile
    M sw/airborne/test/ahrs/ahrs_utils.py
    M sw/airborne/test/ahrs/compare_ahrs.py
    R sw/airborne/test/nova_test_imu.c
    A sw/airborne/test/peripherals/test_lis302dl_spi.c
    A sw/airborne/test/stabilization/.gitignore
    A sw/airborne/test/stabilization/README.md
    A sw/airborne/test/stabilization/algebra_float.pxd
    A sw/airborne/test/stabilization/algebra_float.pyx
    A sw/airborne/test/stabilization/algebra_int.pxd
    A sw/airborne/test/stabilization/algebra_int.pyx
    A sw/airborne/test/stabilization/compare_ref_quat.py
    A sw/airborne/test/stabilization/generated/airframe.h
    A sw/airborne/test/stabilization/pprz_algebra_double_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_float_c.pxd
    A sw/airborne/test/stabilization/pprz_algebra_int_c.pxd
    A sw/airborne/test/stabilization/ref_quat_float.pyx
    A sw/airborne/test/stabilization/ref_quat_int.pyx
    A sw/airborne/test/stabilization/setup.py
    R sw/airborne/test/test_actuators.c
    A sw/airborne/test/test_actuators_pwm.c
    A sw/airborne/test/test_actuators_pwm_sin.c
    M sw/airborne/test/test_adcs.c
    M sw/airborne/test/test_esc_asctecv1_simple.c
    A sw/airborne/test/test_manual.c
    M sw/airborne/test/test_telemetry.c
    M sw/ext/Makefile
    A sw/ext/ardrone2_drivers/ardrone2.py
    A sw/extras/bootstrap_vm.sh
    A sw/extras/setup_git_aliases.sh
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/tmtc/link.ml
    M sw/include/std.h
    M sw/lib/ocaml/Makefile
    A sw/lib/ocaml/acIcon.ml
    A sw/lib/ocaml/acIcon.mli
    A sw/lib/ocaml/contrastLabel.ml
    A sw/lib/ocaml/contrastLabel.mli
    M sw/lib/ocaml/convert.c
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapTrack.mli
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/mapWaypoints.mli
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/pprz.mli
    M sw/logalizer/plot.ml
    M sw/logalizer/plotter.ml
    M sw/simulator/nps/nps_fdm_jsbsim.c
    R sw/simulator/old_booz/booz2_sim_main.c
    R sw/simulator/old_booz/booz_flight_model.c
    R sw/simulator/old_booz/booz_flight_model.h
    R sw/simulator/old_booz/booz_flight_model_params.h
    R sw/simulator/old_booz/booz_flight_model_utils.c
    R sw/simulator/old_booz/booz_flight_model_utils.h
    R sw/simulator/old_booz/booz_flightgear.c
    R sw/simulator/old_booz/booz_flightgear.h
    R sw/simulator/old_booz/booz_joystick.c
    R sw/simulator/old_booz/booz_joystick.h
    R sw/simulator/old_booz/booz_joystick_fake.h
    R sw/simulator/old_booz/booz_r250.c
    R sw/simulator/old_booz/booz_r250.h
    R sw/simulator/old_booz/booz_randlcg.c
    R sw/simulator/old_booz/booz_randlcg.h
    R sw/simulator/old_booz/booz_rc_sim.h
    R sw/simulator/old_booz/booz_sensors_model.c
    R sw/simulator/old_booz/booz_sensors_model.h
    R sw/simulator/old_booz/booz_sensors_model_accel.c
    R sw/simulator/old_booz/booz_sensors_model_baro.c
    R sw/simulator/old_booz/booz_sensors_model_gps.c
    R sw/simulator/old_booz/booz_sensors_model_gyro.c
    R sw/simulator/old_booz/booz_sensors_model_mag.c
    R sw/simulator/old_booz/booz_sensors_model_params_booz2.h
    R sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
    R sw/simulator/old_booz/booz_sensors_model_rangemeter.c
    R sw/simulator/old_booz/booz_sensors_model_utils.c
    R sw/simulator/old_booz/booz_sensors_model_utils.h
    R sw/simulator/old_booz/booz_wind_model.c
    R sw/simulator/old_booz/booz_wind_model.h
    R sw/simulator/old_booz/tests/Makefile
    R sw/simulator/old_booz/tests/test_fdm.c
    R sw/simulator/old_booz/tests/test_sensors.c
    R sw/simulator/sim_ac_booz.c
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_common.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/Makefile
    M sw/tools/calibration/calibrate.py
    M sw/tools/calibration/calibrate_gyro.py
    M sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/dfu/stm32_mem.py
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_messages.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_ubx.ml
    M tests/examples/01_compile_all_test_targets.t

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

lots of stuff, e.g. new telemetry register_periodic system


Compare: 
https://github.com/paparazzi/paparazzi/compare/7c0d60c3ff73...3143f3862955

reply via email to

[Prev in Thread] Current Thread [Next in Thread]