[paparazzi-commits] [paparazzi/paparazzi] 9ba1f6: Merge branch 'master' into dev

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 9ba1f61ff5ffd807fddf190d5b60d68b3c8a7206
      
https://github.com/paparazzi/paparazzi/commit/9ba1f61ff5ffd807fddf190d5b60d68b3c8a7206
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-12 (Sun, 12 Feb 2012)

  Changed paths:
    M sw/supervision/paparazzicenter.ml

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


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

  Changed paths:
    M conf/autopilot/lisa_test_progs.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  R sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  R sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
  M sw/airborne/test/ahrs/Makefile

  Log Message:
  -----------
  renamed ahrs_int_cmpl to ahrs_int_cmpl_quat


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

  Changed paths:
    M conf/airframes/flixr_discovery.xml
  M conf/autopilot/lisa_test_progs.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  A sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
  A sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
  R sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  R sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/test/ahrs/Makefile
  M sw/airborne/test/ahrs/run_ahrs_on_flight_log.c

  Log Message:
  -----------
  renamed ahrs_float_cmpl_rmat to ahrs_float_cmpl as it can be used with rmat 
or quat rotation representations


Compare: https://github.com/paparazzi/paparazzi/compare/7f72fcd...4bb8df6