[paparazzi-commits] [paparazzi/paparazzi] 89b552: Merge branch 'master' into arduimu

[noreply]

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

  Commit: 89b552eccf5bb27bfaefbe528324ca1f41fdd061
      
https://github.com/paparazzi/paparazzi/commit/89b552eccf5bb27bfaefbe528324ca1f41fdd061
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M conf/Makefile.lpc21
  A conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/microjet_example.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  A conf/maps.dtd
  A conf/maps.xml.example
  M conf/messages.xml
  A conf/modules/AOA_adc.xml
  A conf/modules/airspeed_amsys.xml
  A conf/modules/baro_amsys.xml
  A conf/modules/cam_segment.xml
  M conf/modules/digital_cam.xml
  A conf/modules/flight_benchmark.xml
  M conf/mtk.dtd
  A conf/settings/AOA_adc.xml
  A conf/settings/airspeed_amsys.xml
  A conf/settings/baro_amsys.xml
  M conf/settings/basic.xml
  A conf/settings/basic_infrared.xml
  A conf/settings/benchmark.xml
  M conf/settings/cam.xml
  M conf/settings/dc.xml
  M conf/settings/flight_params.xml
  R conf/settings/ins_basic.xml
  A conf/settings/ins_neutrals.xml
  M conf/settings/tuning.xml
  A conf/settings/tuning_infrared.xml
  M data/maps/Makefile
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/booz/test/booz2_tunnel.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  A sw/airborne/modules/benchmark/flight_benchmark.c
  A sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  A sw/airborne/modules/cam_control/cam_segment.c
  A sw/airborne/modules/cam_control/cam_segment.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/cam_control/point.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/ins/ins_module.h
  A sw/airborne/modules/sensors/AOA_adc.c
  A sw/airborne/modules/sensors/AOA_adc.h
  A sw/airborne/modules/sensors/airspeed_amsys.c
  A sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.c
  A sw/airborne/modules/sensors/baro_amsys.h
  M sw/airborne/obsolete/3dmg.c
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c
  M sw/airborne/print.h
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/ground_segment/cockpit/speech.ml
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/gm.ml
  A sw/lib/ocaml/maps_support.ml
  A sw/lib/ocaml/maps_support.mli
  M sw/lib/ocaml/os_calls.ml
  M sw/supervision/pc_common.ml
  M sw/tools/gen_flight_plan.ml

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