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

[noreply]

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

Commit: 2ba903b9e0df25fdd547e92ba656ae87edc9bc12
    
https://github.com/paparazzi/paparazzi/commit/2ba903b9e0df25fdd547e92ba656ae87edc9bc12
Author: Allen <address@hidden>
Date:   2011-01-14 (Fri, 14 Jan 2011)

Changed paths:
  M conf/airframes/AirborneCodeReorg/LisaFw.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  R conf/airframes/booz2_Aron.xml
  R conf/airframes/booz2_NoVa.xml
  R conf/airframes/booz2_NoVa_001.xml
  R conf/airframes/booz2_NoVa_002.xml
  R conf/airframes/booz2_s1.xml
  R conf/airframes/booz2_x1.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/rotor/qmk1.xml
  A conf/airframes/obsolete/booz2_Aron.xml
  A conf/airframes/obsolete/booz2_NoVa.xml
  A conf/airframes/obsolete/booz2_NoVa_001.xml
  A conf/airframes/obsolete/booz2_NoVa_002.xml
  A conf/airframes/obsolete/booz2_s1.xml
  A conf/airframes/obsolete/booz2_x1.xml
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/boards/classix.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/tiny_0.99.makefile
  M conf/boards/tiny_1.1.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/flight_plans/basic_booz.xml
  M conf/settings/tuning_ins.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/Makefile
  A sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  A sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.h
  R sw/airborne/booz/arch/lpc21/booz2_pwm_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_pwm_hw.h
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/gps.h
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/modules/cam_control/booz_cam.c
  M sw/airborne/modules/drop/booz_drop.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.h
  M sw/airborne/subsystems/imu/imu_analog.c
  M sw/airborne/subsystems/imu/imu_analog.h
  M sw/airborne/subsystems/ins/hf_float.c
  M sw/simulator/nps/nps_autopilot.h
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/simulator/nps/nps_fdm_jsbsim.c
  M sw/simulator/nps/nps_sensors_utils.c

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


Commit: fa401a4924e20759f8350ac4ea501ceab6f723a8
    
https://github.com/paparazzi/paparazzi/commit/fa401a4924e20759f8350ac4ea501ceab6f723a8
Author: Allen <address@hidden>
Date:   2011-01-14 (Fri, 14 Jan 2011)

Changed paths:
  M conf/boards/lisa_l_1.0.makefile

Log Message:
-----------
Fix lisa build with respect to gps