[paparazzi-commits] [paparazzi/paparazzi] 421990: Merge branch 'dev' of github.com:paparazzi/paparaz...

[GitHub]

  Branch: refs/heads/hardware_test
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 421990134cd448c3944921ab69861b75b16492a0
      
https://github.com/paparazzi/paparazzi/commit/421990134cd448c3944921ab69861b75b16492a0
  Author: Bernard Davison <address@hidden>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M .gitignore
  M BUGS
  R conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  R conf/airframes/TU_Delft/MicrojetBR.xml
  R conf/airframes/TU_Delft/MicrojetBRimu.xml
  R conf/airframes/TU_Delft/MicrojetCDW.xml
  R conf/airframes/TU_Delft/Trip50A.xml
  R conf/airframes/TU_Delft/skywalker.xml
  R conf/airframes/TU_Delft/skywalkerfiber.xml
  A conf/airframes/example_heli_lisam.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/logger_sd.xml
  M conf/airframes/microjet_example.xml
  M conf/autopilot/logger.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
  A 
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
  M conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile
  M conf/messages.xml
  A conf/modules/openlog.xml
  A conf/radios/R6107SP_7ch_xyz.xml
  R sw/README
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/boards/lisa_l/baro_board.c
  R sw/airborne/csc/arm7/props_csc.h
  R sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/mercury_csc_main.c
  R sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/stabilization.c
  M sw/airborne/firmwares/rotorcraft/stabilization.h
  R sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  R sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint_int.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint_int.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
  M sw/airborne/mcu_periph/sys_time.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/led_cam_ctrl.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/openlog/openlog.c
  A sw/airborne/modules/openlog/openlog.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/logalizer/Makefile
  A sw/logalizer/openlog2tlm.c

  Log Message:
  -----------
  Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test