[paparazzi-commits] [paparazzi/paparazzi] dec406: Merge remote-tracking branch 'paparazzi/locm3' int...

[GitHub]

  Branch: refs/heads/spi_driver
  Home:   https://github.com/paparazzi/paparazzi
  Commit: dec40674f1bc9272dfaa70b161c25668084e0984
      
https://github.com/paparazzi/paparazzi/commit/dec40674f1bc9272dfaa70b161c25668084e0984
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

  Changed paths:
    M Makefile.ac
  M conf/airframes/CDW/LisaAspirin2.xml
  M conf/airframes/CDW/yapa3_aspirin2.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  A conf/airframes/esden/calib/asp21-000.xml
  A conf/airframes/esden/calib/asp21-default.xml
  M conf/airframes/esden/lisa_m_2_asp_2_pwm.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  A conf/airframes/mm/fixed-wing/trojan.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_quat.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/rotorcraft/ahrs_float_cmpl.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_quat.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/messages.xml
  M conf/radios/mc24r.xml
  R conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  R conf/settings/settings_booz2_jtm.xml
  M conf/telemetry/default_rotorcraft.xml
  M sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/my_debug_servo.h
  M sw/airborne/estimator.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/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/modules/sensors/imu_aspirin2.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/peripherals/adxl345.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
  M sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/test/ahrs/ahrs_on_synth.c
  M sw/airborne/test/ahrs/ahrs_on_synth.h
  M sw/ext/Makefile
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/supervision/pc_aircraft.ml
  M tests/LisaL/01_With_b2_v1.2.t
  M tests/LisaL/02_With_aspirin_v1.5_and_overo.t

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