[paparazzi-commits] [paparazzi/paparazzi] 17bbb1: Merge branch 'stm_i2c' into dev_i2c

[GitHub]

  Branch: refs/heads/dev_i2c
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 17bbb1eda7ecd3a2e0ca3c05858617af088512bc
      
https://github.com/paparazzi/paparazzi/commit/17bbb1eda7ecd3a2e0ca3c05858617af088512bc
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-15 (Thu, 15 Mar 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 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.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
  M sw/airborne/subsystems/imu/imu_aspirin.h

  Log Message:
  -----------
  Merge branch 'stm_i2c' into dev_i2c


  Commit: 1bda12b4ee0c530f0210ec5973a28dc1425f1776
      
https://github.com/paparazzi/paparazzi/commit/1bda12b4ee0c530f0210ec5973a28dc1425f1776
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-15 (Thu, 15 Mar 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h

  Log Message:
  -----------
  rotorcraft guidance vertical: include generated airframe before checking 
SUPERVISION_MIN_MOTOR


Compare: https://github.com/paparazzi/paparazzi/compare/17bbb1e^...1bda12b