[paparazzi-commits] [paparazzi/paparazzi] 5f55fa: Merge remote-tracking branch 'paparazzi/4.0_beta' ...

[GitHub]

  Branch: refs/heads/4.0_beta
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 5f55fadc58bbadabb2749c489c475349570b5015
      
https://github.com/paparazzi/paparazzi/commit/5f55fadc58bbadabb2749c489c475349570b5015
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M .gitignore
  M Makefile
  M conf/Makefile.sim
  M conf/Makefile.stm32
  M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  A conf/airframes/CDW/LisaAspirin2.xml
  M conf/airframes/CDW/debug_i2c.xml
  A conf/airframes/CDW/yapa3_aspirin2.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/ENAC/fixed-wing/weasel.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/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/LAAS/mmlaas_N1.xml
  M conf/airframes/LAAS/mmlaas_N2.xml
  M conf/airframes/LAAS/mmlaas_N3.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/funjet42.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/test_settings.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.xml
  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/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/delta_wing_minimal_example.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_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
  A conf/airframes/esden/lisa_m_2_asp_2_pwm.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/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.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/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.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/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.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/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/obsolete/booz2_Aron.xml
  M conf/airframes/obsolete/booz2_NoVa.xml
  M conf/airframes/obsolete/booz2_NoVa_001.xml
  M conf/airframes/obsolete/booz2_NoVa_002.xml
  M conf/airframes/obsolete/booz2_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/osam_xsens_twog.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  R conf/autopilot/lisa_l_test_progs.makefile
  R conf/autopilot/lisa_l_test_progs.xml
  R conf/autopilot/lisa_m_test_progs.makefile
  R conf/autopilot/lisa_m_test_progs.xml
  A conf/autopilot/lisa_test_progs.makefile
  A conf/autopilot/lisa_test_progs.xml
  M conf/autopilot/rotorcraft.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/imu_aspirin2_i2c.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v2.0.makefile
  A conf/boards/lisa_m_2.0.makefile
  M conf/conf.xml.example
  M conf/modules/ins_chimu_spi.xml
  M conf/modules/ins_chimu_uart.xml
  M conf/settings/fw_h_ctl_a_settings.xml
  M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M conf/settings/settings_booz2_sim.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  M doc/manual/style.dox
  M sw/airborne/arch/lpc21/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/sim/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/sim/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  A sw/airborne/arch/stm32/mcu_periph/spi_arch.c
  A sw/airborne/arch/stm32/mcu_periph/spi_arch.h
  M sw/airborne/arch/stm32/stm32f103rb_flash.ld
  M sw/airborne/arch/stm32/stm32f103re_flash.ld
  A sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.c
  A sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.h
  M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo_1.0.h
  M sw/airborne/boards/umarim_1.0.h
  R sw/airborne/booz/test/booz2_test_led.c
  R sw/airborne/booz/test/booz2_test_mc.c
  R sw/airborne/booz/test/booz2_test_modem.c
  R sw/airborne/booz/test/booz2_test_radio_control.c
  R sw/airborne/booz/test/booz2_test_rc.c
  R sw/airborne/booz/test/booz2_tunnel.c
  R sw/airborne/booz/test/booz2_tunnel_bb.c
  R sw/airborne/booz/test/booz_test_imu.c
  R sw/airborne/booz/test/booz_test_telemetry.c
  R sw/airborne/booz/test/imu_dummy.c
  R sw/airborne/booz/test/imu_dummy.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/main.h
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/stm_test_spi_link.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_mc.c
  M sw/airborne/lisa/test_periodic.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  R sw/airborne/lisa/test_uart.c
  A sw/airborne/lisa/test_uart_lisal.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/modules/cam_control/booz_cam.c
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h
  A sw/airborne/modules/ins/ins_chimu.h
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_xsens.c
  A sw/airborne/modules/sensors/imu_aspirin2.c
  A sw/airborne/modules/sensors/imu_aspirin2.h
  M sw/airborne/modules/sensors/imu_ppzuav.c
  A sw/airborne/peripherals/mpu60X0.h
  M sw/airborne/subsystems/ahrs.h
  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/subsystems/ahrs/ahrs_float_utils.h
  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/subsystems/ahrs/ahrs_int_utils.h
  A sw/airborne/subsystems/imu/imu_aspirin2.c
  A sw/airborne/subsystems/imu/imu_aspirin2.h
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/nav.c
  M sw/airborne/test/ahrs/Makefile
  M sw/airborne/test/ahrs/run_ahrs_on_flight_log.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_actuators.c
  M sw/airborne/test/test_adcs.c
  M sw/airborne/test/test_esc_asctecv1_simple.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_telemetry.c
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/include/std.h
  M sw/lib/ocaml/xml2h.ml
  M sw/simulator/nps/nps_autopilot.h
  R sw/simulator/nps/nps_autopilot_booz.c
  R sw/simulator/nps/nps_autopilot_booz.h
  A sw/simulator/nps/nps_autopilot_rotorcraft.c
  A sw/simulator/nps/nps_autopilot_rotorcraft.h
  M sw/simulator/nps/nps_main.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c
  M sw/simulator/sim_ac_jsbsim.h
  M sw/supervision/Makefile
  M sw/supervision/paparazzicenter.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/4.0_beta' into telemetry_settings