paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] b4455d: STM32 makefile edited;


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] b4455d: STM32 makefile edited; changed default LOCM3 repo ...
Date: Tue, 04 Jun 2013 10:39:45 -0700

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: b4455dbdeb63334ed45233a32e148e4df68d119a
      
https://github.com/paparazzi/paparazzi/commit/b4455dbdeb63334ed45233a32e148e4df68d119a
  Author: softsr <address@hidden>
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
    M .gitmodules
    M conf/Makefile.stm32
    M sw/ext/libopencm3

  Log Message:
  -----------
  STM32 makefile edited; changed default LOCM3 repo to softsr


  Commit: 1f422be6ac113c57c433033fae09e8aee78d8208
      
https://github.com/paparazzi/paparazzi/commit/1f422be6ac113c57c433033fae09e8aee78d8208
  Author: softsr <address@hidden>
  Date:   2013-01-13 (Sun, 13 Jan 2013)

  Changed paths:
    A conf/airframes/krooz_1_0_quad_mkk.xml
    A conf/boards/f4disco.makefile
    A conf/boards/krooz_1.0.makefile
    A conf/boards/krooz_1.0_work.makefile
    A conf/firmwares/krooz_test_progs.makefile
    A conf/firmwares/subsystems/shared/imu_krooz_v1.0.makefile
    A conf/modules/beeper.xml
    A conf/modules/booz_cam.xml
    A conf/modules/booz_drop.xml
    A conf/modules/booz_extra_dl.xml
    A conf/modules/booz_pwm.xml
    A conf/modules/cam_power.xml
    A conf/modules/ins_chimu_spi.xml
    A conf/modules/ins_chimu_uart.xml
    A conf/modules/ins_osam_ugear.xml
    A conf/modules/krooz_cam.xml
    A conf/modules/sonar_srf02.xml
    A conf/modules/twog_cam.xml
    A conf/modules/xbee_init.xml
    A sw/airborne/boards/f4disco_1.0.h
    A sw/airborne/boards/krooz/baro_board.c
    A sw/airborne/boards/krooz/baro_board.h
    A sw/airborne/boards/krooz/test_baro.c
    A sw/airborne/boards/krooz_1.0.h
    A sw/airborne/modules/beeper/beeper.c
    A sw/airborne/modules/beeper/beeper.h
    A sw/airborne/modules/cam_control/booz_cam.c
    A sw/airborne/modules/cam_control/booz_cam.h
    A sw/airborne/modules/cam_control/cam_power.c
    A sw/airborne/modules/cam_control/cam_power.h
    A sw/airborne/modules/cam_control/krooz_cam.c
    A sw/airborne/modules/cam_control/krooz_cam.h
    A sw/airborne/modules/cam_control/twog_cam.c
    A sw/airborne/modules/cam_control/twog_cam.h
    A sw/airborne/modules/xbee/xbee_init.c
    A sw/airborne/modules/xbee/xbee_init.h
    A sw/airborne/subsystems/imu/imu_krooz1.c
    A sw/airborne/subsystems/imu/imu_krooz1.h

  Log Message:
  -----------
  Begin of merging with the actual paparazzi master branch


  Commit: 7a344e0cac2be61d96e71d18c41bd6289357015c
      
https://github.com/paparazzi/paparazzi/commit/7a344e0cac2be61d96e71d18c41bd6289357015c
  Author: softsr <address@hidden>
  Date:   2013-01-14 (Mon, 14 Jan 2013)

  Changed paths:
    M conf/airframes/krooz_1_0_quad_mkk.xml
    A sw/airborne/arch/stm32/krooz.ld
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    A sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
    R sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    R sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    A sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    A sw/airborne/arch/stm32/subsystems/settings_arch.h
    R sw/airborne/arch/stm32/subsystems/settings_arch.h
    M sw/airborne/modules/cam_control/krooz_cam.c

  Log Message:
  -----------
  A big step forward in merging Krooz in the master branch


  Commit: 80188adeb3c7d4a3f791d73bbff8d94dd0e84556
      
https://github.com/paparazzi/paparazzi/commit/80188adeb3c7d4a3f791d73bbff8d94dd0e84556
  Author: softsr <address@hidden>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M conf/airframes/krooz_1_0_quad_mkk.xml
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    R sw/airborne/firmwares/rotorcraft/main.c
    A sw/airborne/firmwares/rotorcraft/main.c

  Log Message:
  -----------
  Krooz firmware: first working version; testing...


  Commit: 8ccae563ad12a6351a5ddeb9320a656fe2e34fd1
      
https://github.com/paparazzi/paparazzi/commit/8ccae563ad12a6351a5ddeb9320a656fe2e34fd1
  Author: softsr <address@hidden>
  Date:   2013-01-17 (Thu, 17 Jan 2013)

  Changed paths:
    M conf/Makefile.stm32
    A conf/radios/mx-16.xml
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    A sw/tools/dfu/stm32_f4_mem.py

  Log Message:
  -----------
  Upload works now for Krooz. Testing flight settigs...


  Commit: ccc75eecfcd36ab2f0d09fe25c161529a0636793
      
https://github.com/paparazzi/paparazzi/commit/ccc75eecfcd36ab2f0d09fe25c161529a0636793
  Author: softsr <address@hidden>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    A conf/airframes/krooz_1_0_quad_pwm.xml
    M conf/conf.xml.example
    M sw/tools/dfu/stm32_f4_mem.py

  Log Message:
  -----------
  Krooz example added to A/C setup; changed stm32_f4_mem uploading behaviour


  Commit: 0b6e14218308373a76d531c59262685fee3ecfd5
      
https://github.com/paparazzi/paparazzi/commit/0b6e14218308373a76d531c59262685fee3ecfd5
  Author: softsr <address@hidden>
  Date:   2013-01-26 (Sat, 26 Jan 2013)

  Changed paths:
    R conf/airframes/krooz_1_0_quad_mkk.xml
    M conf/airframes/krooz_1_0_quad_pwm.xml
    M conf/conf.xml.example

  Log Message:
  -----------
  Small syntax change


  Commit: ac85a2f2604c4c82563c346ec27d805ba22e387f
      
https://github.com/paparazzi/paparazzi/commit/ac85a2f2604c4c82563c346ec27d805ba22e387f
  Author: softsr <address@hidden>
  Date:   2013-01-27 (Sun, 27 Jan 2013)

  Changed paths:
    M .gitignore
    M Doxyfile
    M Makefile
    M Makefile.ac
    M Makefile.install
    M conf/Makefile.arm-common
    M conf/Makefile.geode
    M conf/Makefile.jsbsim
    M conf/Makefile.lpc21
    M conf/Makefile.nps
    M conf/Makefile.omap
    M conf/Makefile.pentium-m
    M conf/Makefile.sim
    M conf/Makefile.stm32
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/conf.xml.example
    M conf/control_panel.xml.example
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_extern_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    R conf/firmwares/subsystems/shared/i2c_select.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    M conf/firmwares/subsystems/shared/imu_b2_common.makefile
    A conf/firmwares/subsystems/shared/imu_um6.makefile
    M conf/firmwares/subsystems/shared/spi.makefile
    M conf/messages.xml
    M conf/modules/baro_amsys.xml
    A conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M conf/simulator/jsbsim/aircraft/Quad_LisaM_2.xml
    A conf/simulator/jsbsim/aircraft/fraser.xml
    M conf/telemetry/default_rotorcraft.xml
    R src/launchsitl
    M sw/airborne/Makefile
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_arch.old.c
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_arch.very_old.c
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt1.c
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt2_nolib.c
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt3_subtra.c
    R sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt4_nodouble_isr.c
    R sw/airborne/boards/lisa_l/test_baro.c
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.h
    A sw/airborne/boards/lisa_m/baro_board_i2c.c
    A sw/airborne/boards/lisa_m/baro_board_spi.c
    R sw/airborne/boards/lisa_m/test_baro.c
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/fixedwing/autopilot.h
    M sw/airborne/firmwares/fixedwing/datalink.c
    M sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/guidance/guidance_common.h
    M sw/airborne/firmwares/fixedwing/main.c
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_ap.h
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/fixedwing/main_fbw.h
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/fms/Makefile
    A sw/airborne/lisa/test_baro.c
    M sw/airborne/peripherals/ms5611.h
    M sw/airborne/state.h
    M sw/airborne/subsystems/actuators/motor_mixing.c
    M sw/airborne/subsystems/ahrs.c
    M sw/airborne/subsystems/ahrs.h
    M sw/airborne/subsystems/ahrs/ahrs_aligner.c
    M sw/airborne/subsystems/ahrs/ahrs_aligner.h
    A sw/airborne/subsystems/ahrs/ahrs_extern_quat.c
    A sw/airborne/subsystems/ahrs/ahrs_extern_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.h
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm_algebra.h
    M sw/airborne/subsystems/ahrs/ahrs_float_ekf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_lkf.h
    M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
    M sw/airborne/subsystems/ahrs/ahrs_infrared.c
    M sw/airborne/subsystems/ahrs/ahrs_infrared.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_int_utils.h
    M sw/airborne/subsystems/ahrs/ahrs_magnetic_field_model.h
    M sw/airborne/subsystems/ahrs/ahrs_sim.c
    M sw/airborne/subsystems/ahrs/ahrs_sim.h
    M sw/airborne/subsystems/electrical.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu.h
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    A sw/airborne/subsystems/imu/imu_um6.c
    A sw/airborne/subsystems/imu/imu_um6.h
    M sw/airborne/subsystems/ins.c
    M sw/airborne/subsystems/ins.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/hf_float.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_gps_passthrough.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    M sw/airborne/subsystems/ins/ins_int_extended.c
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_extended_float.h
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/ins/vf_float.h
    M sw/airborne/subsystems/ins/vf_int.c
    M sw/airborne/subsystems/ins/vf_int.h
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/navigation/bomb.c
    M sw/airborne/subsystems/navigation/bomb.h
    M sw/airborne/subsystems/navigation/border_line.c
    M sw/airborne/subsystems/navigation/border_line.h
    M sw/airborne/subsystems/navigation/common_flight_plan.c
    M sw/airborne/subsystems/navigation/common_flight_plan.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/common_nav.h
    M sw/airborne/subsystems/navigation/discsurvey.c
    M sw/airborne/subsystems/navigation/discsurvey.h
    M sw/airborne/subsystems/navigation/flightzone.c
    M sw/airborne/subsystems/navigation/flightzone.h
    M sw/airborne/subsystems/navigation/gls.c
    M sw/airborne/subsystems/navigation/gls.h
    M sw/airborne/subsystems/navigation/nav_cube.c
    M sw/airborne/subsystems/navigation/nav_cube.h
    M sw/airborne/subsystems/navigation/nav_line.c
    M sw/airborne/subsystems/navigation/nav_line.h
    M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
    M sw/airborne/subsystems/navigation/nav_survey_rectangle.h
    M sw/airborne/subsystems/navigation/poly_survey_adv.c
    M sw/airborne/subsystems/navigation/poly_survey_adv.h
    M sw/airborne/subsystems/navigation/snav.c
    M sw/airborne/subsystems/navigation/snav.h
    M sw/airborne/subsystems/navigation/spiral.c
    M sw/airborne/subsystems/navigation/spiral.h
    M sw/airborne/subsystems/navigation/traffic_info.c
    M sw/airborne/subsystems/navigation/traffic_info.h
    M sw/airborne/test/ahrs/Makefile
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/live.mli
    M sw/lib/ocaml/gtk_tools.ml
    M sw/lib/ocaml/gtk_tools.mli
    M sw/simulator/Makefile
    A sw/simulator/launchsitl
    M sw/simulator/nps/nps_flightgear.c
    M sw/simulator/nps/nps_flightgear.h
    M sw/simulator/nps/nps_ivy.c
    M sw/simulator/nps/nps_ivy.h
    M sw/simulator/nps/nps_main.c
    M sw/simulator/nps/nps_radio_control_joystick.c
    A sw/simulator/pprzsim-launch
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_control_panel.ml
    A sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/gen_aircraft.ml
    M tests/sim/01_Microjet.t

  Log Message:
  -----------
  Merged last changes from paparazzi/master


  Commit: 6ad46faffd247b87cffc3d8f87867b5f2dc5ddd7
      
https://github.com/paparazzi/paparazzi/commit/6ad46faffd247b87cffc3d8f87867b5f2dc5ddd7
  Author: softsr <address@hidden>
  Date:   2013-01-27 (Sun, 27 Jan 2013)

  Changed paths:
    M .gitignore
    A conf/Makefile.arm-common
    R conf/Makefile.arm-common
    M conf/Makefile.stm32
    M conf/airframes/krooz_1_0_quad_pwm.xml
    M conf/conf.xml.example
    M conf/firmwares/rotorcraft.makefile
    A conf/flight_plans/rotorcraft_krooz.xml
    M sw/airborne/boards/krooz/baro_board.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    A sw/airborne/firmwares/rotorcraft/autopilot_fp_block_switch.h
    M sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    R sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/subsystems/electrical.c
    M sw/airborne/subsystems/electrical.h
    M sw/airborne/subsystems/gps.h
    M sw/airborne/subsystems/imu/imu_krooz1.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/navigation/common_flight_plan.c
    M sw/airborne/subsystems/navigation/common_flight_plan.h
    M sw/tools/dfu/stm32_f4_mem.py
    M sw/tools/gen_radio.ml

  Log Message:
  -----------
  Lots of changes, latest version


  Commit: 00790cdc2141fdfeb9d36fe50b92e14b55a0bc0d
      
https://github.com/paparazzi/paparazzi/commit/00790cdc2141fdfeb9d36fe50b92e14b55a0bc0d
  Author: softsr <address@hidden>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    A conf/airframes/krooz_1_0_quad_mkk.xml
    M conf/firmwares/subsystems/shared/actuators_mkk.makefile
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/subsystems/imu/imu_krooz1.h

  Log Message:
  -----------
  Some cosmetic changes; added mkk exaple setup file


  Commit: 952d5930d392e65ca86edadecb275ddb72a5aecd
      
https://github.com/paparazzi/paparazzi/commit/952d5930d392e65ca86edadecb275ddb72a5aecd
  Author: softsr <address@hidden>
  Date:   2013-02-06 (Wed, 06 Feb 2013)

  Changed paths:
    M conf/flight_plans/rotorcraft_krooz.xml

  Log Message:
  -----------
  Corrected the Krooz flight plan example


  Commit: a0b6b58fbc15587093bba67f72a32e66f01dea7f
      
https://github.com/paparazzi/paparazzi/commit/a0b6b58fbc15587093bba67f72a32e66f01dea7f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-13 (Wed, 13 Mar 2013)

  Changed paths:
    M conf/Makefile.stm32
    A conf/boards/apogee_0.99.makefile
    A sw/airborne/boards/apogee_0.99.h

  Log Message:
  -----------
  [stm32f4] start creating new board apogee


  Commit: 79848bb0fb06e4cb181a300415d28c310e4dd6fd
      
https://github.com/paparazzi/paparazzi/commit/79848bb0fb06e4cb181a300415d28c310e4dd6fd
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M sw/airborne/arch/stm32/led_hw.h

  Log Message:
  -----------
  [led] update led for f4


  Commit: a9ebde1bdb8e10458258935bd4493720f7147c80
      
https://github.com/paparazzi/paparazzi/commit/a9ebde1bdb8e10458258935bd4493720f7147c80
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M conf/boards/apogee_0.99.makefile
    M sw/airborne/boards/apogee_0.99.h

  Log Message:
  -----------
  [board] board config file


  Commit: 90a034841fedc9041b19d2306ce1b0b2e140f218
      
https://github.com/paparazzi/paparazzi/commit/90a034841fedc9041b19d2306ce1b0b2e140f218
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c

  Log Message:
  -----------
  Merge remote-tracking branch 'sergey/krooz_port' into stm32f4

Conflicts:
        sw/airborne/arch/stm32/led_hw.h
        sw/airborne/arch/stm32/mcu_arch.c
        sw/airborne/arch/stm32/mcu_periph/adc_arch.c
        sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
        sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
        sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
        sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
        sw/airborne/subsystems/electrical.h
        sw/ext/libopencm3
        sw/simulator/launchsitl


  Commit: 10c500c32d2fd92424f4bc764e63b3ccdbe56fdd
      
https://github.com/paparazzi/paparazzi/commit/10c500c32d2fd92424f4bc764e63b3ccdbe56fdd
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-14 (Thu, 14 Mar 2013)

  Changed paths:
    A sw/airborne/arch/stm32/apogee.ld

  Log Message:
  -----------
  add apoge linker script


  Commit: 42dc70933e2667bb42dc3367725c6454ae4ff0ed
      
https://github.com/paparazzi/paparazzi/commit/42dc70933e2667bb42dc3367725c6454ae4ff0ed
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-15 (Fri, 15 Mar 2013)

  Changed paths:
    M conf/boards/apogee_0.99.makefile
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    M sw/airborne/boards/apogee_0.99.h

  Log Message:
  -----------
  [stm32f4] some header cleaning


  Commit: 0aa9d1ecc4e5de5f0b5db5e3dc7ea11dbe2b67cd
      
https://github.com/paparazzi/paparazzi/commit/0aa9d1ecc4e5de5f0b5db5e3dc7ea11dbe2b67cd
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-16 (Sat, 16 Mar 2013)

  Changed paths:
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  [dfu] add address option


  Commit: 9d23545a8e81167a32ac037c3f73ecc323b9d59b
      
https://github.com/paparazzi/paparazzi/commit/9d23545a8e81167a32ac037c3f73ecc323b9d59b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    R Makefile.install
    R conf/Makefile.avr
    M conf/Makefile.sim
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/examples/microjet_lisa_m.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
    A conf/firmwares/subsystems/rotorcraft/stabilization_float_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/shared/imu_navgo.makefile
    M conf/gps/Makefile
    M conf/messages.xml
    M conf/modules/airspeed_otf.xml
    M conf/radios/Corona_24_DIY.xml
    M conf/settings/rotorcraft_basic.xml
    A conf/system/launcher/Paparazzi.desktop
    A conf/system/launcher/logo.png
    A conf/system/launcher/readme.txt
    M conf/system/udev/rules/50-paparazzi.rules
    M data/maps/Makefile
    R debian/changelog.etch
    R debian/changelog.hardy
    R debian/changelog.lenny
    R debian/changelog.sarge
    R debian/changelog.sid
    R debian/changelog.squeeze
    R debian/compat
    R debian/control.etch
    R debian/control.hardy
    R debian/control.lenny
    R debian/control.sarge
    R debian/control.sid
    R debian/control.squeeze
    R debian/paparazzi-bin.postinst
    R debian/paparazzi-bin.prerm
    R debian/paparazzi.desktop
    R debian/rules
    R debian/shlibs.local
    M doc/ccc07/Makefile
    M doc/pprz_algebra/Makefile
    M doc/pprz_geodetic/Makefile
    A sw/Makefile.ocaml
    M sw/airborne/Makefile
    R sw/airborne/arch/avr/ahrs_asm.S
    R sw/airborne/arch/avr/ant_h_bridge.c
    R sw/airborne/arch/avr/ant_h_bridge.h
    R sw/airborne/arch/avr/ant_servo.c
    R sw/airborne/arch/avr/ant_servo.h
    R sw/airborne/arch/avr/ant_spi.c
    R sw/airborne/arch/avr/ant_spi.h
    R sw/airborne/arch/avr/ant_tracker.c
    R sw/airborne/arch/avr/ant_tracker.h
    R sw/airborne/arch/avr/ant_v2x.c
    R sw/airborne/arch/avr/ant_v2x.h
    R sw/airborne/arch/avr/dc_mc_link.c
    R sw/airborne/arch/avr/dc_mc_link.h
    R sw/airborne/arch/avr/dc_mc_power.c
    R sw/airborne/arch/avr/dc_mc_power.h
    R sw/airborne/arch/avr/gpio.h
    R sw/airborne/arch/avr/interrupt_hw.h
    R sw/airborne/arch/avr/led_hw.h
    R sw/airborne/arch/avr/link_mcu_hw.h
    R sw/airborne/arch/avr/mcu_periph/adc_arch.c
    R sw/airborne/arch/avr/mcu_periph/adc_arch.h
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.c
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.h
    R sw/airborne/arch/avr/mcu_periph/spi_arch.c
    R sw/airborne/arch/avr/mcu_periph/spi_arch.h
    R sw/airborne/arch/avr/mcu_periph/uart_arch.c
    R sw/airborne/arch/avr/mcu_periph/uart_arch.h
    R sw/airborne/arch/avr/ppm_hw.c
    R sw/airborne/arch/avr/ppm_hw.h
    R sw/airborne/arch/avr/servos_4017.c
    R sw/airborne/arch/avr/servos_4017.h
    R sw/airborne/arch/avr/servos_direct_hw.c
    R sw/airborne/arch/avr/servos_direct_hw.h
    R sw/airborne/arch/avr/servos_esc_hw.c
    R sw/airborne/arch/avr/servos_esc_hw.h
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
    R sw/airborne/arch/avr/sys_time_hw.c
    R sw/airborne/arch/avr/sys_time_hw.h
    R sw/airborne/arch/avr/uart_tunnel.c
    M sw/airborne/arch/lpc21/lpcusb/examples/Makefile
    M sw/airborne/arch/lpc21/test/bootloader/Makefile
    M sw/airborne/arch/sim/ivy_transport.h
    M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
    M sw/airborne/boards/navgo/imu_navgo.c
    M sw/airborne/booz/test/Makefile
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/non_ap/led_flasher/Makefile
    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
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/firmwares/vor/Makefile
    M sw/airborne/fms/Makefile
    M sw/airborne/fms/libeknav/Makefile
    M sw/airborne/math/Makefile
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/i2c.h
    M sw/airborne/modules/config/config_mkk_v2.h
    M sw/airborne/modules/gain_scheduling/gain_scheduling.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/ir_mlx.h
    M sw/airborne/modules/optical_flow/px4flow.c
    M sw/airborne/modules/sensors/met_module.h
    A sw/airborne/peripherals/l3g4200.c
    A sw/airborne/peripherals/l3g4200.h
    A sw/airborne/peripherals/l3g4200_regs.h
    M sw/airborne/peripherals/ms5611.h
    M sw/airborne/state.h
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_sim.c
    M sw/airborne/test/Makefile
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/compass.ml
    M sw/ground_segment/cockpit/editFP.ml
    M sw/ground_segment/cockpit/gcs.ml
    M sw/ground_segment/cockpit/horizon.ml
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/map2d.ml
    M sw/ground_segment/cockpit/page_settings.ml
    M sw/ground_segment/cockpit/pages.ml
    M sw/ground_segment/cockpit/papgets.ml
    M sw/ground_segment/cockpit/particules.ml
    M sw/ground_segment/cockpit/saveSettings.ml
    M sw/ground_segment/cockpit/sectors.ml
    M sw/ground_segment/cockpit/speech.ml
    M sw/ground_segment/cockpit/strip.ml
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/misc/Makefile
    M sw/ground_segment/misc/davis2ivy.c
    R sw/ground_segment/modem/Makefile
    R sw/ground_segment/modem/README
    R sw/ground_segment/modem/adc.c
    R sw/ground_segment/modem/adc.h
    R sw/ground_segment/modem/link_tmtc.h
    R sw/ground_segment/modem/main.c
    R sw/ground_segment/modem/soft_uart.c
    R sw/ground_segment/modem/soft_uart.h
    R sw/ground_segment/modem/timer.h
    R sw/ground_segment/modem/uart.c
    R sw/ground_segment/modem/uart.h
    M sw/ground_segment/multimon/Makefile
    M sw/ground_segment/multimon/test_gen_hdlc.ml
    M sw/ground_segment/python/log_annotate.py
    M sw/ground_segment/python/messages_app/messagesframe.py
    M sw/ground_segment/python/onboard_log_transform.py
    M sw/ground_segment/python/real_time_plot/messagepicker.py
    M sw/ground_segment/python/real_time_plot/plotframe.py
    M sw/ground_segment/python/real_time_plot/plotpanel.py
    M sw/ground_segment/python/real_time_plot/realtimeplotapp.py
    M sw/ground_segment/python/real_time_plot/textdroptarget.py
    M sw/ground_segment/python/settings_app/settingsapp.py
    M sw/ground_segment/python/settings_app/settingsframe.py
    M sw/ground_segment/tmtc/150m.ml
    M sw/ground_segment/tmtc/GSM/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/ground_segment/tmtc/aircraft.ml
    M sw/ground_segment/tmtc/airprox.ml
    M sw/ground_segment/tmtc/broadcaster.ml
    M sw/ground_segment/tmtc/dia.ml
    M sw/ground_segment/tmtc/diadec.ml
    M sw/ground_segment/tmtc/fw_server.ml
    M sw/ground_segment/tmtc/ihm.ml
    M sw/ground_segment/tmtc/ivy2udp.ml
    M sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
    M sw/ground_segment/tmtc/ivy_tcp_controller.ml
    M sw/ground_segment/tmtc/kml.ml
    M sw/ground_segment/tmtc/link.ml
    M sw/ground_segment/tmtc/messages.ml
    M sw/ground_segment/tmtc/modem.ml
    M sw/ground_segment/tmtc/rotorcraft_server.ml
    M sw/ground_segment/tmtc/server.ml
    M sw/ground_segment/tmtc/server_globals.ml
    M sw/ground_segment/tmtc/settings.ml
    M sw/ground_segment/tmtc/stereo_demod.ml
    M sw/ground_segment/tmtc/wind.ml
    M sw/in_progress/button/Makefile
    M sw/in_progress/fdm/Makefile
    M sw/in_progress/inertial/C/Makefile
    M sw/in_progress/ir_calibration/Makefile
    M sw/in_progress/ir_usb_i2c/Makefile
    M sw/in_progress/log_parser/Makefile
    M sw/in_progress/motor_bench/Makefile
    M sw/in_progress/satcom/Makefile
    M sw/in_progress/turbine/Makefile
    M sw/in_progress/wind_tunnel/Makefile
    A sw/lib/ocaml/META.pprz.deb
    A sw/lib/ocaml/META.pprz.osx
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/base64.ml
    M sw/lib/ocaml/debug.ml
    M sw/lib/ocaml/defivybus.ml
    M sw/lib/ocaml/editAirframe.ml
    M sw/lib/ocaml/env.ml
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/extXml.ml
    M sw/lib/ocaml/fig.ml
    M sw/lib/ocaml/geometry_2d.ml
    M sw/lib/ocaml/geometry_3d.ml
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/gm.mli
    M sw/lib/ocaml/gtk_3d.ml
    M sw/lib/ocaml/gtk_draw.ml
    M sw/lib/ocaml/gtk_image.ml
    M sw/lib/ocaml/gtk_tools.ml
    M sw/lib/ocaml/gtk_tools.mli
    M sw/lib/ocaml/gtk_tools_GL.ml
    M sw/lib/ocaml/gtk_tools_icons.ml
    M sw/lib/ocaml/gtkgl_Hack.ml
    M sw/lib/ocaml/http.ml
    M sw/lib/ocaml/iGN.ml
    M sw/lib/ocaml/latlong.ml
    M sw/lib/ocaml/logpprz.ml
    M sw/lib/ocaml/mapCanvas.ml
    M sw/lib/ocaml/mapCanvas.mli
    M sw/lib/ocaml/mapFP.ml
    M sw/lib/ocaml/mapGoogle.ml
    M sw/lib/ocaml/mapGoogle.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/ocaml_tools.ml
    M sw/lib/ocaml/os_calls.ml
    M sw/lib/ocaml/papget.ml
    M sw/lib/ocaml/papget_common.ml
    M sw/lib/ocaml/papget_renderer.ml
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/serial.ml
    M sw/lib/ocaml/srtm.ml
    M sw/lib/ocaml/ubx.ml
    M sw/lib/ocaml/wind_sock.ml
    M sw/lib/ocaml/xbee.ml
    M sw/lib/ocaml/xml2h.ml
    M sw/lib/ocaml/xmlCom.ml
    M sw/lib/ocaml/xmlEdit.ml
    M sw/lib/ocaml/xml_get.ml
    M sw/lib/python/messages_tool.py
    M sw/lib/python/messages_xml_map.py
    M sw/lib/python/settings_tool.py
    M sw/lib/python/settings_xml_parse.py
    M sw/logalizer/Makefile
    M sw/logalizer/matlab/Makefile
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_ivy.c
    M sw/simulator/old_booz/tests/Makefile
    M sw/simulator/scilab/q3d/Makefile
    M sw/simulator/scilab/q3d/fonts/Makefile
    M sw/simulator/scilab/q3d/povray/Makefile
    M sw/simulator/scilab/q6d/povray/Makefile
    M sw/simulator/sim_ac_fw.c
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/Makefile
    M sw/tools/find_free_msg_id.ml
    M sw/tools/fp_proc.ml
    M sw/tools/gen_abi.ml
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_autopilot.ml
    M sw/tools/gen_common.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_messages.ml
    M sw/tools/gen_messages2.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_mtk.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_radio.ml
    M sw/tools/gen_settings.ml
    M sw/tools/gen_srtm.ml
    M sw/tools/gen_ubx.ml
    M sw/tools/gen_xsens.ml
    M sw/tools/wiki_gen/Makefile
    M tests/Makefile

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into stm32f4


  Commit: 27f28a22288f1897218626be1d54fd248fe8fc74
      
https://github.com/paparazzi/paparazzi/commit/27f28a22288f1897218626be1d54fd248fe8fc74
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60X0.h
    A sw/airborne/peripherals/mpu60X0_regs.h
    A sw/airborne/peripherals/mpu60X0_spi.c
    A sw/airborne/peripherals/mpu60X0_spi.h

  Log Message:
  -----------
  [peripheral] start mpu driver


  Commit: 3268576f0b213b39a3d3409baf24fe84a27ea672
      
https://github.com/paparazzi/paparazzi/commit/3268576f0b213b39a3d3409baf24fe84a27ea672
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60X0.h
    M sw/airborne/peripherals/mpu60X0_spi.c
    M sw/airborne/peripherals/mpu60X0_spi.h

  Log Message:
  -----------
  [mpu] attempt to make a generic configuration (spi/i2c)


  Commit: 3ef05a3f3d74b888abf57125acc12c39bce05c63
      
https://github.com/paparazzi/paparazzi/commit/3ef05a3f3d74b888abf57125acc12c39bce05c63
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    A sw/airborne/peripherals/mpu60X0_i2c.c
    A sw/airborne/peripherals/mpu60X0_i2c.h
    M sw/airborne/peripherals/mpu60X0_spi.c

  Log Message:
  -----------
  [mpu] add i2c support for mpu60x0


  Commit: aaf6f21adb64fa819f03a318a8890fa525adcd19
      
https://github.com/paparazzi/paparazzi/commit/aaf6f21adb64fa819f03a318a8890fa525adcd19
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    R sw/airborne/peripherals/mpu60X0.h
    R sw/airborne/peripherals/mpu60X0_i2c.c
    R sw/airborne/peripherals/mpu60X0_i2c.h
    R sw/airborne/peripherals/mpu60X0_regs.h
    R sw/airborne/peripherals/mpu60X0_spi.c
    R sw/airborne/peripherals/mpu60X0_spi.h
    A sw/airborne/peripherals/mpu60x0.h
    A sw/airborne/peripherals/mpu60x0_i2c.c
    A sw/airborne/peripherals/mpu60x0_i2c.h
    A sw/airborne/peripherals/mpu60x0_regs.h
    A sw/airborne/peripherals/mpu60x0_spi.c
    A sw/airborne/peripherals/mpu60x0_spi.h

  Log Message:
  -----------
  [peripherals] rename mpu60x0 files


  Commit: 0cb7cae84b99ce5cd293bceff3556ac8a208a8cf
      
https://github.com/paparazzi/paparazzi/commit/0cb7cae84b99ce5cd293bceff3556ac8a208a8cf
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60x0_i2c.c
    M sw/airborne/peripherals/mpu60x0_regs.h

  Log Message:
  -----------
  [peripherals] mpu60x0: use i2c convenience functions


  Commit: 67d48e7dbf0d9982b14905529a717e7428a99cf3
      
https://github.com/paparazzi/paparazzi/commit/67d48e7dbf0d9982b14905529a717e7428a99cf3
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    A conf/airframes/ENAC/fixed-wing/apogee.xml

  Log Message:
  -----------
  [airframe] add test airframe file for apogee


  Commit: e1bfef64c674cbf0bc7d5b95b7efc2b08e1a6eef
      
https://github.com/paparazzi/paparazzi/commit/e1bfef64c674cbf0bc7d5b95b7efc2b08e1a6eef
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M sw/ext/libopencm3

  Log Message:
  -----------
  [ext] update libopencm3 to get 16MHz resonator clock for F4


  Commit: 60c78127f824aaa623fc9d53473415db2f8bd1f1
      
https://github.com/paparazzi/paparazzi/commit/60c78127f824aaa623fc9d53473415db2f8bd1f1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-23 (Tue, 23 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h

  Log Message:
  -----------
  [uart] uart4 and 6 on stm32f4, generic set function (used on uart1)


  Commit: 478f055825b63f56d28105d7c6f9bb805ea175ef
      
https://github.com/paparazzi/paparazzi/commit/478f055825b63f56d28105d7c6f9bb805ea175ef
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c

  Log Message:
  -----------
  [stm32] set_uart_pin only for F4


  Commit: 5aaf950537b12b3916ac4fe3ebe1f6e108115420
      
https://github.com/paparazzi/paparazzi/commit/5aaf950537b12b3916ac4fe3ebe1f6e108115420
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
    R sw/airborne/peripherals/mpu60X0.h
    A sw/airborne/peripherals/mpu60x0.h
    A sw/airborne/peripherals/mpu60x0_i2c.c
    A sw/airborne/peripherals/mpu60x0_i2c.h
    A sw/airborne/peripherals/mpu60x0_regs.h
    A sw/airborne/peripherals/mpu60x0_spi.c
    A sw/airborne/peripherals/mpu60x0_spi.h
    M sw/ext/luftboot

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/mpu60x0' into stm32f4


  Commit: 639b0ee447a4fb6d2add0b95f8d9ba33e5158e19
      
https://github.com/paparazzi/paparazzi/commit/639b0ee447a4fb6d2add0b95f8d9ba33e5158e19
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/Makefile.sim
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/booz2_flixr.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    A conf/airframes/esden/qs_asp22.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1-vision.xml
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_skiron.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
    M conf/messages.xml
    M conf/modules/sonar_adc.xml
    A conf/modules/sonar_adc_ins.xml
    R conf/modules/sonar_maxbotix_booz.xml
    M conf/settings/control/rotorcraft_guidance.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/umarim/imu_umarim.h
    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/navigation.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_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.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/telemetry.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/modules/multi/tcas.c
    M sw/airborne/subsystems/actuators/actuators_asctec.c
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk_v2.c
    M sw/airborne/subsystems/actuators/actuators_skiron.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu/imu_aspirin.c
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    M sw/ext/luftboot
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/lib/ocaml/Makefile
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/supervision/Makefile
    M sw/supervision/pc_control_panel.ml
    M sw/tools/dfu/dfu.py
    M sw/tools/dfu/stm32_mem.py

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

* master: (31 commits)
  [tcas] tcas always runs on AP. Proposed solution for compile error.
  [umarim] remove warning if no mag are used with umarim
  [Makefile] use -fPIC for all architectures
  [rotorcraft] TRANSITION_MAX_OFFSET in radians, float fixes
  [rotorcraft] Add forward mode for transitioning vehicles
  [Makefile] improve detection of lablgtk2-gnome.*
  [makefile] fix sim build on OS X after broken from no_custom, can't seem to 
build the autopilot.so properly so back to -custom just for simsitl
  [rotorcraft] alternate buses when sending I2C_ERRORS message
  [rotorcraft] silence warning in guidance
  [stm32] Fixes for USART interrupt handler.
  [airframes] update GUIDANCE_H gains for quadrotor example
  [rotorcraft][messages] GUIDANCE_H_INT message
  [nps] don't bypass ahrs by default
  [rotorcraft] use horizontal guidance ref by default
  [supervision] allow launching of external tools with absolute path
  [dfu] print exception
  [spi] remove warning
  [doc][modules] minor update to sonar doc
  [sonar] split sonar modules with and without ins binding
  [sonar] and event hook to use the sonar with the ins
  ...


  Commit: aaa7c3e575654661a9f4a1b2212cae2c10be99f3
      
https://github.com/paparazzi/paparazzi/commit/aaa7c3e575654661a9f4a1b2212cae2c10be99f3
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/Makefile.sim
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/booz2_flixr.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    A conf/airframes/esden/qs_asp22.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1-vision.xml
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_skiron.makefile
    M conf/messages.xml
    M conf/modules/sonar_adc.xml
    A conf/modules/sonar_adc_ins.xml
    R conf/modules/sonar_maxbotix_booz.xml
    M conf/settings/control/rotorcraft_guidance.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/umarim/imu_umarim.h
    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/navigation.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_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.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/telemetry.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/modules/multi/tcas.c
    M sw/airborne/subsystems/actuators/actuators_asctec.c
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk_v2.c
    M sw/airborne/subsystems/actuators/actuators_skiron.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu/imu_aspirin.c
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/lib/ocaml/Makefile
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/supervision/Makefile
    M sw/supervision/pc_control_panel.ml
    M sw/tools/dfu/dfu.py
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/stm32f4' into stm32f4


  Commit: 19196c4030a59a2d89da5beedf7570ed74f0ca3a
      
https://github.com/paparazzi/paparazzi/commit/19196c4030a59a2d89da5beedf7570ed74f0ca3a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    A conf/firmwares/subsystems/shared/imu_apogee.makefile
    A sw/airborne/boards/apogee/imu_apogee.c
    A sw/airborne/boards/apogee/imu_apogee.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/peripherals/mpu60x0.h

  Log Message:
  -----------
  [apogee] add apogee imu based on mpu60x0


  Commit: 6c96c87f9a8a184417e32a525766c64f8ca10d81
      
https://github.com/paparazzi/paparazzi/commit/6c96c87f9a8a184417e32a525766c64f8ca10d81
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_i2c.c

  Log Message:
  -----------
  [mpu60x0] fix mpu60x0 and apogee imu driver


  Commit: 285de4d0f3e7954435ce51620da087ea6617fe0f
      
https://github.com/paparazzi/paparazzi/commit/285de4d0f3e7954435ce51620da087ea6617fe0f
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_aspirin2.c

  Log Message:
  -----------
  [imu] mpu inclcude for old aspirin2 driver


  Commit: 4d73692b670a54d3254c702e13899dcb0382d0e3
      
https://github.com/paparazzi/paparazzi/commit/4d73692b670a54d3254c702e13899dcb0382d0e3
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h

  Log Message:
  -----------
  [stm32] sys_tick_handler declared in c file only


  Commit: 5b2a747b32ce8e0638f85217830f4980ef188aca
      
https://github.com/paparazzi/paparazzi/commit/5b2a747b32ce8e0638f85217830f4980ef188aca
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_spi.c

  Log Message:
  -----------
  [peripherals] mpu60x0_spi fixes


  Commit: 29840b6ef89b4b5661a9b6c7dbe9b6e6baef3434
      
https://github.com/paparazzi/paparazzi/commit/29840b6ef89b4b5661a9b6c7dbe9b6e6baef3434
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/peripherals/mpu60x0.h

  Log Message:
  -----------
  [peripherals][mpu60x0] switch to external clock before sending other config


  Commit: d4c2b3a137c6d2ce5d621ba3c12ea5c4b7656b3e
      
https://github.com/paparazzi/paparazzi/commit/d4c2b3a137c6d2ce5d621ba3c12ea5c4b7656b3e
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    A sw/airborne/subsystems/imu/imu_aspirin_2.c
    A sw/airborne/subsystems/imu/imu_aspirin_2.h

  Log Message:
  -----------
  [imu] initial commit of new aspirin2 driver using mpu60x0 peripheral

Mag slave still missing...


  Commit: ad4cee9b5e50c23413f8c57772fb8175a70b842a
      
https://github.com/paparazzi/paparazzi/commit/ad4cee9b5e50c23413f8c57772fb8175a70b842a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [adc] fix adc chanel init on stm32


  Commit: 6e1b26584f1945ffc886b6e699feaf7ebc8146f6
      
https://github.com/paparazzi/paparazzi/commit/6e1b26584f1945ffc886b6e699feaf7ebc8146f6
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-24 (Wed, 24 Apr 2013)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/apogee.xml
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/apogee/imu_apogee.h

  Log Message:
  -----------
  [apogee] apogee imu sensor scale


  Commit: 58ff18e9f27dd38fa3747773233ba2fd5ba1d5be
      
https://github.com/paparazzi/paparazzi/commit/58ff18e9f27dd38fa3747773233ba2fd5ba1d5be
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    A sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [spi] put some board dependant configuration into config files for spi


  Commit: 2c0b81437eac4f309c5479e0638efdc00f8d5a73
      
https://github.com/paparazzi/paparazzi/commit/2c0b81437eac4f309c5479e0638efdc00f8d5a73
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h

  Log Message:
  -----------
  [adc] board config in adc_arch


  Commit: 38dcf6095724b0df7b6080308c5c84af3ce60693
      
https://github.com/paparazzi/paparazzi/commit/38dcf6095724b0df7b6080308c5c84af3ce60693
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [ppm] update ppm driver for F4


  Commit: bfcb31bf8398d789221efd2a0d8f2512a78dfb31
      
https://github.com/paparazzi/paparazzi/commit/bfcb31bf8398d789221efd2a0d8f2512a78dfb31
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [adc] activate ADC on stm32 from board files


  Commit: 333d4daa9ee142a8638d01a490440a244d358aa8
      
https://github.com/paparazzi/paparazzi/commit/333d4daa9ee142a8638d01a490440a244d358aa8
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [pwm] new PWM driver for stm32 with F4 support

F1 support should be broken since the configuration of the pwm has to be
done from the board file
Old config is moved and commented in lisa board file


  Commit: 40e6186706cd74f50ad1e0fa95931adb02babc56
      
https://github.com/paparazzi/paparazzi/commit/40e6186706cd74f50ad1e0fa95931adb02babc56
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M conf/boards/apogee_0.99.makefile
    M sw/airborne/boards/apogee_0.99.h

  Log Message:
  -----------
  [apogee] update apogee config files


  Commit: 2912af63c8ef76c960b2ed11a42416a9388f700a
      
https://github.com/paparazzi/paparazzi/commit/2912af63c8ef76c960b2ed11a42416a9388f700a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/tools/gen_airframe.ml

  Log Message:
  -----------
  [gen_airframe] only den is negative when converting float to num/den


  Commit: 854f319f621c2c9fa422f2dc9a1db5460dcb79dd
      
https://github.com/paparazzi/paparazzi/commit/854f319f621c2c9fa422f2dc9a1db5460dcb79dd
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    M sw/airborne/arch/stm32/TIM_usage_list.txt
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [stm32] actuators_pwm for STM32F1

LisaL pwm config in board file still missing


  Commit: e0584a7c6965d6512abadc595a3fa4a52a8d18e5
      
https://github.com/paparazzi/paparazzi/commit/e0584a7c6965d6512abadc595a3fa4a52a8d18e5
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [stm32] actuators_pwm: PWM_SERVO_x is servo index


  Commit: 728b596f567d6e87fc7b9da3e80109841c43f87d
      
https://github.com/paparazzi/paparazzi/commit/728b596f567d6e87fc7b9da3e80109841c43f87d
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M sw/airborne/boards/lisa_l_1.0.h

  Log Message:
  -----------
  [stm32] update board definitions for LisaL


  Commit: be965cdd5b96213e726c48bebbfc1decff8b00b6
      
https://github.com/paparazzi/paparazzi/commit/be965cdd5b96213e726c48bebbfc1decff8b00b6
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-28 (Sun, 28 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [stm32] remove outdated krooz stuff


  Commit: 980179487c51127fe915aa8b098edabb5299653d
      
https://github.com/paparazzi/paparazzi/commit/980179487c51127fe915aa8b098edabb5299653d
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-28 (Sun, 28 Apr 2013)

  Changed paths:
    M sw/airborne/boards/apogee/imu_apogee.c

  Log Message:
  -----------
  [apogee] set default channel for apogee imu


  Commit: a59098c6e54edf7155ebd36a8b2c39e0e455168f
      
https://github.com/paparazzi/paparazzi/commit/a59098c6e54edf7155ebd36a8b2c39e0e455168f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    A sw/airborne/boards/apogee/baro_board.c
    A sw/airborne/boards/apogee/baro_board.h

  Log Message:
  -----------
  [apogee] add baro_board files (using mpl3115 sensor)


  Commit: ddab18c8e7679c61974810b0d0cd5190c9624d30
      
https://github.com/paparazzi/paparazzi/commit/ddab18c8e7679c61974810b0d0cd5190c9624d30
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M sw/airborne/boards/apogee/baro_board.h

  Log Message:
  -----------
  [boards] fix typo on apogee baro_board


  Commit: 833154b2e6975f30dc8338d56b674f0fc8b72351
      
https://github.com/paparazzi/paparazzi/commit/833154b2e6975f30dc8338d56b674f0fc8b72351
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M conf/Makefile.stm32

  Log Message:
  -----------
  [stm32] remove dependency output when building F4


  Commit: 422b3336508f6f6acb95e636a1e4a1fe915c7e70
      
https://github.com/paparazzi/paparazzi/commit/422b3336508f6f6acb95e636a1e4a1fe915c7e70
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/apogee/baro_board.h

  Log Message:
  -----------
  [boards] apogee baro waits until MPU is configured


  Commit: 52787bcb0398fed48f6694686d5e3713602878f0
      
https://github.com/paparazzi/paparazzi/commit/52787bcb0398fed48f6694686d5e3713602878f0
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M conf/Makefile.arm-common
    A conf/Makefile.arm-embedded
    A conf/Makefile.arm-embedded-toolchain
    A conf/Makefile.arm-linux
    R conf/Makefile.arm-toolchain
    M conf/Makefile.lpc21
    M conf/Makefile.sim
    M conf/Makefile.stm32
    M conf/airframes/esden/qs_asp22.xml
    A conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_mlkf.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_sirf.makefile
    A conf/firmwares/subsystems/shared/ahrs_gx3.makefile
    M conf/messages.xml
    A conf/radios/Turnigy_9XR.xml
    M sw/airborne/arch/lpc21/lpcusb/Makefile
    M sw/airborne/arch/lpc21/test/bootloader/Makefile
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/modules/digital_cam/dc.h
    A sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    A sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    A sw/airborne/subsystems/ahrs/ahrs_gx3.c
    A sw/airborne/subsystems/ahrs/ahrs_gx3.h
    A sw/airborne/subsystems/gps/gps_sirf.c
    A sw/airborne/subsystems/gps/gps_sirf.h
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/lib/ocaml/convert.c
    M sw/supervision/pc_aircraft.ml
    M sw/tools/gen_airframe.ml

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

syn with master to test with mlkf


  Commit: bdce35b93adc255d69b9fbfd771f30d815e4511d
      
https://github.com/paparazzi/paparazzi/commit/bdce35b93adc255d69b9fbfd771f30d815e4511d
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile

  Log Message:
  -----------
  [rotorcraft] set baro on apogee to raw mode


  Commit: f390218841e8f6656e2336441952b5f88278daae
      
https://github.com/paparazzi/paparazzi/commit/f390218841e8f6656e2336441952b5f88278daae
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M sw/ext/libopencm3

  Log Message:
  -----------
  [ext] update locm3 to get fix for USART6 baudrate


  Commit: 4a8c56c7762ca78e02d1ebced5d0b38918a2bd29
      
https://github.com/paparazzi/paparazzi/commit/4a8c56c7762ca78e02d1ebced5d0b38918a2bd29
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/boards/apogee_0.99.h

  Log Message:
  -----------
  [stm32] cleanup uart arch


  Commit: 23881847e3cc0b1670286c50818256f3e08869db
      
https://github.com/paparazzi/paparazzi/commit/23881847e3cc0b1670286c50818256f3e08869db
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [stm32] spektrum: selectable bind pin


  Commit: 7ddd1d60b5c98c8b76a5e4967a0e16a4686f07e1
      
https://github.com/paparazzi/paparazzi/commit/7ddd1d60b5c98c8b76a5e4967a0e16a4686f07e1
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-29 (Mon, 29 Apr 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [stm32] hack to make UART4/5 work with spektrum macros

Since UART4/5 is already defined in libopencm3 the macros don't work for those.
(Compared to e.g. UART1 which is actually USART1 in libopencm3).

So just define RADIO_CONTROL_SPEKTRUM_[PRIMARY|SECONDARY]_PORT to 
SPEKTRUM_UARTx instead of UARTx.
This makes it at least possible to configure the secondary spektrum port (UART5 
on Lisa) properly.


  Commit: aa2ffbded6efdc323e6965313a348a45347ffc4b
      
https://github.com/paparazzi/paparazzi/commit/aa2ffbded6efdc323e6965313a348a45347ffc4b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [adc] fix injected adc channels reading on stm32


  Commit: 89d5df38846870dab3b16ab29786622ab8aff64e
      
https://github.com/paparazzi/paparazzi/commit/89d5df38846870dab3b16ab29786622ab8aff64e
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/mcu_periph/uart.h

  Log Message:
  -----------
  [stm32] uart_periph_set_mode with separate tx,rx enable


  Commit: dd55a3f5fe80432eff9855752a376cea4fd12c7b
      
https://github.com/paparazzi/paparazzi/commit/dd55a3f5fe80432eff9855752a376cea4fd12c7b
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M conf/airframes/obsolete/mm/extra/logger_sd_adc.xml
    M conf/airframes/obsolete/mm/extra/quiet.xml
    M conf/firmwares/logger.makefile
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c

  Log Message:
  -----------
  [lpc21][uart] also disable tx via USE_UARTx_TX=FALSE


  Commit: 454e368a076dedcaaf2a459e4cec882c8b6a2ef4
      
https://github.com/paparazzi/paparazzi/commit/454e368a076dedcaaf2a459e4cec882c8b6a2ef4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M conf/Makefile.stm32
    M conf/boards/apogee_0.99.makefile

  Log Message:
  -----------
  [stm32] add upload rule to use ST-Link on SWD


  Commit: 98b57887e6596a140f88bb74982404224f4df6e5
      
https://github.com/paparazzi/paparazzi/commit/98b57887e6596a140f88bb74982404224f4df6e5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-04-30 (Tue, 30 Apr 2013)

  Changed paths:
    M sw/airborne/boards/lisa_m_common.h

  Log Message:
  -----------
  [lisa] remove airframe include from lisa_common.h


  Commit: 436d836aba7166dd0c1ada6da81367ee92b41142
      
https://github.com/paparazzi/paparazzi/commit/436d836aba7166dd0c1ada6da81367ee92b41142
  Author: Felix Ruess <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    A conf/boards/krooz_1.0.makefile
    A sw/airborne/arch/stm32/krooz.ld
    A sw/airborne/boards/krooz_1.0.h

  Log Message:
  -----------
  [stm32] add (incomplete) board files for krooz

still needs in krooz_1.0.h:
- checking of PWM_SERVO_x_AF
- add UART defines
- correct ADC channels/gpios


  Commit: 4ee11c98fde9c006ea852895b40166600480c89e
      
https://github.com/paparazzi/paparazzi/commit/4ee11c98fde9c006ea852895b40166600480c89e
  Author: Felix Ruess <address@hidden>
  Date:   2013-05-03 (Fri, 03 May 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/imu_apogee.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    A sw/airborne/peripherals/mpu60x0.c
    M sw/airborne/peripherals/mpu60x0.h
    M sw/airborne/peripherals/mpu60x0_regs.h

  Log Message:
  -----------
  [peripherals] mpu60x0: common implementation in c file


  Commit: 3f62875d8ab34d8809ce2596815316dd25719e6e
      
https://github.com/paparazzi/paparazzi/commit/3f62875d8ab34d8809ce2596815316dd25719e6e
  Author: Felix Ruess <address@hidden>
  Date:   2013-05-04 (Sat, 04 May 2013)

  Changed paths:
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/lisa/tunnel_hw.c

  Log Message:
  -----------
  [stm32] LED_ON is not necessarily gpio_clear

while here, replace GPIO_BSRR and GPIO_BRR with gpio_set|clear


  Commit: 49059f08805c0eae5239da78cdffa82f8efaeb6a
      
https://github.com/paparazzi/paparazzi/commit/49059f08805c0eae5239da78cdffa82f8efaeb6a
  Author: Felix Ruess <address@hidden>
  Date:   2013-05-06 (Mon, 06 May 2013)

  Changed paths:
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c

  Log Message:
  -----------
  [stm32] initialize SpektrumState.ReSync in impl_init


  Commit: 3e689f0ce6fcc5cb9042f46f9e550c507184011f
      
https://github.com/paparazzi/paparazzi/commit/3e689f0ce6fcc5cb9042f46f9e550c507184011f
  Author: Sergey Krukovski <address@hidden>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  [tools] update dfu script

- add a timeout so you have time to connect the device
- less verbose, don't print all addresses


  Commit: b79972b7a893aee6eff92d793f28e794074e6223
      
https://github.com/paparazzi/paparazzi/commit/b79972b7a893aee6eff92d793f28e794074e6223
  Author: Sergey Krukovski <address@hidden>
  Date:   2013-05-12 (Sun, 12 May 2013)

  Changed paths:
    M conf/Makefile.stm32
    A conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    R conf/boards/krooz_1.0.makefile
    A conf/boards/krooz_sd.makefile
    A conf/flight_plans/rotorcraft_krooz.xml
    A conf/radios/mx-16.xml
    R sw/airborne/boards/krooz_1.0.h
    A sw/airborne/boards/krooz_sd.h

  Log Message:
  -----------
  [boards] Porting KroozSD


  Commit: 3328dfbcf9bad56752ea507e4e379a11032ed279
      
https://github.com/paparazzi/paparazzi/commit/3328dfbcf9bad56752ea507e4e379a11032ed279
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile

  Log Message:
  -----------
  fix test_rc_spektrum, remove unused USE_TIM6_IRQ


  Commit: fb272f423aad983b79a9426f2af593a689d07f03
      
https://github.com/paparazzi/paparazzi/commit/fb272f423aad983b79a9426f2af593a689d07f03
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M sw/ext/libopencm3

  Log Message:
  -----------
  [ext] update libopencm3 to get timer_ic_set_polarity on F1 again


  Commit: b084e20484fe554b0c6fe4550fe476a6d3dc7e76
      
https://github.com/paparazzi/paparazzi/commit/b084e20484fe554b0c6fe4550fe476a6d3dc7e76
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c

  Log Message:
  -----------
  [stm32] fix ADC sample rate after libopencm3 update


  Commit: ed489f595f0cfcfc5d4afe2bc5a444d4b9edd7f0
      
https://github.com/paparazzi/paparazzi/commit/ed489f595f0cfcfc5d4afe2bc5a444d4b9edd7f0
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M sw/airborne/boards/lisa_l_1.0.h

  Log Message:
  -----------
  [stm32] fix ppm for LisaL


  Commit: 211187a52d3e3414e69b8ba0b859aa08f630f8bb
      
https://github.com/paparazzi/paparazzi/commit/211187a52d3e3414e69b8ba0b859aa08f630f8bb
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M sw/airborne/mcu_periph/uart.h

  Log Message:
  -----------
  [mcu_periph] fix UART2SetBaudrate


  Commit: 058e4c17f1902d9148009475efb3d6247087eba1
      
https://github.com/paparazzi/paparazzi/commit/058e4c17f1902d9148009475efb3d6247087eba1
  Author: Felix Ruess <address@hidden>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M conf/Makefile.stm32
    A conf/airframes/ENAC/fixed-wing/apogee.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/obsolete/mm/extra/logger_sd_adc.xml
    M conf/airframes/obsolete/mm/extra/quiet.xml
    A conf/boards/apogee_0.99.makefile
    A conf/boards/krooz_sd.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/logger.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/shared/imu_apogee.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
    A conf/flight_plans/rotorcraft_krooz.xml
    A conf/radios/mx-16.xml
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/TIM_usage_list.txt
    A sw/airborne/arch/stm32/apogee.ld
    A sw/airborne/arch/stm32/krooz.ld
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.h
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    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/arch/stm32/subsystems/radio_control/spektrum_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    A sw/airborne/boards/apogee/baro_board.c
    A sw/airborne/boards/apogee/baro_board.h
    A sw/airborne/boards/apogee/imu_apogee.c
    A sw/airborne/boards/apogee/imu_apogee.h
    A sw/airborne/boards/apogee_0.99.h
    A sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    A sw/airborne/boards/lisa_m_common.h
    M sw/airborne/lisa/tunnel_hw.c
    M sw/airborne/mcu.c
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    R sw/airborne/peripherals/mpu60X0.h
    A sw/airborne/peripherals/mpu60x0.c
    A sw/airborne/peripherals/mpu60x0.h
    A sw/airborne/peripherals/mpu60x0_i2c.c
    A sw/airborne/peripherals/mpu60x0_i2c.h
    A sw/airborne/peripherals/mpu60x0_regs.h
    A sw/airborne/peripherals/mpu60x0_spi.c
    A sw/airborne/peripherals/mpu60x0_spi.h
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    A sw/airborne/subsystems/imu/imu_aspirin_2.c
    A sw/airborne/subsystems/imu/imu_aspirin_2.h
    M sw/ext/libopencm3
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Merge initial stm32f4 support

- apogee board working, including IMU
- KroozSD board files, IMU driver still missing
- not all peripherls have f4 support yet
- configuration cleanup, e.g. pin assignments in board header files
- mpu60x0 peripheral (without slave support so far)
- uart_periph_set_mode with separate tx,rx enable
- update libopencm3 for uart6 and timer fixes

and other stuff....


Compare: 
https://github.com/paparazzi/paparazzi/compare/6cbe186f6301...058e4c17f190

reply via email to

[Prev in Thread] Current Thread [Next in Thread]