[paparazzi-commits] [paparazzi/paparazzi] 686a26: Merge branch 'master' into dev

[noreply]

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

  Commit: 686a26b35667d40911035d6252267427b12eb86f
      
https://github.com/paparazzi/paparazzi/commit/686a26b35667d40911035d6252267427b12eb86f
  Author: Felix Ruess <address@hidden>
  Date:   2011-11-24 (Thu, 24 Nov 2011)

  Changed paths:
    M conf/airframes/CDW/ChimuLisaFw.xml
  A conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/fixed-wing/drops.xml
  M conf/airframes/ENAC/fixed-wing/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/weasel.xml
  M conf/airframes/ENAC/malolo_sim.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  R conf/airframes/LAAS/mmlaas_N1_carto_cam.xml
  M conf/airframes/NoVa_L.xml
  R conf/airframes/PPZUAV/fixed-wing/kalscott_easystar.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  R conf/airframes/Paul/minimag1.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/Trip50B.xml
  M conf/airframes/TU_Delft/holiday50.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.xml
  A conf/airframes/obsolete/minimag1.xml
  A conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/test_i2c.xml
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_skiron.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  A conf/autopilot/subsystems/shared/i2c_select.makefile
  A conf/modules/airspeed_ads1114.xml
  M conf/modules/baro_board.xml
  M conf/modules/gps_ubx_ucenter.xml
  A conf/modules/i2c_abuse_test.xml
  M sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  A sw/airborne/modules/benchmark/i2c_abuse_test.c
  A sw/airborne/modules/benchmark/i2c_abuse_test.h
  M sw/airborne/modules/gps/gps_ubx_ucenter.c
  M sw/airborne/modules/gps/gps_ubx_ucenter.h
  M sw/airborne/modules/ins/ins_chimu_spi.c
  A sw/airborne/modules/sensors/airspeed_ads1114.c
  A sw/airborne/modules/sensors/airspeed_ads1114.h
  M sw/airborne/peripherals/ads1114.c
  M sw/airborne/peripherals/ads1114.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/tools/gen_aircraft.ml

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