[paparazzi-commits] [paparazzi/paparazzi] 3db636: Merge branch 'dev' into locm3

[GitHub]

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 3db6365ede44d789223fd01ba1589349d7be12da
      
https://github.com/paparazzi/paparazzi/commit/3db6365ede44d789223fd01ba1589349d7be12da
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-03-14 (Wed, 14 Mar 2012)

  Changed paths:
    M .gitignore
  M BUGS
  M Doxyfile
  M Makefile
  R Makefile.sys
  R README
  A README.md
  M conf/Makefile.lpc21
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/h_hex.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/skywalker.xml
  R conf/airframes/TU_Delft/skywalkerfiber.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/delta_wing_minimal_example.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/lisa_asctec.xml
  A conf/airframes/example_heli_lisam.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/logger_sd.xml
  A conf/airframes/logomatic.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  A conf/airframes/mm/extra/logger_sd_twog.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/lisa_test_progs.makefile
  M conf/autopilot/logger.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  A conf/autopilot/subsystems/fixedwing/gps_skytraq.makefile
  M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
  A 
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
  M conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile
  M conf/autopilot/subsystems/shared/imu_analog.makefile
  M conf/autopilot/subsystems/shared/imu_navgo.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/lisa_m_2.0.makefile
  A conf/boards/logom_2.6.makefile
  M conf/conf.xml.example
  M conf/messages.xml
  M conf/modules/demo_module.xml
  A conf/modules/nav_catapult.xml
  A conf/modules/openlog.xml
  M conf/modules/sonar_maxbotix_booz.xml
  A conf/radios/R6107SP_7ch_xyz.xml
  M conf/settings/tuning_ctl_new.xml
  M conf/settings/tuning_ins.xml
  A conf/settings/tuning_ins_chimu.xml
  R data/srtm/Makefile
  A data/srtm/srtm.data.bz2
  R paparazzi-make
  R sw/README
  M sw/airborne/Makefile
  M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
  M sw/airborne/arch/lpc21/peripherals/ms2100_arch.c
  M sw/airborne/arch/lpc21/peripherals/ms2100_arch.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/test/bootloader/Makefile
  M sw/airborne/arch/stm32/mcu_periph/spi_arch.h
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.c
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_b2_arch.c
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  A sw/airborne/boards/logom_2.6.h
  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/booz/test/Makefile
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_usb.c
  R sw/airborne/csc/arm7/props_csc.h
  R sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/mercury_csc_main.c
  R sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/main_stm32.c
  A sw/airborne/firmwares/beth/rcv_telemetry.c
  R sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/turntable_systime.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
  M sw/airborne/firmwares/rotorcraft/stabilization.c
  M sw/airborne/firmwares/rotorcraft/stabilization.h
  R sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  R sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint_int.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint_int.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h
  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.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  A sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/firmwares/tutorial/main_demo3.c
  M sw/airborne/firmwares/tutorial/main_demo4.c
  M sw/airborne/firmwares/tutorial/main_demo5.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  A sw/airborne/firmwares/vor/lo.h
  R sw/airborne/firmwares/vor/lo.h
  A sw/airborne/firmwares/vor/vor_int_demod_decim.c
  R sw/airborne/firmwares/vor/vor_int_demod_decim.c
  R sw/airborne/firmwares/vor/vor_int_demod_decim.h
  A sw/airborne/firmwares/vor/vor_int_demod_decim.h
  R sw/airborne/firmwares/vor/vor_int_filters_decim.h
  A sw/airborne/firmwares/vor/vor_int_filters_decim.h
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/fms/lpc_test_spi.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  A sw/airborne/math/Makefile
  A sw/airborne/math/README
  M sw/airborne/math/pprz_algebra_float.h
  A sw/airborne/math/pprzmath.pc.in
  M sw/airborne/mcu_periph/sys_time.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/led_cam_ctrl.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/nav/nav_catapult.c
  A sw/airborne/modules/nav/nav_catapult.h
  A sw/airborne/modules/openlog/openlog.c
  A sw/airborne/modules/openlog/openlog.h
  R sw/airborne/modules/sensors/airspeed_amsys.c
  A sw/airborne/modules/sensors/airspeed_amsys.c
  R sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.c
  R sw/airborne/modules/sensors/baro_amsys.c
  R sw/airborne/modules/sensors/baro_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.h
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/sd_card/main.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/gps/gps_mtk.h
  M sw/airborne/subsystems/gps/gps_nmea.c
  M sw/airborne/subsystems/gps/gps_nmea.h
  M sw/airborne/subsystems/gps/gps_sim.h
  M sw/airborne/subsystems/gps/gps_sim_nps.h
  M sw/airborne/subsystems/gps/gps_skytraq.c
  M sw/airborne/subsystems/gps/gps_skytraq.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/nav.c
  M sw/airborne/subsystems/nav.h
  M sw/airborne/subsystems/navigation/OSAMNav.c
  M sw/airborne/subsystems/navigation/discsurvey.c
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/live.mli
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/modem/Makefile
  M sw/ground_segment/multimon/Makefile
  M sw/in_progress/button/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/http.ml
  M sw/lib/ocaml/mapCanvas.ml
  M sw/lib/ocaml/mapTrack.ml
  M sw/lib/ocaml/srtm.ml
  M sw/lib/ocaml/srtm.mli
  M sw/logalizer/Makefile
  A sw/logalizer/openlog2tlm.c
  M sw/logalizer/plotter.ml
  M sw/simulator/old_booz/tests/Makefile
  M sw/tools/Makefile
  A sw/tools/gen_srtm.ml

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

Conflicts:
        sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
        sw/airborne/arch/stm32/mcu_periph/spi_arch.c


  Commit: 7dcfb841eed777cca6123ae184acfca8559daa71
      
https://github.com/paparazzi/paparazzi/commit/7dcfb841eed777cca6123ae184acfca8559daa71
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M conf/airframes/esden/lisa_m_2_asp_2_pwm.xml
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h

  Log Message:
  -----------
  Post dev branch merge cleanups. lisa_m_2_asp_2_pwm should (TM) work now again.


Compare: https://github.com/paparazzi/paparazzi/compare/b92337f...7dcfb84