paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [paparazzi/paparazzi] f09155: ahrs_int_cmpl_quat: us


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] f09155: ahrs_int_cmpl_quat: use AHRS_GRAVITY_UPDATE_COORDI...
Date: Thu, 02 Feb 2012 06:50:47 -0800

  Branch: refs/heads/positive_control_gains
  Home:   https://github.com/paparazzi/paparazzi
  Commit: f091555c70412ca8527c6c5b78f97f27c7492673
      
https://github.com/paparazzi/paparazzi/commit/f091555c70412ca8527c6c5b78f97f27c7492673
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

  Log Message:
  -----------
  ahrs_int_cmpl_quat: use AHRS_GRAVITY_UPDATE_COORDINATED_TURN in fixedwing 
case. fix ltp_vel_norm


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

  Changed paths:
    M sw/airborne/math/pprz_algebra_int.h

  Log Message:
  -----------
  fix INT32_MAT33_VECT3_MULT macro and rename it to INT32_MAT33_VECT3_MUL for 
consistency with float version


  Commit: 6090694a70eda6b012eb6b01f8e7b05e45ea6c32
      
https://github.com/paparazzi/paparazzi/commit/6090694a70eda6b012eb6b01f8e7b05e45ea6c32
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M conf/boards/lisa_m_1.0.makefile
  M sw/airborne/math/pprz_algebra_int.h

  Log Message:
  -----------
  Merge branch 'dev' into ahrs_gravity_correction


  Commit: 72da33aa5860f2938fc245081935415f6c31b91e
      
https://github.com/paparazzi/paparazzi/commit/72da33aa5860f2938fc245081935415f6c31b91e
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

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

  Log Message:
  -----------
  ahrs_int_cmpl: fix rotation of centrifugal acceleration to imu frame


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

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

  Log Message:
  -----------
  create const struct for r2 instead of using a pointer to avoid breaking 
strict aliasing rules


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

  Changed paths:
    M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h

  Log Message:
  -----------
  fix float_rmat_reorthogonalize to comply with strict aliasing rules: do not 
cast matrix rows to vect3, use const vectors for rows and new 
MAT33_ROW_VECT3_SMUL macro to write back to matrix


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

  Changed paths:
    R conf/telemetry/booz.xml

  Log Message:
  -----------
  removed old booz telemetry file


  Commit: 67976d16fc5e5ea6106bc382d075b41644b77f2e
      
https://github.com/paparazzi/paparazzi/commit/67976d16fc5e5ea6106bc382d075b41644b77f2e
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M README
  M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/rotor/qmk1.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/hitl_usb.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.0.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.5.makefile
  M conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  M conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  M conf/boards/classix.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/settings/tuning.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  R conf/telemetry/booz.xml
  M sw/airborne/arch/sim/sim_gps.c
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/commands.c
  M sw/airborne/commands.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/ground_segment/tmtc/settings.ml
  M sw/simulator/flight_gear.h
  M sw/simulator/sim.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge branch 'dev' into only_radians


  Commit: 00d371090e5077fa5f8250d60a3a6e1a450e4f20
      
https://github.com/paparazzi/paparazzi/commit/00d371090e5077fa5f8250d60a3a6e1a450e4f20
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/modules/core/extra_pprz_dl.h

  Log Message:
  -----------
  fix some includes of pprz_transport


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

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

  Log Message:
  -----------
  Merge pull request #82 from paparazzi/guidance_hover

same behaviour for AP_MODE_HOVER and NAV when holding position


  Commit: 01c025a8b15d0af3900e1a291338a0db552742d0
      
https://github.com/paparazzi/paparazzi/commit/01c025a8b15d0af3900e1a291338a0db552742d0
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/test/ahrs/ahrs_on_synth.c

  Log Message:
  -----------
  Merge pull request #98 from flixr/ahrs_float_cmpl_rmat

Ahrs float cmpl rmat


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

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

  Log Message:
  -----------
  ups, forgot a commit for ahrs_float_cmpl_rmat: fix export to fw estimator


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

  Changed paths:
    M sw/airborne/arch/stm32/sys_time_hw.h

  Log Message:
  -----------
  fix the SysTimeTimer hack on stm32


  Commit: 58c76a5dbf2fc9c7116e61a40f6243bfa549becc
      
https://github.com/paparazzi/paparazzi/commit/58c76a5dbf2fc9c7116e61a40f6243bfa549becc
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
  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/grosslobke_demo.xml
  M conf/flight_plans/hsif.xml
  M conf/flight_plans/ingolfsskali.xml
  M conf/flight_plans/joystick.xml
  M conf/flight_plans/kv_svalbard.xml
  M conf/flight_plans/nordlys.xml
  M conf/flight_plans/poles.xml
  M conf/flight_plans/snav.xml
  M conf/flight_plans/tcas.xml
  M conf/flight_plans/versatile.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/flight_params.xml
  M conf/settings/tuning.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  R sw/airborne/ap_downlink.h
  M sw/airborne/arch/avr/ant_v2x.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_mc.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_modem.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz2_test_rc.c
  M sw/airborne/booz/test/booz2_test_usb.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_baro.c
  M sw/airborne/csc/csc_datalink.c
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_protocol.c
  M sw/airborne/csc/csc_rc_spektrum.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/csc_throttle.c
  M sw/airborne/csc/csc_xsens.c
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/csc/mercury_main.c
  M sw/airborne/csc/mercury_xsens.c
  M sw/airborne/csc/ppm_bridge_main.c
  R sw/airborne/datalink.h
  R sw/airborne/downlink.c
  R sw/airborne/downlink.h
  R sw/airborne/downlink_transport.h
  R sw/airborne/fbw_downlink.h
  M sw/airborne/firmwares/beth/gps_c.patch
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  A sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/firmwares/tutorial/main_demo4.c
  M sw/airborne/firmwares/tutorial/main_demo5.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/fms/fms_test_datalink.c
  M sw/airborne/fms/overo_test_periodic.c
  M sw/airborne/fms/overo_test_telemetry.c
  M sw/airborne/fms/test_telemetry_2.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.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_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  R sw/airborne/modem.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/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/core/extra_pprz_dl.h
  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/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_xsens.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/wind_gfi.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/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/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_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_ppzuav.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/sensors/trigger_ext.c
  M sw/airborne/obsolete/gps.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  R sw/airborne/pprz_transport.c
  R sw/airborne/pprz_transport.h
  M sw/airborne/sd_card/main.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  A sw/airborne/subsystems/datalink/datalink.h
  A sw/airborne/subsystems/datalink/downlink.c
  A sw/airborne/subsystems/datalink/downlink.h
  A sw/airborne/subsystems/datalink/downlink_transport.h
  A sw/airborne/subsystems/datalink/modem.h
  A sw/airborne/subsystems/datalink/pprz_transport.c
  A sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/xbee.c
  A sw/airborne/subsystems/datalink/xbee.h
  A sw/airborne/subsystems/datalink/xbee24.h
  A sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_adcs.c
  M sw/airborne/test/test_telemetry.c
  R sw/airborne/xbee.c
  R sw/airborne/xbee.h
  R sw/airborne/xbee24.h
  R sw/airborne/xbee868.h

  Log Message:
  -----------
  Merge pull request #99 from gautierhattenberger/datalink

Datalink


  Commit: 22b2f046a7b1f513cdc0075b5e73e8a050ce037b
      
https://github.com/paparazzi/paparazzi/commit/22b2f046a7b1f513cdc0075b5e73e8a050ce037b
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    R sw/airborne/arch/avr/modem_hw.c
  R sw/airborne/arch/avr/modem_hw.h
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
  R sw/airborne/arch/lpc21/modem_hw.c
  R sw/airborne/arch/lpc21/modem_hw.h
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.h
  M sw/airborne/arch/sim/jsbsim_hw.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  A sw/airborne/subsystems/datalink/audio_telemetry.h
  M sw/airborne/subsystems/datalink/downlink.h
  R sw/airborne/subsystems/datalink/modem.h

  Log Message:
  -----------
  renamed the old modem stuff to audio_telemetry


  Commit: 14b67d810c322cce2945592273a09c014fbc7b9f
      
https://github.com/paparazzi/paparazzi/commit/14b67d810c322cce2945592273a09c014fbc7b9f
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

  Log Message:
  -----------
  Merge pull request #100 from paparazzi/ahrs_gravity_correction

Ahrs gravity correction for int_cmpl_quat


  Commit: 1a01093ec1ef6fbd93b2f9dd7d9add3098b6c964
      
https://github.com/paparazzi/paparazzi/commit/1a01093ec1ef6fbd93b2f9dd7d9add3098b6c964
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

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

  Log Message:
  -----------
  ahrs_int_cmpl_quat: correct fixed point calculation of rotation to imu frame


  Commit: 23cac09efb0f15f57e10d07c8c37203125cea5d8
      
https://github.com/paparazzi/paparazzi/commit/23cac09efb0f15f57e10d07c8c37203125cea5d8
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

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

  Log Message:
  -----------
  Merge branch 'ahrs_gravity_correction' into dev


  Commit: 09b09763c304f25c8d385b95ecdab9d0b5dd0d2b
      
https://github.com/paparazzi/paparazzi/commit/09b09763c304f25c8d385b95ecdab9d0b5dd0d2b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/flight_params.xml
  M conf/settings/lisa.xml
  M conf/settings/tuning.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/subsystems/datalink/downlink.c
  M sw/airborne/subsystems/datalink/downlink.h

  Log Message:
  -----------
  move firmware dependent code in downlink at the correct place


  Commit: 930627385a9d6019c58fff904bc61bb533eb7983
      
https://github.com/paparazzi/paparazzi/commit/930627385a9d6019c58fff904bc61bb533eb7983
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    A sw/airborne/firmwares/fixedwing/ap_downlink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.c

  Log Message:
  -----------
  add missing new files (ap and fbw downlink)


  Commit: 6857ef7e906542f1b9953cb4b7cf41fdb45c4793
      
https://github.com/paparazzi/paparazzi/commit/6857ef7e906542f1b9953cb4b7cf41fdb45c4793
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M conf/settings/cam_roll.xml
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam_roll.c
  A sw/airborne/modules/cam_control/cam_roll.h

  Log Message:
  -----------
  fix cam_roll module


  Commit: 57dae8acb1d69c997597a025d75e123d33e635cc
      
https://github.com/paparazzi/paparazzi/commit/57dae8acb1d69c997597a025d75e123d33e635cc
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/obsolete/slicer1.xml

  Log Message:
  -----------
  aiframe files: set code_unit to deg for cam defines that still use degrees


  Commit: 4866dcd8cb7953e11cc74ae2ba11ab60b36f55be
      
https://github.com/paparazzi/paparazzi/commit/4866dcd8cb7953e11cc74ae2ba11ab60b36f55be
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h

  Log Message:
  -----------
  cam: define some defaults for readability, some FIXME comments


  Commit: 824b2b6c31cffc87a94d367484ce322fcc0b023c
      
https://github.com/paparazzi/paparazzi/commit/824b2b6c31cffc87a94d367484ce322fcc0b023c
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M conf/settings/cam.xml
  M conf/settings/cam_pitch.xml

  Log Message:
  -----------
  cam settings: use degrees as alt_unit to make it easier to set the pan and 
tilt angles


  Commit: 1f4ea1a2ef42a291b98fd2220bfd6da5573607d2
      
https://github.com/paparazzi/paparazzi/commit/1f4ea1a2ef42a291b98fd2220bfd6da5573607d2
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M conf/airframes/obsolete/xxx1.xml

  Log Message:
  -----------
  CAM_PHI_MAX_DEG is now CAM_PHI_MAX and in radians


  Commit: 025246b2809b156385cfd79d3651de1ec4dab353
      
https://github.com/paparazzi/paparazzi/commit/025246b2809b156385cfd79d3651de1ec4dab353
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M conf/settings/photogrammetry_calculator.xml
  M sw/airborne/modules/cam_control/cam_roll.c
  M sw/airborne/modules/cam_control/cam_roll.h
  M sw/airborne/modules/cartography/photogrammetry_calculator.c

  Log Message:
  -----------
  added header to cam_roll


  Commit: 42e3f4a03211c61ec7f1f70eb8038341d8c38a93
      
https://github.com/paparazzi/paparazzi/commit/42e3f4a03211c61ec7f1f70eb8038341d8c38a93
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-10 (Sat, 10 Dec 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h

  Log Message:
  -----------
  gravity correction: introduced bool ahrs_impl.correct_gravity to be able to 
switch it on and off for testing. Also only set the ltp_vel_norm if gps has 3d 
fix


  Commit: 39f00aa372223aa2d3bc938ef52d119d30648e50
      
https://github.com/paparazzi/paparazzi/commit/39f00aa372223aa2d3bc938ef52d119d30648e50
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-10 (Sat, 10 Dec 2011)

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

  Log Message:
  -----------
  ahrs_float_cmpl_rmat: fixed var in AHRS_GRAVITY_UPDATE_NORM_HEURISTIC and 
removed some dead code


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

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c

  Log Message:
  -----------
  ahrs_update_gps for all ahrs algos, might be empty


  Commit: e43777d40de1074ba8cb86516de7d107b07031f0
      
https://github.com/paparazzi/paparazzi/commit/e43777d40de1074ba8cb86516de7d107b07031f0
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M conf/messages.xml
  M conf/telemetry/csc.xml
  M conf/telemetry/telemetry_booz2.xml
  M conf/telemetry/telemetry_jtm.xml
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/in_progress/python/attitude_viz.py

  Log Message:
  -----------
  renamed some BOOZ2_AHRS_x messages to AHRS_x_INT and BOOZ2_RADIO_CONTROL to 
ROTORCRAFT_RADIO_CONTROL


  Commit: 27e47477509a50c8f05233e384f3f8d4ebc20e20
      
https://github.com/paparazzi/paparazzi/commit/27e47477509a50c8f05233e384f3f8d4ebc20e20
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M conf/messages.xml
  M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  removed obsolete FILTER_Q message


  Commit: 217f13a8029d0d97c2500278b59e537a1f33669b
      
https://github.com/paparazzi/paparazzi/commit/217f13a8029d0d97c2500278b59e537a1f33669b
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M conf/airframes/Poine/h_hex.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml

  Log Message:
  -----------
  replaced aspirin imu subsystem with aspirin_v1.0 in airframes files


  Commit: 98750707f5df9a97d8f0d853e4672ee3659bbd98
      
https://github.com/paparazzi/paparazzi/commit/98750707f5df9a97d8f0d853e4672ee3659bbd98
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M conf/telemetry/telemetry.dtd
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.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/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.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_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.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/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/core/extra_pprz_dl.h
  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/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_xsens.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/wind_gfi.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/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/alt_srf08.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_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_ppzuav.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/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/datalink/pprz_transport.h
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_telemetry.c
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  downlink macros with transport and device arguments


  Commit: 755767778030ff35ce48a2b28ea27cfbb4ee9261
      
https://github.com/paparazzi/paparazzi/commit/755767778030ff35ce48a2b28ea27cfbb4ee9261
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  M conf/messages.xml
  M conf/telemetry/csc.xml
  M conf/telemetry/telemetry_booz2.xml
  M conf/telemetry/telemetry_jtm.xml
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c
  M sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/in_progress/python/attitude_viz.py

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

Conflicts:
        sw/airborne/booz/test/booz2_test_radio_control.c
        sw/airborne/test/subsystems/test_ahrs.c
        sw/airborne/test/subsystems/test_radio_control.c


  Commit: e57146787167a8490d3f3304227939f7faa74f3a
      
https://github.com/paparazzi/paparazzi/commit/e57146787167a8490d3f3304227939f7faa74f3a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  adapt rotorcraft telemetry to new macros


  Commit: 60108ad53ddcf43bfc37b7b05e65424f801b230d
      
https://github.com/paparazzi/paparazzi/commit/60108ad53ddcf43bfc37b7b05e65424f801b230d
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

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

  Log Message:
  -----------
  improved arming sequence and kill switch handling


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

  Changed paths:
    M conf/messages.xml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/in_progress/log_parser/09_05_13__14_38_13.log
  M sw/logalizer/matlab_log/messages.xml

  Log Message:
  -----------
  renamed time_since_last_bat_msg to time_since_last_msg in ground message 
TELEMETRY_STATUS for clarity. it has nothing to do with the bat message, but 
always contains the time since the last telemetry message received


  Commit: 41657324d0253adc863b643d15adc403f3f9af9a
      
https://github.com/paparazzi/paparazzi/commit/41657324d0253adc863b643d15adc403f3f9af9a
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M conf/airframes/Poine/h_hex.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  R sw/airborne/anemotaxis.c
  R sw/airborne/anemotaxis.h
  R sw/airborne/chemotaxis.c
  R sw/airborne/chemotaxis.h
  A sw/airborne/modules/enose/anemotaxis.c
  A sw/airborne/modules/enose/anemotaxis.h
  A sw/airborne/modules/enose/chemotaxis.c
  A sw/airborne/modules/enose/chemotaxis.h

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


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

  Changed paths:
    M sw/simulator/flight_gear.h

  Log Message:
  -----------
  fix ifdef in flight_gear.h


  Commit: 445fe4de88ef2f9f2600b103a1e0a463134819c9
      
https://github.com/paparazzi/paparazzi/commit/445fe4de88ef2f9f2600b103a1e0a463134819c9
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.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/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.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/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.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_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/osam_xsens_twog.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/cam.xml
  M conf/settings/cam_pitch.xml
  M conf/settings/cam_roll.xml
  M conf/settings/infrared.xml
  M conf/settings/ins_arduimu_basic.xml
  M conf/settings/ins_neutrals.xml
  M conf/settings/ir_i2c.xml
  M conf/settings/photogrammetry_calculator.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  M sw/airborne/modules/cam_control/cam_roll.c
  A sw/airborne/modules/cam_control/cam_roll.h
  M sw/airborne/modules/cartography/photogrammetry_calculator.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/sensors/infrared.c
  M sw/ground_segment/cockpit/page_settings.ml
  M sw/ground_segment/cockpit/saveSettings.ml
  M sw/lib/ocaml/pprz.ml
  M sw/simulator/flightModel.ml
  M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  Merge pull request #94 from flixr/only_radians

Always use radians to define angles in the airborne code
If unit="deg" is specified, automatically convert to radians when generating 
the airframe file.
If degrees are really used (e.g. in cam) either not specify any unit or specify 
unit="deg" code_unit="deg"


  Commit: fdf6975de392f557a360132db204eee908966b05
      
https://github.com/paparazzi/paparazzi/commit/fdf6975de392f557a360132db204eee908966b05
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M sw/ground_segment/cockpit/saveSettings.ml
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  factorize unit conversion tools and extend it;
the file conf/units.xml describes all the possible conversions


  Commit: 39326bbe5b0bd433850bcd3956242717bf65de4c
      
https://github.com/paparazzi/paparazzi/commit/39326bbe5b0bd433850bcd3956242717bf65de4c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    A conf/units.xml

  Log Message:
  -----------
  add unit.xml file for automatic conversions


  Commit: 79e527b8737a81beafd7e2246303c7d1c888964b
      
https://github.com/paparazzi/paparazzi/commit/79e527b8737a81beafd7e2246303c7d1c888964b
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  added comment


  Commit: 3a234812b798759ae9bae82829d7bf744b99e5ed
      
https://github.com/paparazzi/paparazzi/commit/3a234812b798759ae9bae82829d7bf744b99e5ed
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  automatic deg/s to rad/s conversion


  Commit: 46da1d82689d6565f0099a559577014e78ba35f1
      
https://github.com/paparazzi/paparazzi/commit/46da1d82689d6565f0099a559577014e78ba35f1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h

  Log Message:
  -----------
  imu_b2_1.2 is now using hmc58xx driver without interrupts on lpc21
previous driver was not working at all (board frozen)


  Commit: 99f25faf466b8fdc9b25b85809205c74f7f4ea38
      
https://github.com/paparazzi/paparazzi/commit/99f25faf466b8fdc9b25b85809205c74f7f4ea38
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-16 (Fri, 16 Dec 2011)

  Changed paths:
    M conf/modules/baro_board.xml

  Log Message:
  -----------
  baro_board module: only use ADS1114 for navgo and umarim


  Commit: 98cb9c414a35e670a41664b0ee1bdccf0af92741
      
https://github.com/paparazzi/paparazzi/commit/98cb9c414a35e670a41664b0ee1bdccf0af92741
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-16 (Fri, 16 Dec 2011)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h

  Log Message:
  -----------
  added baro_downlink_raw for lisa_l baro_board, but this is not very nice... 
there should be no downlink in baro implementation


  Commit: 7b617fa637ec04f61a48ff4a4e7a560ab1393eb8
      
https://github.com/paparazzi/paparazzi/commit/7b617fa637ec04f61a48ff4a4e7a560ab1393eb8
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/Poine/antenna.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/test_libeknav.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/obsolete/autoplato.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/nova.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/twisted.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/vor.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_i2c.xml
  M conf/airframes/wind_tunnel.xml
  M conf/autopilot/obsolete/booz_test_progs.makefile
  M conf/autopilot/obsolete/csc.makefile
  M conf/autopilot/obsolete/csc_ap.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  M conf/autopilot/obsolete/mercury.makefile
  M conf/autopilot/obsolete/mercury_csc.makefile
  M conf/autopilot/obsolete/sitl.makefile
  M conf/autopilot/obsolete/sitl_jsbsim.makefile
  M conf/autopilot/obsolete/sitl_link_pprz.makefile
  M conf/autopilot/obsolete/sitl_link_xbee.makefile
  M conf/autopilot/obsolete/testing.makefile
  M conf/autopilot/obsolete/tiny.makefile
  M conf/autopilot/obsolete/twin_mcu.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

  Log Message:
  -----------
  fix paths to downlink.c, pprz_transport.c and xbee.c for jsbsim, nps and in 
old airframe files


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

  Changed paths:
    M sw/ground_segment/cockpit/gcs.ml

  Log Message:
  -----------
  renamed GCS arguments: google_fill to maps_fill and no_google_http to 
maps_no_http


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

  Changed paths:
    M conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/ground_segment/cockpit/gcs.ml

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


  Commit: 1d2d2dd7a04f470995ab1d4a18da72280d167835
      
https://github.com/paparazzi/paparazzi/commit/1d2d2dd7a04f470995ab1d4a18da72280d167835
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M conf/messages.xml
  M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  removed old obsolete BOOZ_BARO_RAW message


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

  Changed paths:
    M conf/modules/baro_board.xml

  Log Message:
  -----------
  baro_board module: only use ADS1114 for navgo and umarim


  Commit: 9d5413d4d91fcc5841fba54d24a4809622ef99f8
      
https://github.com/paparazzi/paparazzi/commit/9d5413d4d91fcc5841fba54d24a4809622ef99f8
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M conf/modules/baro_board.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h

  Log Message:
  -----------
  removed sending of BARO_RAW message from baro_board, use normal ap_downlink 
and periodic send


  Commit: 21811dd39b7678651e92a35c9a12762f54c1c574
      
https://github.com/paparazzi/paparazzi/commit/21811dd39b7678651e92a35c9a12762f54c1c574
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.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/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.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/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  M conf/airframes/Poine/antenna.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/test_libeknav.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/obsolete/autoplato.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_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/nova.xml
  M conf/airframes/obsolete/osam_xsens_twog.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/twisted.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/vor.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/test_i2c.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/airframes/wind_tunnel.xml
  M conf/autopilot/obsolete/booz_test_progs.makefile
  M conf/autopilot/obsolete/csc.makefile
  M conf/autopilot/obsolete/csc_ap.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  M conf/autopilot/obsolete/mercury.makefile
  M conf/autopilot/obsolete/mercury_csc.makefile
  M conf/autopilot/obsolete/sitl.makefile
  M conf/autopilot/obsolete/sitl_jsbsim.makefile
  M conf/autopilot/obsolete/sitl_link_pprz.makefile
  M conf/autopilot/obsolete/sitl_link_xbee.makefile
  M conf/autopilot/obsolete/testing.makefile
  M conf/autopilot/obsolete/tiny.makefile
  M conf/autopilot/obsolete/twin_mcu.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile
  M conf/messages.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/cam.xml
  M conf/settings/cam_pitch.xml
  M conf/settings/cam_roll.xml
  M conf/settings/infrared.xml
  M conf/settings/ins_arduimu_basic.xml
  M conf/settings/ins_neutrals.xml
  M conf/settings/ir_i2c.xml
  M conf/settings/photogrammetry_calculator.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  A conf/units.xml
  R sw/airborne/anemotaxis.c
  R sw/airborne/anemotaxis.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  R sw/airborne/chemotaxis.c
  R sw/airborne/chemotaxis.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  M sw/airborne/modules/cam_control/cam_roll.c
  A sw/airborne/modules/cam_control/cam_roll.h
  M sw/airborne/modules/cartography/photogrammetry_calculator.c
  A sw/airborne/modules/enose/anemotaxis.c
  A sw/airborne/modules/enose/anemotaxis.h
  A sw/airborne/modules/enose/chemotaxis.c
  A sw/airborne/modules/enose/chemotaxis.h
  M sw/airborne/modules/vehicle_interface/vi_datalink.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/sensors/infrared.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/page_settings.ml
  M sw/ground_segment/cockpit/saveSettings.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/in_progress/log_parser/09_05_13__14_38_13.log
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/matlab_log/messages.xml
  M sw/simulator/flightModel.ml
  M sw/simulator/flight_gear.h
  M sw/tools/gen_airframe.ml

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


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

  Changed paths:
    M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  A conf/settings/tuning_ctl_new_airspeed.xml

  Log Message:
  -----------
  fixed ctl_adaptive settings file and removed dash and loiter trim (also from 
settings ctrl_new)


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

  Changed paths:
    M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h

  Log Message:
  -----------
  moved the v_ctl_auto_throttle_x LOITER_TRIM declarations to 
stabilization_attitude, as it's only used there


  Commit: 2cbfe2df2fffeca2b7e9f01ffce01496e4629bd9
      
https://github.com/paparazzi/paparazzi/commit/2cbfe2df2fffeca2b7e9f01ffce01496e4629bd9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    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/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h

  Log Message:
  -----------
  make all transport macro consistant (dev parameter)


  Commit: 00bf20bf2006db70cd2e9757ff143a1cdbc47d5e
      
https://github.com/paparazzi/paparazzi/commit/00bf20bf2006db70cd2e9757ff143a1cdbc47d5e
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h

  Log Message:
  -----------
  more generic macro for datalink with pprz transport


  Commit: 5d2b11099b46eba78674c1ebd02ab32b3636aa5a
      
https://github.com/paparazzi/paparazzi/commit/5d2b11099b46eba78674c1ebd02ab32b3636aa5a
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

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

  Log Message:
  -----------
  readability: defined a CMD_SHIFT for heli..


  Commit: 1fd1f55d01bc1504796e1e1270fb143f9374f05e
      
https://github.com/paparazzi/paparazzi/commit/1fd1f55d01bc1504796e1e1270fb143f9374f05e
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h

  Log Message:
  -----------
  extend new datalink macros to xbee protocol


  Commit: 6381118c063f02b726bbd2e6cfa7138e467fc153
      
https://github.com/paparazzi/paparazzi/commit/6381118c063f02b726bbd2e6cfa7138e467fc153
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h

  Log Message:
  -----------
  adapt extra_dl module to the new datalink structure


  Commit: 5395db16344f622c8aeb60f3a124a1110ca3d5cf
      
https://github.com/paparazzi/paparazzi/commit/5395db16344f622c8aeb60f3a124a1110ca3d5cf
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-22 (Thu, 22 Dec 2011)

  Changed paths:
    M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a7.xml

  Log Message:
  -----------
  removed UNTILT_ACCEL define from airframe files.
This define is long obsolete, "untilting of accels" in rotorcraft ins is always 
done since 2009


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

  Changed paths:
    M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a7.xml

  Log Message:
  -----------
  removed UNTILT_ACCEL define from airframe files.
This define is long obsolete, "untilting of accels" in rotorcraft ins is always 
done since 2009


  Commit: 339c0714c3eeb53f30a5271e564b80c01ac34e97
      
https://github.com/paparazzi/paparazzi/commit/339c0714c3eeb53f30a5271e564b80c01ac34e97
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-22 (Thu, 22 Dec 2011)

  Changed paths:
    M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  handling some unit conversion errors with exceptions and warnings


  Commit: 31ff0c23a82cbfcb3bdaacca70b7429fa07a7965
      
https://github.com/paparazzi/paparazzi/commit/31ff0c23a82cbfcb3bdaacca70b7429fa07a7965
  Author: lamestllama <address@hidden>
  Date:   2011-12-22 (Thu, 22 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/lib/ocaml/ivy/Makefile

  Log Message:
  -----------
  makefie changes to allow osx binary installer


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

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  print a warning if an unknown unit conversion is specified in the airframe 
file


  Commit: 563fd0bfc88ccc8d0889ce1189d23472617ab931
      
https://github.com/paparazzi/paparazzi/commit/563fd0bfc88ccc8d0889ce1189d23472617ab931
  Author: lamestllama <address@hidden>
  Date:   2011-12-23 (Fri, 23 Dec 2011)

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

  Log Message:
  -----------
  headers have been moved in libopencm3


  Commit: 81aea93baf1ffe9f3de91a2f55388e8e2d8b2cc3
      
https://github.com/paparazzi/paparazzi/commit/81aea93baf1ffe9f3de91a2f55388e8e2d8b2cc3
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-23 (Fri, 23 Dec 2011)

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

  Log Message:
  -----------
  scale_of_units: return 1.0 if units are the same


  Commit: 296a717dea149845f5c2a71d7f93c5a27aaf7d06
      
https://github.com/paparazzi/paparazzi/commit/296a717dea149845f5c2a71d7f93c5a27aaf7d06
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-12-24 (Sat, 24 Dec 2011)

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  nothing more, just a bit cleaner


  Commit: 878ebe2334f530156b9d8ea43a9072a4c75d7e14
      
https://github.com/paparazzi/paparazzi/commit/878ebe2334f530156b9d8ea43a9072a4c75d7e14
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-24 (Sat, 24 Dec 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/lib/ocaml/ivy/Makefile

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


  Commit: 1aff2222f50f016906b396958d414fec8b08ad63
      
https://github.com/paparazzi/paparazzi/commit/1aff2222f50f016906b396958d414fec8b08ad63
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-12-27 (Tue, 27 Dec 2011)

  Changed paths:
    A conf/airframes/CDW/ChimuJTinyFwSpi.xml

  Log Message:
  -----------
  Chimu-J on TWOG


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

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/booz2_flixr.xml
  M sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  no fucking NO_FUCKING_STARTUP_DELAY anymore


  Commit: 89238f9775315f9f559aeb2224193c754647b763
      
https://github.com/paparazzi/paparazzi/commit/89238f9775315f9f559aeb2224193c754647b763
  Author: Felix Ruess <address@hidden>
  Date:   2011-12-29 (Thu, 29 Dec 2011)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile

  Log Message:
  -----------
  make it possible to set SYS_TIME_LED to none


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

  Changed paths:
    M conf/boards/booz_1.0.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile

  Log Message:
  -----------
  SYS_TIME_LED stuff


  Commit: 86a8e2cdd467bf374b52b48e7e8d59c4605f9f11
      
https://github.com/paparazzi/paparazzi/commit/86a8e2cdd467bf374b52b48e7e8d59c4605f9f11
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  if USE_OPENCM3 don't compile non opencm3 clock setup


  Commit: 176c799afc507c1e2809fa9f26ae0b6a71fa0b68
      
https://github.com/paparazzi/paparazzi/commit/176c799afc507c1e2809fa9f26ae0b6a71fa0b68
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  LED 2 and 3 for Lisa/M


  Commit: 44594fbfdcdcce33b523834ea2c3b9f7d570983e
      
https://github.com/paparazzi/paparazzi/commit/44594fbfdcdcce33b523834ea2c3b9f7d570983e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    A conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  added fraser rotorcraft airframe file


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

  Changed paths:
    R conf/autopilot/obsolete/booz_test_progs.makefile
  R conf/autopilot/obsolete/booz_test_progs.xml
  R conf/autopilot/obsolete/conf_dc_mc.h
  R conf/autopilot/obsolete/conf_motor_bench.h
  R conf/autopilot/obsolete/conf_wt.h
  R conf/autopilot/obsolete/csc.makefile
  R conf/autopilot/obsolete/csc_ap.makefile
  R conf/autopilot/obsolete/csc_baro.makefile
  R conf/autopilot/obsolete/csc_board_v1_0.h
  R conf/autopilot/obsolete/data_logger_1_0.h
  R conf/autopilot/obsolete/gps_ugear.makefile
  R conf/autopilot/obsolete/lisa_test_progs.makefile
  R conf/autopilot/obsolete/mercury.makefile
  R conf/autopilot/obsolete/mercury_csc.makefile
  R conf/autopilot/obsolete/pwm_input.makefile
  R conf/autopilot/obsolete/sitl.makefile
  R conf/autopilot/obsolete/sitl_jsbsim.makefile
  R conf/autopilot/obsolete/sitl_link_pprz.makefile
  R conf/autopilot/obsolete/sitl_link_xbee.makefile
  R conf/autopilot/obsolete/testing.makefile
  R conf/autopilot/obsolete/tiny.makefile
  R conf/autopilot/obsolete/tiny_2_1_1_usb.h
  R conf/autopilot/obsolete/twin_avr.h
  R conf/autopilot/obsolete/twin_avr.makefile
  R conf/autopilot/obsolete/twin_mcu.makefile
  R conf/autopilot/obsolete/twin_mcu_avr.makefile
  R conf/autopilot/obsolete/twog_booz.h
  R conf/autopilot/obsolete/v1_2.h
  R conf/autopilot/obsolete/v1_2.makefile
  R conf/autopilot/obsolete/v1_2_1.h
  R conf/autopilot/obsolete/v1_2_1.makefile
  R conf/autopilot/obsolete/vane_sensor.makefile

  Log Message:
  -----------
  removed obsolete dir with old header files and makefiles


  Commit: 4ad87d23219e63c3f58588d14507bf2228ab4278
      
https://github.com/paparazzi/paparazzi/commit/4ad87d23219e63c3f58588d14507bf2228ab4278
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    R sw/airborne/obsolete/3dmg.c
  R sw/airborne/obsolete/3dmg.h
  R sw/airborne/obsolete/booz_gps.c
  R sw/airborne/obsolete/booz_gps.h
  R sw/airborne/obsolete/booz_gps_skytraq.c
  R sw/airborne/obsolete/booz_gps_skytraq.h
  R sw/airborne/obsolete/booz_gps_ubx.c
  R sw/airborne/obsolete/booz_gps_ubx.h
  R sw/airborne/obsolete/gps.c
  R sw/airborne/obsolete/gps.h
  R sw/airborne/obsolete/gps_ubx.c
  R sw/airborne/obsolete/gps_ubx.h
  R sw/airborne/obsolete/ins_osam_ugear.c
  R sw/airborne/obsolete/ins_osam_ugear.h
  R sw/airborne/obsolete/latlong.c
  R sw/airborne/obsolete/latlong.h
  R sw/airborne/obsolete/max1167.c
  R sw/airborne/obsolete/max1167.h
  R sw/airborne/obsolete/max1167_hw.c
  R sw/airborne/obsolete/max1167_hw.h

  Log Message:
  -----------
  removed airborne/obsolete dir with old gps and other stuff


  Commit: 2891a0675e68d374098f4241ef76baef05a8bec7
      
https://github.com/paparazzi/paparazzi/commit/2891a0675e68d374098f4241ef76baef05a8bec7
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

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

  Log Message:
  -----------
  use configured SYS_TIME_LED for fixedwings


  Commit: d84137eea96e95f616229f6e3cb06b0b5c075069
      
https://github.com/paparazzi/paparazzi/commit/d84137eea96e95f616229f6e3cb06b0b5c075069
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

  Log Message:
  -----------
  make AHRS_MAG_UPDATE_YAW_ONLY the default, to update all axes with mag use 
AHRS_MAG_UPDATE_ALL_AXES


  Commit: 1f3b60dc2cde6f8c67c42bb9ed7740b8a1f695af
      
https://github.com/paparazzi/paparazzi/commit/1f3b60dc2cde6f8c67c42bb9ed7740b8a1f695af
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M conf/airframes/Poine/beth.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile

  Log Message:
  -----------
  removed obsolete and unused IMU_OVERRIDE_CHANNELS from all makefiles


  Commit: c40e1c8983e8cb8f3d277cce320ca2b1c34de4a6
      
https://github.com/paparazzi/paparazzi/commit/c40e1c8983e8cb8f3d277cce320ca2b1c34de4a6
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  fraser airframe: use ACTUATORS_STARTUP_DELAY for mkk controllers


  Commit: d68f09d365763d8b3f7263a5d2466f72ad97253c
      
https://github.com/paparazzi/paparazzi/commit/d68f09d365763d8b3f7263a5d2466f72ad97253c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'gautier/arming' into dev


  Commit: 593f9445007712184443c34da8224f2e41047f76
      
https://github.com/paparazzi/paparazzi/commit/593f9445007712184443c34da8224f2e41047f76
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  switched LEDS 2 and 3 on lisa/m


  Commit: 3308cd32854a3de71d27d97befd6ab9f22223e19
      
https://github.com/paparazzi/paparazzi/commit/3308cd32854a3de71d27d97befd6ab9f22223e19
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  Revert "switched LEDS 2 and 3 on lisa/m"
I think it makes more sense to have LED1,2,3 in a row instead of 1,3,2, so 
revert...
This reverts commit 593f9445007712184443c34da8224f2e41047f76.


  Commit: e64fa4b77021a6731d4190198fc8823deca8b215
      
https://github.com/paparazzi/paparazzi/commit/e64fa4b77021a6731d4190198fc8823deca8b215
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  Merge pull request #114 from flixr/leds_lisa_m

LED 2 and 3 for Lisa/M


  Commit: fff38c16ffaa500d6d5d6b2363ff0841f873ae6c
      
https://github.com/paparazzi/paparazzi/commit/fff38c16ffaa500d6d5d6b2363ff0841f873ae6c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M conf/modules/baro_board.xml
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h

  Log Message:
  -----------
  Merge pull request #104 from paparazzi/baro_board

baro_board module for lisa/l


  Commit: c24580922c969a28e423d30242c7bb56f4d0a54b
      
https://github.com/paparazzi/paparazzi/commit/c24580922c969a28e423d30242c7bb56f4d0a54b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  Revert "Revert "switched LEDS 2 and 3 on lisa/m""
ahrg, ok, really use same led order as in toytronics, it's already documented 
in that weird order
This reverts commit 3308cd32854a3de71d27d97befd6ab9f22223e19.


  Commit: b75fc710bf675fd307298b2e9c141f1ac7bd49ad
      
https://github.com/paparazzi/paparazzi/commit/b75fc710bf675fd307298b2e9c141f1ac7bd49ad
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h

  Log Message:
  -----------
  LED 2 and 3 for Lisa/M


  Commit: d94719bef88236de6f18f1d34887aec44b151f49
      
https://github.com/paparazzi/paparazzi/commit/d94719bef88236de6f18f1d34887aec44b151f49
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c

  Log Message:
  -----------
  fix inlude of downlink for lisa/l baro board


  Commit: 9234fc33db297069d3f845f4b867644a2dfbf124
      
https://github.com/paparazzi/paparazzi/commit/9234fc33db297069d3f845f4b867644a2dfbf124
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    A conf/airframes/CDW/ChimuJTinyFwSpi.xml
  M conf/modules/baro_board.xml
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h

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


  Commit: bdce5f123bb0f1465d0a9d43245ac44d874735d8
      
https://github.com/paparazzi/paparazzi/commit/bdce5f123bb0f1465d0a9d43245ac44d874735d8
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-07 (Sat, 07 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c

  Log Message:
  -----------
  fix inlude of downlink for lisa/l baro board


  Commit: 4d484a842f72a399323787a0d6e6dec600eafbde
      
https://github.com/paparazzi/paparazzi/commit/4d484a842f72a399323787a0d6e6dec600eafbde
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-08 (Sun, 08 Jan 2012)

  Changed paths:
    M sw/airborne/arch/stm32/led_hw.h

  Log Message:
  -----------
  stm32: LED_ON now actually turns the led on instead of off and vice versa


  Commit: b6471d0bc983095f2a851179d4085d679a66a165
      
https://github.com/paparazzi/paparazzi/commit/b6471d0bc983095f2a851179d4085d679a66a165
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile

  Log Message:
  -----------
  define the makefile var NO_MAG to not use the mag on booz imu v1.0


  Commit: 29171a3244a32587c865343ebb1be123f65d2c9a
      
https://github.com/paparazzi/paparazzi/commit/29171a3244a32587c865343ebb1be123f65d2c9a
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  updated discovery airframe to not use (missing) mag and disable airspeed 
sensor


  Commit: 4bdfacf76246047a4375dd2bffadff33f8a4f63b
      
https://github.com/paparazzi/paparazzi/commit/4bdfacf76246047a4375dd2bffadff33f8a4f63b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/boards/booz_1.0.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  M sw/airborne/arch/lpc21/sys_time_hw.h

  Log Message:
  -----------
  properly configurable LED defaults for the boards


  Commit: 68f2294e5a0e5c4491bd0e2c6518247d199a711c
      
https://github.com/paparazzi/paparazzi/commit/68f2294e5a0e5c4491bd0e2c6518247d199a711c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

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

  Log Message:
  -----------
  fix autopilot.makefile


  Commit: 68a0c5c5265c5e7630b5a566dfb9e61c0d58c2c2
      
https://github.com/paparazzi/paparazzi/commit/68a0c5c5265c5e7630b5a566dfb9e61c0d58c2c2
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-09 (Mon, 09 Jan 2012)

  Changed paths:
    M sw/airborne/arch/lpc21/usb_tunnel.c

  Log Message:
  -----------
  fix usb_tunnel: use proper CheckFreeSpace macros


  Commit: cae4eb48a472e0c6b7a1da8bb68f7d2f548fa1f1
      
https://github.com/paparazzi/paparazzi/commit/cae4eb48a472e0c6b7a1da8bb68f7d2f548fa1f1
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M sw/ground_segment/tmtc/messages.ml

  Log Message:
  -----------
  untabify messages.ml


  Commit: a146aa9809e3f1f3b700eaf0f141f062d1429919
      
https://github.com/paparazzi/paparazzi/commit/a146aa9809e3f1f3b700eaf0f141f062d1429919
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore html/ folder (contains gh-pages branch)


  Commit: d61cd19cc95eec352dd52f4cf19fcdc35500b1ab
      
https://github.com/paparazzi/paparazzi/commit/d61cd19cc95eec352dd52f4cf19fcdc35500b1ab
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M Doxyfile

  Log Message:
  -----------
  output doxygen generated html files to html dir for publishing on github pages


  Commit: fc2efa720e4abae4542d245d35b6f873ccf1b64c
      
https://github.com/paparazzi/paparazzi/commit/fc2efa720e4abae4542d245d35b6f873ccf1b64c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M Doxyfile

  Log Message:
  -----------
  updaetd Doxyfile for documentation under paparazzi.github.com/docs


  Commit: 6c5c16d847de151a018d6cbae0fa03eb02ab5756
      
https://github.com/paparazzi/paparazzi/commit/6c5c16d847de151a018d6cbae0fa03eb02ab5756
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M data/pictures/penguin_logo.svg

  Log Message:
  -----------
  crop image size to size of actual logo


  Commit: 0655c28f3472de8cfa3a359455856b0587c1d24b
      
https://github.com/paparazzi/paparazzi/commit/0655c28f3472de8cfa3a359455856b0587c1d24b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M data/pictures/penguin_logo.svg
  M sw/airborne/arch/lpc21/usb_tunnel.c

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


  Commit: 8858daf3d463eca79317a1321ad84f6dac1631bc
      
https://github.com/paparazzi/paparazzi/commit/8858daf3d463eca79317a1321ad84f6dac1631bc
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  fraser airframe: removed unused servo stuff


  Commit: 2c3abfa9677d76bc83a1b86bed2ed8edecc89584
      
https://github.com/paparazzi/paparazzi/commit/2c3abfa9677d76bc83a1b86bed2ed8edecc89584
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M conf/autopilot/lisa_m_test_progs.makefile

  Log Message:
  -----------
  uncomment tunnel in lisa_m_test_progs


  Commit: 37a23b194058f235a0f1c34aefa789b2c4343832
      
https://github.com/paparazzi/paparazzi/commit/37a23b194058f235a0f1c34aefa789b2c4343832
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M conf/autopilot/setup.makefile

  Log Message:
  -----------
  added uart tunnel for lisa to setup firmware makefile


  Commit: 8e732d0f4d54a5924752bae373f25187676d9818
      
https://github.com/paparazzi/paparazzi/commit/8e732d0f4d54a5924752bae373f25187676d9818
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M Doxyfile
  M README
  A doc/mainpage.dox

  Log Message:
  -----------
  added mainpage for doxygen


  Commit: 84c63a24669d9df802212e11e59929b0b0f353c8
      
https://github.com/paparazzi/paparazzi/commit/84c63a24669d9df802212e11e59929b0b0f353c8
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M conf/settings/tuning_ins_dcm.xml

  Log Message:
  -----------
  removed imu_overrun from tuning_dcm settings file, it is imu implementation 
specific


  Commit: e2c41edbfe48f876fb6e9c3150619654e5b64529
      
https://github.com/paparazzi/paparazzi/commit/e2c41edbfe48f876fb6e9c3150619654e5b64529
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-14 (Sat, 14 Jan 2012)

  Changed paths:
    M Doxyfile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/setup.makefile
  A doc/mainpage.dox

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


  Commit: 55672048f0a309749d93985f26b656ac5fd2e9de
      
https://github.com/paparazzi/paparazzi/commit/55672048f0a309749d93985f26b656ac5fd2e9de
  Author: Martin Mueller <address@hidden>
  Date:   2012-01-15 (Sun, 15 Jan 2012)

  Changed paths:
    M conf/autopilot/logger.makefile
  M sw/airborne/firmwares/logger/main_logger.c

  Log Message:
  -----------
  Increase PCLK to use USB mass storage with LPC


  Commit: a7408050025f1bf2d790e228ad3c82c8da3ed309
      
https://github.com/paparazzi/paparazzi/commit/a7408050025f1bf2d790e228ad3c82c8da3ed309
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h

  Log Message:
  -----------
  Merge pull request #116 from TobiasMue/devTob_gls

gps landing routines and new border_line nav routine


  Commit: bb1dcf1352078de0a877bedd1eecf28e17133f6f
      
https://github.com/paparazzi/paparazzi/commit/bb1dcf1352078de0a877bedd1eecf28e17133f6f
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h

  Log Message:
  -----------
  some more doxygen comments


  Commit: d66599129007262b30b50e880c2ae78b4cddd78c
      
https://github.com/paparazzi/paparazzi/commit/d66599129007262b30b50e880c2ae78b4cddd78c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M Doxyfile

  Log Message:
  -----------
  doxygen: set JAVADOC_AUTOBRIEF to yes


  Commit: c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6
      
https://github.com/paparazzi/paparazzi/commit/c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/avr/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.c
  M sw/airborne/arch/lpc21/usb_msc_hw.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/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_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/can_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/stm32_vector_table.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.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/tiny_sim.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/booz/test/booz_test_imu.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_can.c
  M sw/airborne/csc/csc_can.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/bench_sensors.h
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/uart_hw.c
  M sw/airborne/firmwares/beth/uart_hw.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_spi_autopilot_msg.h
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/mcu.c
  M sw/airborne/mcu_periph/i2c.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/pwm_input.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/core/sys_mon.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.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/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/print.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/test_adcs.c

  Log Message:
  -----------
  #if USE_x instead of #ifdef USE_x


  Commit: b83a9fbd567cff587b3cb661af56469d8ca9dc1e
      
https://github.com/paparazzi/paparazzi/commit/b83a9fbd567cff587b3cb661af56469d8ca9dc1e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/avr/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/adc_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.c
  M sw/airborne/arch/lpc21/usb_msc_hw.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/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_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/can_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/stm32_vector_table.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.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/tiny_sim.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/booz/test/booz_test_imu.c
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_can.c
  M sw/airborne/csc/csc_can.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/bench_sensors.h
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/uart_hw.c
  M sw/airborne/firmwares/beth/uart_hw.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_spi_autopilot_msg.h
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/mcu.c
  M sw/airborne/mcu_periph/i2c.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/pwm_input.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/core/sys_mon.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.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/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/print.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/test_adcs.c

  Log Message:
  -----------
  Revert "#if USE_x instead of #ifdef USE_x"

somehow this does not work in some cases:
arch/lpc21/mcu_periph/adc_arch.c:32:12: error: #if with no expression

This reverts commit c12f3401a082ef5b016f208a1b1ccd0fec0a3fd6.


  Commit: 3d4935ebc5012a92ecf592373602ffcad243c54b
      
https://github.com/paparazzi/paparazzi/commit/3d4935ebc5012a92ecf592373602ffcad243c54b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  use #if USE_x instead of #ifdef USE_x

Then you can also define e.g. -DUSE_GPS=0 and it will work as expected
(disable it just like as if it would be undefined)
-DUSE_GPS (without a value) has the same effect as -DUSE_GPS=1

Please always use #if instead of #ifdef if it is a flag to enable/disable 
something
and it will always evaluate as a fixed-point arithmetic expression.


  Commit: 06bba4f47b3bf26ad54854bdfe6e92c1467108b7
      
https://github.com/paparazzi/paparazzi/commit/06bba4f47b3bf26ad54854bdfe6e92c1467108b7
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  A conf/airframes/CDW/ChimuJTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  R conf/autopilot/obsolete/booz_test_progs.makefile
  R conf/autopilot/obsolete/booz_test_progs.xml
  R conf/autopilot/obsolete/conf_dc_mc.h
  R conf/autopilot/obsolete/conf_motor_bench.h
  R conf/autopilot/obsolete/conf_wt.h
  R conf/autopilot/obsolete/csc.makefile
  R conf/autopilot/obsolete/csc_ap.makefile
  R conf/autopilot/obsolete/csc_baro.makefile
  R conf/autopilot/obsolete/csc_board_v1_0.h
  R conf/autopilot/obsolete/data_logger_1_0.h
  R conf/autopilot/obsolete/gps_ugear.makefile
  R conf/autopilot/obsolete/lisa_test_progs.makefile
  R conf/autopilot/obsolete/mercury.makefile
  R conf/autopilot/obsolete/mercury_csc.makefile
  R conf/autopilot/obsolete/pwm_input.makefile
  R conf/autopilot/obsolete/sitl.makefile
  R conf/autopilot/obsolete/sitl_jsbsim.makefile
  R conf/autopilot/obsolete/sitl_link_pprz.makefile
  R conf/autopilot/obsolete/sitl_link_xbee.makefile
  R conf/autopilot/obsolete/testing.makefile
  R conf/autopilot/obsolete/tiny.makefile
  R conf/autopilot/obsolete/tiny_2_1_1_usb.h
  R conf/autopilot/obsolete/twin_avr.h
  R conf/autopilot/obsolete/twin_avr.makefile
  R conf/autopilot/obsolete/twin_mcu.makefile
  R conf/autopilot/obsolete/twin_mcu_avr.makefile
  R conf/autopilot/obsolete/twog_booz.h
  R conf/autopilot/obsolete/v1_2.h
  R conf/autopilot/obsolete/v1_2.makefile
  R conf/autopilot/obsolete/v1_2_1.h
  R conf/autopilot/obsolete/v1_2_1.makefile
  R conf/autopilot/obsolete/vane_sensor.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile
  M conf/boards/booz_1.0.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/modules/baro_board.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  A conf/settings/tuning_ctl_new_airspeed.xml
  M conf/settings/tuning_ins_dcm.xml
  M data/pictures/penguin_logo.svg
  A doc/mainpage.dox
  M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/lpc21/sys_time_hw.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  R sw/airborne/obsolete/3dmg.c
  R sw/airborne/obsolete/3dmg.h
  R sw/airborne/obsolete/booz_gps.c
  R sw/airborne/obsolete/booz_gps.h
  R sw/airborne/obsolete/booz_gps_skytraq.c
  R sw/airborne/obsolete/booz_gps_skytraq.h
  R sw/airborne/obsolete/booz_gps_ubx.c
  R sw/airborne/obsolete/booz_gps_ubx.h
  R sw/airborne/obsolete/gps.c
  R sw/airborne/obsolete/gps.h
  R sw/airborne/obsolete/gps_ubx.c
  R sw/airborne/obsolete/gps_ubx.h
  R sw/airborne/obsolete/ins_osam_ugear.c
  R sw/airborne/obsolete/ins_osam_ugear.h
  R sw/airborne/obsolete/latlong.c
  R sw/airborne/obsolete/latlong.h
  R sw/airborne/obsolete/max1167.c
  R sw/airborne/obsolete/max1167.h
  R sw/airborne/obsolete/max1167_hw.c
  R sw/airborne/obsolete/max1167_hw.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/tmtc/messages.ml
  M sw/lib/ocaml/ivy/Makefile
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/tools/gen_airframe.ml

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

Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/rotorcraft/telemetry.h


  Commit: 6f88d0d243af245e0e49f9bf9555e40dfe38ad1c
      
https://github.com/paparazzi/paparazzi/commit/6f88d0d243af245e0e49f9bf9555e40dfe38ad1c
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  Revert "use #if USE_x instead of #ifdef USE_x"
ok, somehow this doesn't work in all cases
This reverts commit 3d4935ebc5012a92ecf592373602ffcad243c54b.


  Commit: 00f8eec9b1dfa98c6a720047c49666db73056e22
      
https://github.com/paparazzi/paparazzi/commit/00f8eec9b1dfa98c6a720047c49666db73056e22
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/alt_vfilter.h
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/csc_telemetry.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/stabilization_attitude_ref_euler_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/airborne/subsystems/settings.c

  Log Message:
  -----------
  use #if USE_x instead of #ifdef USE_x

Then you can also define e.g. -DUSE_GPS=0 and it will work as expected
(disable it just like as if it would be undefined)
-DUSE_GPS (without a value) has the same effect as -DUSE_GPS=1
If you need to define it in the code, use #define USE_GPS 1

Please always use #if instead of #ifdef if it is a flag to enable/disable 
something
and it will always evaluate as an integer arithmetic expression.


  Commit: c14a4506285e1c9f249eb98eb242bf34a0451d00
      
https://github.com/paparazzi/paparazzi/commit/c14a4506285e1c9f249eb98eb242bf34a0451d00
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/navigation/border_line.c
  M sw/airborne/subsystems/navigation/border_line.h
  M sw/airborne/subsystems/navigation/gls.c
  M sw/airborne/subsystems/navigation/gls.h

  Log Message:
  -----------
  whitespace cleanup and doxygen stuff


  Commit: d569370cd346436f2c32d055e86f14c2848b9fc8
      
https://github.com/paparazzi/paparazzi/commit/d569370cd346436f2c32d055e86f14c2848b9fc8
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M Doxyfile
  M conf/autopilot/logger.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h

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


  Commit: cf76b4840388bca493d3524e6d6234026c2f6338
      
https://github.com/paparazzi/paparazzi/commit/cf76b4840388bca493d3524e6d6234026c2f6338
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/navigation/gls.c

  Log Message:
  -----------
  gls: indentation, app_angle in rad instead of deg, #if instead of #ifdef


  Commit: 33d59cd8ddc925f998d6082b2a995babf8361e9a
      
https://github.com/paparazzi/paparazzi/commit/33d59cd8ddc925f998d6082b2a995babf8361e9a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/estimator.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/pprz_debug.h

  Log Message:
  -----------
  some more downlink macros adapted


  Commit: 05dc0b7e12dd9a510533f860b0dc45b7d8d14b46
      
https://github.com/paparazzi/paparazzi/commit/05dc0b7e12dd9a510533f860b0dc45b7d8d14b46
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    R sw/airborne/modules/deploy_sonar_buoy.h

  Log Message:
  -----------
  removed duplicate header file of deploy_sonar_buoy


  Commit: 007fc67275d48762e60ea11c948d6a4b3de27c46
      
https://github.com/paparazzi/paparazzi/commit/007fc67275d48762e60ea11c948d6a4b3de27c46
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/telemetry/telemetry.dtd
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.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/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.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_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.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/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  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/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.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/wind_gfi.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/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/alt_srf08.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_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_ppzuav.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/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/datalink/datalink.h
  M sw/airborne/subsystems/datalink/downlink.h
  M sw/airborne/subsystems/datalink/pprz_transport.c
  M sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/datalink/xbee.h
  M sw/airborne/subsystems/datalink/xbee24.h
  M sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_telemetry.c
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge branch 'transport' into dev

Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/rotorcraft/telemetry.h


  Commit: 63119004a21b83cdfe1d1908bd557fc775f9163b
      
https://github.com/paparazzi/paparazzi/commit/63119004a21b83cdfe1d1908bd557fc775f9163b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    R sw/airborne/modules/deploy_sonar_buoy.h

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


  Commit: 0b0bcd96793661b052625a56d88b7c9853bd2a5b
      
https://github.com/paparazzi/paparazzi/commit/0b0bcd96793661b052625a56d88b7c9853bd2a5b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  rotorcraft telemetry: #if USE_CAM instead of #ifdef USE_CAM


  Commit: f804bb0e0ca3726db4064e1c164683c76506573d
      
https://github.com/paparazzi/paparazzi/commit/f804bb0e0ca3726db4064e1c164683c76506573d
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/modules/digital_cam/dc.h

  Log Message:
  -----------
  indentation for dc.h


  Commit: cddea3426d36519a4df46e6ced1044d6bc85da4f
      
https://github.com/paparazzi/paparazzi/commit/cddea3426d36519a4df46e6ced1044d6bc85da4f
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_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/navgo_1.0.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/tiny_sim.h
  M sw/airborne/boards/umarim_1.0.h

  Log Message:
  -----------
  allow definition of ADC_CHANNEL_VSUPPLY in firmware section of airframe file


  Commit: 187941d420d9538b247802820c468605a2ff00ba
      
https://github.com/paparazzi/paparazzi/commit/187941d420d9538b247802820c468605a2ff00ba
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  R doc/mainpage.dox
  A doc/manual/mainpage.dox
  A doc/manual/style.dox

  Log Message:
  -----------
  added dir for dev manual and style guide. github pages repo now under doc/html


  Commit: 7e6b75beade683e8d1280e1f59f2a31e13eb1f73
      
https://github.com/paparazzi/paparazzi/commit/7e6b75beade683e8d1280e1f59f2a31e13eb1f73
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M sw/airborne/led.h
  M sw/airborne/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  M sw/airborne/sys_time.h

  Log Message:
  -----------
  typo in comments


  Commit: fb52967c1edb24957f579b8458f430076dd8060e
      
https://github.com/paparazzi/paparazzi/commit/fb52967c1edb24957f579b8458f430076dd8060e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M Doxyfile
  M doc/manual/style.dox

  Log Message:
  -----------
  minor doxygen updates


  Commit: 5b44c343cf2f8c8e3b768074d2ab2fdfec2a9de3
      
https://github.com/paparazzi/paparazzi/commit/5b44c343cf2f8c8e3b768074d2ab2fdfec2a9de3
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/imu_analog.makefile

  Log Message:
  -----------
  abort compilation with an error if trying to use imu_analog subsystem on stm32


  Commit: 0ed489b9d13c4476517d632660db4e31e1b6e92b
      
https://github.com/paparazzi/paparazzi/commit/0ed489b9d13c4476517d632660db4e31e1b6e92b
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  added eclipse project files to .gitignore


  Commit: 399016c983b338242bac04d668a3970d5f1f94b1
      
https://github.com/paparazzi/paparazzi/commit/399016c983b338242bac04d668a3970d5f1f94b1
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    R conf/airframes/obsolete/csc.xml
  R conf/airframes/obsolete/csc_ap.xml
  R conf/autopilot/subsystems/csc_gps.makefile
  R conf/settings/csc_ap.xml
  R conf/settings/mercury_csc.xml
  R conf/telemetry/csc.xml
  R conf/telemetry/csc_ap.xml
  R conf/telemetry/mercury_csc.xml
  R sw/airborne/arch/lpc21/servos_csc.c
  R sw/airborne/arch/lpc21/servos_csc.h
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.c
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.h
  R sw/airborne/csc/arm7/props_csc.c
  R sw/airborne/csc/arm7/props_csc.h
  R sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_adc.h
  R sw/airborne/csc/csc_airspeed.c
  R sw/airborne/csc/csc_airspeed.h
  R sw/airborne/csc/csc_ap_link.c
  R sw/airborne/csc/csc_ap_link.h
  R sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_ap_main.h
  R sw/airborne/csc/csc_autopilot.c
  R sw/airborne/csc/csc_autopilot.h
  R sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_baro.h
  R sw/airborne/csc/csc_can.c
  R sw/airborne/csc/csc_can.h
  R sw/airborne/csc/csc_datalink.c
  R sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_main.h
  R sw/airborne/csc/csc_me4_link.c
  R sw/airborne/csc/csc_me4_link.h
  R sw/airborne/csc/csc_msg_def.h
  R sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_protocol.h
  R sw/airborne/csc/csc_rc_spektrum.c
  R sw/airborne/csc/csc_rc_spektrum.h
  R sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/csc_servos.h
  R sw/airborne/csc/csc_telemetry.c
  R sw/airborne/csc/csc_telemetry.h
  R sw/airborne/csc/csc_throttle.c
  R sw/airborne/csc/csc_throttle.h
  R sw/airborne/csc/csc_vane.c
  R sw/airborne/csc/csc_vane.h
  R sw/airborne/csc/csc_xsens.c
  R sw/airborne/csc/csc_xsens.h
  R sw/airborne/csc/mercury_ap.c
  R sw/airborne/csc/mercury_ap.h
  R sw/airborne/csc/mercury_csc_main.c
  R sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/mercury_supervision.h
  R sw/airborne/csc/mercury_xsens.c
  R sw/airborne/csc/mercury_xsens.h
  R sw/airborne/csc/ppm_bridge_main.c
  R sw/airborne/lisa/test_csc_servo.c

  Log Message:
  -----------
  removd old csc stuff. was the can servo controller, but is obsolete and 
unmaintained


  Commit: 1c61c4edb3bf5cab3685e19ce211896440753e1f
      
https://github.com/paparazzi/paparazzi/commit/1c61c4edb3bf5cab3685e19ce211896440753e1f
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    R sw/lib/ocaml/ivy/Makefile
  R sw/lib/ocaml/ivy/README
  R sw/lib/ocaml/ivy/cglibivy.c
  R sw/lib/ocaml/ivy/civy.c
  R sw/lib/ocaml/ivy/civyloop.c
  R sw/lib/ocaml/ivy/ctkivy.c
  R sw/lib/ocaml/ivy/debian/changelog.3.10.2
  R sw/lib/ocaml/ivy/debian/changelog.3.11.2
  R sw/lib/ocaml/ivy/debian/compat
  R sw/lib/ocaml/ivy/debian/control
  R sw/lib/ocaml/ivy/debian/rules
  R sw/lib/ocaml/ivy/debian/shlibs.local
  R sw/lib/ocaml/ivy/examples/Makefile
  R sw/lib/ocaml/ivy/examples/glibivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyprobe.ml
  R sw/lib/ocaml/ivy/examples/tkivyprobe.ml
  R sw/lib/ocaml/ivy/glibIvy.ml
  R sw/lib/ocaml/ivy/glibIvy.mli
  R sw/lib/ocaml/ivy/ivy.ml
  R sw/lib/ocaml/ivy/ivy.mli
  R sw/lib/ocaml/ivy/ivyLoop.ml
  R sw/lib/ocaml/ivy/ivyLoop.mli
  R sw/lib/ocaml/ivy/tkIvy.ml
  R sw/lib/ocaml/ivy/tkIvy.mli

  Log Message:
  -----------
  removed ocaml ivy lib, ivy svn is up-to-date with ivy-ocaml


  Commit: e34bcbb29c5452e5231ba00b8ab46ad077894000
      
https://github.com/paparazzi/paparazzi/commit/e34bcbb29c5452e5231ba00b8ab46ad077894000
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  airframe file: update fraser, no useless imu defines, disable sys_mon -> 
needs new systime


  Commit: 3ee1ed36503e215a64b7eaaa9da5610f7e25e855
      
https://github.com/paparazzi/paparazzi/commit/3ee1ed36503e215a64b7eaaa9da5610f7e25e855
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_aspirin.h

  Log Message:
  -----------
  imu_aspirin: default sens and neutral values for gyro and accel


  Commit: d5e46ab7cb1863b63c0695a446221e5829878516
      
https://github.com/paparazzi/paparazzi/commit/d5e46ab7cb1863b63c0695a446221e5829878516
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  [airframe] use the new default values for aspirin gyro and accel and enable 
AHRS_ALIGNER_LED


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

  Changed paths:
    M conf/messages.xml
  M conf/modules/baro_board.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  Merge branch 'baro' into dev


  Commit: 59907827a4d4f00536da8a8ed1759b55f63c6d2e
      
https://github.com/paparazzi/paparazzi/commit/59907827a4d4f00536da8a8ed1759b55f63c6d2e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-29 (Sun, 29 Jan 2012)

  Changed paths:
    M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h

  Log Message:
  -----------
  removed baro_downlink_raw from lisa_l baro_board, use normal periodic send


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

  Changed paths:
    M sw/airborne/firmwares/fixedwing/ap_downlink.h

  Log Message:
  -----------
  fix PERIODIC_SEND_BARO_RAW: downlink takes transport and device as param now


  Commit: 5b6074eb0965d90ba4b18c0158cb2186c578fab1
      
https://github.com/paparazzi/paparazzi/commit/5b6074eb0965d90ba4b18c0158cb2186c578fab1
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  renamed Booz2TelemetryPeriodic macro to TelemetryPeriodic()


  Commit: 21e1feb9caece8031d22157b7d1ffc857936037e
      
https://github.com/paparazzi/paparazzi/commit/21e1feb9caece8031d22157b7d1ffc857936037e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  R doc/mainpage.dox
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_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/navgo_1.0.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/tiny_sim.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/led.h
  M sw/airborne/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  M sw/airborne/sys_time.h

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


  Commit: eadde440d070fdeaba595452a77e683ed35c107e
      
https://github.com/paparazzi/paparazzi/commit/eadde440d070fdeaba595452a77e683ed35c107e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-30 (Mon, 30 Jan 2012)

  Changed paths:
    M sw/simulator/flightModel.ml

  Log Message:
  -----------
  ocaml sim: fix reading of parameters from airframe xml file, was missing unit 
conversions


  Commit: 6f52386cd5e22621e71cd1337b6c7c47ec3660c0
      
https://github.com/paparazzi/paparazzi/commit/6f52386cd5e22621e71cd1337b6c7c47ec3660c0
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-31 (Tue, 31 Jan 2012)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_aspirin.h

  Log Message:
  -----------
  corrected default accel sens for adxl345 on aspirin


  Commit: f07b05e6da24207279086f9946771ae0dd36e554
      
https://github.com/paparazzi/paparazzi/commit/f07b05e6da24207279086f9946771ae0dd36e554
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M sw/airborne/boards/umarim/imu_umarim.h

  Log Message:
  -----------
  default sens for itg3200 and adxl345 in umarim imu


  Commit: dd15598389df55128423d357323d2a786aa1bd41
      
https://github.com/paparazzi/paparazzi/commit/dd15598389df55128423d357323d2a786aa1bd41
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-02 (Thu, 02 Feb 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M README
  A conf/airframes/CDW/ChimuJTinyFwSpi.xml
  M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.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/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.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/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  M conf/airframes/Poine/antenna.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/test_libeknav.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/obsolete/autoplato.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_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  R conf/airframes/obsolete/csc.xml
  R conf/airframes/obsolete/csc_ap.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/nova.xml
  M conf/airframes/obsolete/osam_xsens_twog.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/twisted.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/vor.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/test_i2c.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/airframes/wind_tunnel.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/logger.makefile
  R conf/autopilot/obsolete/booz_test_progs.makefile
  R conf/autopilot/obsolete/booz_test_progs.xml
  R conf/autopilot/obsolete/conf_dc_mc.h
  R conf/autopilot/obsolete/conf_motor_bench.h
  R conf/autopilot/obsolete/conf_wt.h
  R conf/autopilot/obsolete/csc.makefile
  R conf/autopilot/obsolete/csc_ap.makefile
  R conf/autopilot/obsolete/csc_baro.makefile
  R conf/autopilot/obsolete/csc_board_v1_0.h
  R conf/autopilot/obsolete/data_logger_1_0.h
  R conf/autopilot/obsolete/gps_ugear.makefile
  R conf/autopilot/obsolete/lisa_test_progs.makefile
  R conf/autopilot/obsolete/mercury.makefile
  R conf/autopilot/obsolete/mercury_csc.makefile
  R conf/autopilot/obsolete/pwm_input.makefile
  R conf/autopilot/obsolete/sitl.makefile
  R conf/autopilot/obsolete/sitl_jsbsim.makefile
  R conf/autopilot/obsolete/sitl_link_pprz.makefile
  R conf/autopilot/obsolete/sitl_link_xbee.makefile
  R conf/autopilot/obsolete/testing.makefile
  R conf/autopilot/obsolete/tiny.makefile
  R conf/autopilot/obsolete/tiny_2_1_1_usb.h
  R conf/autopilot/obsolete/twin_avr.h
  R conf/autopilot/obsolete/twin_avr.makefile
  R conf/autopilot/obsolete/twin_mcu.makefile
  R conf/autopilot/obsolete/twin_mcu_avr.makefile
  R conf/autopilot/obsolete/twog_booz.h
  R conf/autopilot/obsolete/v1_2.h
  R conf/autopilot/obsolete/v1_2.makefile
  R conf/autopilot/obsolete/v1_2_1.h
  R conf/autopilot/obsolete/v1_2_1.makefile
  R conf/autopilot/obsolete/vane_sensor.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/csc_gps.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.0.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.5.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile
  M conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  M conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  M conf/boards/booz_1.0.makefile
  M conf/boards/classix.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  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/grosslobke_demo.xml
  M conf/flight_plans/hsif.xml
  M conf/flight_plans/ingolfsskali.xml
  M conf/flight_plans/joystick.xml
  M conf/flight_plans/kv_svalbard.xml
  M conf/flight_plans/nordlys.xml
  M conf/flight_plans/poles.xml
  M conf/flight_plans/snav.xml
  M conf/flight_plans/tcas.xml
  M conf/flight_plans/versatile.xml
  M conf/messages.xml
  M conf/modules/baro_board.xml
  A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/cam.xml
  M conf/settings/cam_pitch.xml
  M conf/settings/cam_roll.xml
  R conf/settings/csc_ap.xml
  M conf/settings/flight_params.xml
  M conf/settings/infrared.xml
  M conf/settings/ins_arduimu_basic.xml
  M conf/settings/ins_neutrals.xml
  M conf/settings/ir_i2c.xml
  M conf/settings/lisa.xml
  R conf/settings/mercury_csc.xml
  M conf/settings/photogrammetry_calculator.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  A conf/settings/tuning_ctl_new_airspeed.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  R conf/telemetry/booz.xml
  R conf/telemetry/csc.xml
  R conf/telemetry/csc_ap.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  R conf/telemetry/mercury_csc.xml
  M conf/telemetry/telemetry.dtd
  M conf/telemetry/telemetry_booz2.xml
  M conf/telemetry/telemetry_jtm.xml
  A conf/units.xml
  M data/pictures/penguin_logo.svg
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  M sw/airborne/alt_vfilter.h
  R sw/airborne/anemotaxis.c
  R sw/airborne/anemotaxis.h
  R sw/airborne/ap_downlink.h
  M sw/airborne/arch/avr/ant_v2x.c
  R sw/airborne/arch/avr/modem_hw.c
  R sw/airborne/arch/avr/modem_hw.h
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
  R sw/airborne/arch/lpc21/modem_hw.c
  R sw/airborne/arch/lpc21/modem_hw.h
  R sw/airborne/arch/lpc21/servos_csc.c
  R sw/airborne/arch/lpc21/servos_csc.h
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_hw.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_gps.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/navgo_1.0.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/tiny_sim.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/boards/umarim/imu_umarim.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_mc.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_modem.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz2_test_rc.c
  M sw/airborne/booz/test/booz2_test_usb.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  R sw/airborne/chemotaxis.c
  R sw/airborne/chemotaxis.h
  M sw/airborne/commands.c
  M sw/airborne/commands.h
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.c
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.h
  R sw/airborne/csc/arm7/props_csc.c
  R sw/airborne/csc/arm7/props_csc.h
  R sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_adc.h
  R sw/airborne/csc/csc_airspeed.c
  R sw/airborne/csc/csc_airspeed.h
  R sw/airborne/csc/csc_ap_link.c
  R sw/airborne/csc/csc_ap_link.h
  R sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_ap_main.h
  R sw/airborne/csc/csc_autopilot.c
  R sw/airborne/csc/csc_autopilot.h
  R sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_baro.h
  R sw/airborne/csc/csc_can.c
  R sw/airborne/csc/csc_can.h
  R sw/airborne/csc/csc_datalink.c
  R sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_main.h
  R sw/airborne/csc/csc_me4_link.c
  R sw/airborne/csc/csc_me4_link.h
  R sw/airborne/csc/csc_msg_def.h
  R sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_protocol.h
  R sw/airborne/csc/csc_rc_spektrum.c
  R sw/airborne/csc/csc_rc_spektrum.h
  R sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/csc_servos.h
  R sw/airborne/csc/csc_telemetry.c
  R sw/airborne/csc/csc_telemetry.h
  R sw/airborne/csc/csc_throttle.c
  R sw/airborne/csc/csc_throttle.h
  R sw/airborne/csc/csc_vane.c
  R sw/airborne/csc/csc_vane.h
  R sw/airborne/csc/csc_xsens.c
  R sw/airborne/csc/csc_xsens.h
  R sw/airborne/csc/mercury_ap.c
  R sw/airborne/csc/mercury_ap.h
  R sw/airborne/csc/mercury_csc_main.c
  R sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/mercury_supervision.h
  R sw/airborne/csc/mercury_xsens.c
  R sw/airborne/csc/mercury_xsens.h
  R sw/airborne/csc/ppm_bridge_main.c
  R sw/airborne/datalink.h
  R sw/airborne/downlink.c
  R sw/airborne/downlink.h
  R sw/airborne/downlink_transport.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  R sw/airborne/fbw_downlink.h
  M sw/airborne/firmwares/beth/gps_c.patch
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  A sw/airborne/firmwares/fixedwing/ap_downlink.c
  A sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  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/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/datalink.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 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/stabilization/quat_setpoint.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/firmwares/tutorial/main_demo4.c
  M sw/airborne/firmwares/tutorial/main_demo5.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/fms/fms_test_datalink.c
  M sw/airborne/fms/overo_test_periodic.c
  M sw/airborne/fms/overo_test_telemetry.c
  M sw/airborne/fms/test_telemetry_2.c
  M sw/airborne/led.h
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.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_adc.c
  R sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  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/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  R sw/airborne/modem.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/adcs/max11040.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_roll.c
  A sw/airborne/modules/cam_control/cam_roll.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/cartography/photogrammetry_calculator.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  R sw/airborne/modules/deploy_sonar_buoy.h
  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/dc.h
  M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
  A sw/airborne/modules/enose/anemotaxis.c
  A sw/airborne/modules/enose/anemotaxis.h
  A sw/airborne/modules/enose/chemotaxis.c
  A sw/airborne/modules/enose/chemotaxis.h
  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/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.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/wind_gfi.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/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/alt_srf08.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_bmp.c
  M sw/airborne/modules/sensors/baro_ets.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_ppzuav.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/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.h
  R sw/airborne/obsolete/3dmg.c
  R sw/airborne/obsolete/3dmg.h
  R sw/airborne/obsolete/booz_gps.c
  R sw/airborne/obsolete/booz_gps.h
  R sw/airborne/obsolete/booz_gps_skytraq.c
  R sw/airborne/obsolete/booz_gps_skytraq.h
  R sw/airborne/obsolete/booz_gps_ubx.c
  R sw/airborne/obsolete/booz_gps_ubx.h
  R sw/airborne/obsolete/gps.c
  R sw/airborne/obsolete/gps.h
  R sw/airborne/obsolete/gps_ubx.c
  R sw/airborne/obsolete/gps_ubx.h
  R sw/airborne/obsolete/ins_osam_ugear.c
  R sw/airborne/obsolete/ins_osam_ugear.h
  R sw/airborne/obsolete/latlong.c
  R sw/airborne/obsolete/latlong.h
  R sw/airborne/obsolete/max1167.c
  R sw/airborne/obsolete/max1167.h
  R sw/airborne/obsolete/max1167_hw.c
  R sw/airborne/obsolete/max1167_hw.h
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  R sw/airborne/pprz_transport.c
  R sw/airborne/pprz_transport.h
  M sw/airborne/sd_card/main.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/datalink/audio_telemetry.h
  A sw/airborne/subsystems/datalink/datalink.h
  A sw/airborne/subsystems/datalink/downlink.c
  A sw/airborne/subsystems/datalink/downlink.h
  A sw/airborne/subsystems/datalink/downlink_transport.h
  A sw/airborne/subsystems/datalink/pprz_transport.c
  A sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  A sw/airborne/subsystems/datalink/xbee.c
  A sw/airborne/subsystems/datalink/xbee.h
  A sw/airborne/subsystems/datalink/xbee24.h
  A sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/subsystems/sensors/infrared.c
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/subsystems/settings.c
  M sw/airborne/sys_time.h
  M sw/airborne/test/ahrs/ahrs_on_synth.c
  M sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_adcs.c
  M sw/airborne/test/test_telemetry.c
  R sw/airborne/xbee.c
  R sw/airborne/xbee.h
  R sw/airborne/xbee24.h
  R sw/airborne/xbee868.h
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/page_settings.ml
  M sw/ground_segment/cockpit/saveSettings.ml
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/tmtc/messages.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/settings.ml
  M sw/in_progress/log_parser/09_05_13__14_38_13.log
  M sw/in_progress/python/attitude_viz.py
  R sw/lib/ocaml/ivy/Makefile
  R sw/lib/ocaml/ivy/README
  R sw/lib/ocaml/ivy/cglibivy.c
  R sw/lib/ocaml/ivy/civy.c
  R sw/lib/ocaml/ivy/civyloop.c
  R sw/lib/ocaml/ivy/ctkivy.c
  R sw/lib/ocaml/ivy/debian/changelog.3.10.2
  R sw/lib/ocaml/ivy/debian/changelog.3.11.2
  R sw/lib/ocaml/ivy/debian/compat
  R sw/lib/ocaml/ivy/debian/control
  R sw/lib/ocaml/ivy/debian/rules
  R sw/lib/ocaml/ivy/debian/shlibs.local
  R sw/lib/ocaml/ivy/examples/Makefile
  R sw/lib/ocaml/ivy/examples/glibivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyprobe.ml
  R sw/lib/ocaml/ivy/examples/tkivyprobe.ml
  R sw/lib/ocaml/ivy/glibIvy.ml
  R sw/lib/ocaml/ivy/glibIvy.mli
  R sw/lib/ocaml/ivy/ivy.ml
  R sw/lib/ocaml/ivy/ivy.mli
  R sw/lib/ocaml/ivy/ivyLoop.ml
  R sw/lib/ocaml/ivy/ivyLoop.mli
  R sw/lib/ocaml/ivy/tkIvy.ml
  R sw/lib/ocaml/ivy/tkIvy.mli
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/matlab_log/messages.xml
  M sw/simulator/flightModel.ml
  M sw/simulator/flight_gear.h
  M sw/simulator/sim.ml
  M sw/tools/gen_airframe.ml
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge branch 'dev' into positive_control_gains

Conflicts:
        conf/airframes/ENAC/fixed-wing/funjet2.xml
        conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
        conf/airframes/ENAC/fixed-wing/funjet2_new.xml
        conf/airframes/ENAC/fixed-wing/funjet3.xml
        conf/airframes/ENAC/fixed-wing/merlin.xml
        conf/airframes/ENAC/fixed-wing/minimag1.xml
        conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
        conf/airframes/ENAC/fixed-wing/overview.xml
        conf/airframes/ENAC/fixed-wing/soarzi.xml
        conf/airframes/ENAC/fixed-wing/weasel.xml
        conf/airframes/LAAS/mmlaas_N1.xml
        conf/airframes/LAAS/mmlaas_N2.xml
        conf/airframes/LAAS/mmlaas_N3.xml
        conf/airframes/Poine/funjet42.xml
        conf/airframes/Poine/swift_1.xml
        conf/airframes/TU_Delft/MicrojetBR.xml
        conf/airframes/delta_wing_minimal_example.xml
        conf/airframes/easystar_ets_example.xml
        conf/airframes/easystar_example.xml
        conf/airframes/example_twog_analogimu.xml
        conf/airframes/funjet_cam_example.xml
        conf/airframes/funjet_example.xml
        conf/airframes/mm/extra/press_t.xml
        conf/airframes/mm/extra/probe_t.xml
        conf/airframes/mm/extra/turbine_trigger.xml
        conf/airframes/mm/fixed-wing/drops.xml
        conf/airframes/mm/fixed-wing/funjet43.xml
        conf/airframes/mm/fixed-wing/funjetdca.xml
        conf/airframes/mm/fixed-wing/funjetdcb.xml
        conf/airframes/mm/fixed-wing/funjetdcc.xml
        conf/airframes/mm/fixed-wing/funjeteth1.xml
        conf/airframes/mm/fixed-wing/funjeteth2.xml
        conf/airframes/mm/fixed-wing/funjetfmi1.xml
        conf/airframes/mm/fixed-wing/funjetfmi2.xml
        conf/airframes/mm/fixed-wing/funjetfmi3.xml
        conf/airframes/mm/fixed-wing/funjetgfi1.xml
        conf/airframes/mm/fixed-wing/funjetgfi3.xml
        conf/airframes/mm/fixed-wing/funjetgfi4.xml
        conf/airframes/mm/fixed-wing/funjetgfi5.xml
        conf/airframes/mm/fixed-wing/funjetgfi6.xml
        conf/airframes/mm/fixed-wing/funjetgfi7.xml
        conf/airframes/mm/fixed-wing/funjetgfi8.xml
        conf/airframes/mm/fixed-wing/funjetgfi9.xml
        conf/airframes/mm/fixed-wing/funjetlisa.xml
        conf/airframes/mm/fixed-wing/funjetlisam.xml
        conf/airframes/mm/fixed-wing/funjetmm.xml
        conf/airframes/mm/fixed-wing/funjetmm2.xml
        conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
        conf/airframes/mm/fixed-wing/merlin.xml
        conf/airframes/mm/fixed-wing/miniwing.xml
        conf/airframes/mm/fixed-wing/slowfast.xml
        conf/airframes/mm/fixed-wing/slowfast2.xml
        conf/airframes/mm/fixed-wing/twinstarmm.xml
        conf/airframes/mm/hangar/black_one.xml
        conf/airframes/mm/hangar/glass_one1.xml
        conf/airframes/mm/hangar/glass_one2.xml
        conf/airframes/mm/hangar/glass_one3.xml
        conf/airframes/mm/hangar/lila.xml
        conf/airframes/mm/hangar/mac06a.xml
        conf/airframes/mm/hangar/red_one.xml
        conf/airframes/obsolete/easystar2.xml
        conf/airframes/obsolete/kalscott_easystar.xml
        conf/airframes/obsolete/microjet5_tp_auto.xml
        conf/airframes/obsolete/microjet6.xml
        conf/airframes/obsolete/microjetII.xml
        conf/airframes/obsolete/minimag1.xml
        conf/airframes/obsolete/minimag_fs.xml
        conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
        conf/airframes/obsolete/storm1.xml
        conf/airframes/obsolete/tiny2.xml
        conf/airframes/obsolete/xxx1.xml
        conf/airframes/test_hb.xml
        conf/airframes/twinstar_example.xml
        conf/airframes/usb_test.xml
        conf/settings/tuning_ctl_adaptive.xml
        sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c


Compare: https://github.com/paparazzi/paparazzi/compare/16f2034...dd15598

reply via email to

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