[paparazzi-commits] [paparazzi/paparazzi] 76b745: Merge branch 'master' of github.com:paparazzi/papa...

[GitHub]

  Branch: refs/heads/aspirin2
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 76b745ff55cb6f89195e07415b4b18aadae2b215
      
https://github.com/paparazzi/paparazzi/commit/76b745ff55cb6f89195e07415b4b18aadae2b215
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M README
  A conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
  A conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  A conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
  A conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
  A conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_fw.xml
  A conf/airframes/TestHardware/LisaM_1.0_aspirin_v1.5_rc.xml
  A conf/airframes/TestHardware/Tiny_2.11_fw.xml
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/logger.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  A conf/autopilot/subsystems/shared/imu_analog.makefile
  M conf/modules/baro_board.xml
  M data/pictures/penguin_logo.svg
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.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/imu/imu_crista_arch.c
  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/subsystems/radio_control/spektrum_arch.c
  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/firmwares/logger/main_logger.c
  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/modules/digital_cam/servo_cam_ctrl.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/imu_ppzuav.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
  M sw/airborne/subsystems/imu/imu_aspirin.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/sys_time.h
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/supervision/paparazzicenter.ml

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi into aspirin2


  Commit: 90e1f517950aabca5c8f9f36a1c4c1f93059a818
      
https://github.com/paparazzi/paparazzi/commit/90e1f517950aabca5c8f9f36a1c4c1f93059a818
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

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

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


  Commit: 7828db130c0e021ab0cefb01af05dbd7d1db064c
      
https://github.com/paparazzi/paparazzi/commit/7828db130c0e021ab0cefb01af05dbd7d1db064c
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    M .gitignore
  M BUGS
  R README
  A README.md
  M conf/airframes/CDW/LisaAspirin2.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  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/Trip50B.xml
  R conf/airframes/TU_Delft/holiday50.xml
  R conf/airframes/TU_Delft/skywalker.xml
  R conf/airframes/TU_Delft/skywalkerfiber.xml
  R conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/logger_sd.xml
  M conf/airframes/microjet_example.xml
  M conf/autopilot/logger.makefile
  M conf/autopilot/rotorcraft.makefile
  R conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  A conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/shared/imu_navgo.makefile
  M conf/messages.xml
  R conf/modules/ins_xsens_MTiG_fixedwing.xml
  A conf/modules/openlog.xml
  R sw/README
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  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/firmwares/rotorcraft/stabilization.c
  M sw/airborne/firmwares/rotorcraft/stabilization.h
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
  A sw/airborne/math/Makefile
  A sw/airborne/math/README
  A sw/airborne/math/pprzmath.pc.in
  M sw/airborne/modules/digital_cam/dc.c
  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/peripherals/mcp355x.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/lib/ocaml/mapTrack.ml
  M sw/logalizer/Makefile
  A sw/logalizer/openlog2tlm.c
  M sw/logalizer/plotter.ml

  Log Message:
  -----------
  merged master into aspirin2


  Commit: cd8247589a08701d07fa9150d40f4ffde5db52f0
      
https://github.com/paparazzi/paparazzi/commit/cd8247589a08701d07fa9150d40f4ffde5db52f0
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    A conf/radios/R6107SP_7ch_xyz.xml

  Log Message:
  -----------
  positive commands: right-roll up right-yaw


  Commit: 4dba7e2f6fa5c64b7b81de53a6c19b9f8eeb7b7f
      
https://github.com/paparazzi/paparazzi/commit/4dba7e2f6fa5c64b7b81de53a6c19b9f8eeb7b7f
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    A conf/radios/R6107SP_7ch_xyz.xml

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


Compare: https://github.com/paparazzi/paparazzi/compare/76b745f^...4dba7e2