[paparazzi-commits] [paparazzi/paparazzi] 0e7a39: Merge branch 'ahrs_infrared' into dev

[noreply]

  Branch: refs/heads/dev
  Home:   https://github.com/paparazzi/paparazzi

  Commit: 0e7a39deb284407685a4198d9ecf5d16648bbcb2
      
https://github.com/paparazzi/paparazzi/commit/0e7a39deb284407685a4198d9ecf5d16648bbcb2
  Author: Felix Ruess <address@hidden>
  Date:   2011-09-29 (Thu, 29 Sep 2011)

  Changed paths:
    M conf/airframes/CDW/LisaFw.xml
  M conf/airframes/CDW/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.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/Poine/funjet42.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.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/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/funjetgfi8.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/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/osam_xsens_twog.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/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_infrared.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/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared_i2c.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/modules/infrared_adc.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/subsystems/sensors/infrared_adc.c

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