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

[GitHub]

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: ae606a13b28e6dad9893dc7120ae854c80a7582a
      
https://github.com/paparazzi/paparazzi/commit/ae606a13b28e6dad9893dc7120ae854c80a7582a
  Author: Christophe De Wagter <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M README
  M conf/Makefile.stm32
  A conf/airframes/CDW/ChimuJTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.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
  M conf/airframes/NoVa_L.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/h_hex.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/easy_glider_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/mm/extra/rctx.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.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
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/logger.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  R conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
  A conf/autopilot/subsystems/shared/imu_analog.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.0.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.5.makefile
  M conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  M conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  M conf/boards/classix.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/modules/baro_board.xml
  M conf/settings/tuning.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M data/pictures/penguin_logo.svg
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  R sw/airborne/anemotaxis.c
  R sw/airborne/anemotaxis.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_gps.c
  M sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/imu/imu_crista_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo_1.0.h
  M sw/airborne/boards/tiny_0.99.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/boards/tiny_2.0.h
  M sw/airborne/boards/tiny_2.1.h
  M sw/airborne/boards/tiny_sim.h
  M sw/airborne/boards/umarim_1.0.h
  R sw/airborne/chemotaxis.c
  R sw/airborne/chemotaxis.h
  M sw/airborne/commands.c
  M sw/airborne/commands.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/led.h
  M sw/airborne/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  M sw/airborne/modules/digital_cam/servo_cam_ctrl.h
  A sw/airborne/modules/enose/anemotaxis.c
  A sw/airborne/modules/enose/anemotaxis.h
  A sw/airborne/modules/enose/chemotaxis.c
  A sw/airborne/modules/enose/chemotaxis.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/ins.c
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/sys_time.h
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/lib/ocaml/ivy/Makefile
  M sw/simulator/flight_gear.h
  M sw/supervision/paparazzicenter.ml

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


  Commit: 639d8efbf0ca1b2ffdef2219d30e27a3eac346cd
      
https://github.com/paparazzi/paparazzi/commit/639d8efbf0ca1b2ffdef2219d30e27a3eac346cd
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_b2.h

  Log Message:
  -----------
  imu_b2: fix include directive


  Commit: 097efe4f805270f950c87a1af694ff3aa40daa0a
      
https://github.com/paparazzi/paparazzi/commit/097efe4f805270f950c87a1af694ff3aa40daa0a
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M sw/airborne/arch/lpc21/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h

  Log Message:
  -----------
  ppm arch: include sys_time.h for CPU_TICKS_OF_USEC


  Commit: d3d897d1713741f0a874d4d8f5554989cbc857be
      
https://github.com/paparazzi/paparazzi/commit/d3d897d1713741f0a874d4d8f5554989cbc857be
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  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
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c

  Log Message:
  -----------
  baro: define BOARD_HAS_BARO 1, hack to check if baro_board module is loaded 
via USE_BARO_AS_ALTIMETER


  Commit: 6bd4af45ceb57eacfdf966980bfe42af3f6809b6
      
https://github.com/paparazzi/paparazzi/commit/6bd4af45ceb57eacfdf966980bfe42af3f6809b6
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M Makefile
  M Makefile.ac
  M conf/Makefile.sim
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  M conf/conf.xml.example
  M conf/settings/settings_booz2_sim.xml
  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/stm32/subsystems/radio_control/ppm_arch.h
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  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
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/main.h
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/ground_segment/multimon/Makefile
  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/paparazzicenter.ml

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

Conflicts:
        Makefile


  Commit: ac392706260e7accfae2af21897d703a732a8c1a
      
https://github.com/paparazzi/paparazzi/commit/ac392706260e7accfae2af21897d703a732a8c1a
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M Makefile
  M sw/ext/Makefile

  Log Message:
  -----------
  Improved the clean target for better handling of sw/ext.


  Commit: fa58bbd571c3f3e315a868efc9d182df182e4813
      
https://github.com/paparazzi/paparazzi/commit/fa58bbd571c3f3e315a868efc9d182df182e4813
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M conf/airframes/CDW/debug_i2c.xml
  A conf/airframes/CDW/debug_i2c_lpc.xml
  M conf/autopilot/subsystems/shared/i2c_select.makefile
  M conf/modules/i2c_abuse_test.xml
  M conf/telemetry/telemetry_booz2.xml
  M doc/manual/style.dox
  M sw/airborne/arch/avr/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/sim/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.rewritten.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt1.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt2_nolib.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt3_subtra.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt4_nodouble_isr.c
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/modules/benchmark/i2c_abuse_test.c
  M sw/airborne/modules/benchmark/i2c_abuse_test.h

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

Conflicts:
        sw/airborne/firmwares/fixedwing/main_ap.c
        sw/airborne/firmwares/rotorcraft/telemetry.h


Compare: https://github.com/paparazzi/paparazzi/compare/078cfea...fa58bbd