[paparazzi-commits] [paparazzi/paparazzi] bc760c: Merge branch 'stm_i2c' into systime_i2c

[noreply]

  Branch: refs/heads/systime_i2c
  Home:   https://github.com/paparazzi/paparazzi

  Commit: bc760ce9227d78ff2cb86635d7050aed2c1aab31
      
https://github.com/paparazzi/paparazzi/commit/bc760ce9227d78ff2cb86635d7050aed2c1aab31
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 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.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 'stm_i2c' into systime_i2c


  Commit: c40e1c8983e8cb8f3d277cce320ca2b1c34de4a6
      
https://github.com/paparazzi/paparazzi/commit/c40e1c8983e8cb8f3d277cce320ca2b1c34de4a6
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  fraser airframe: use ACTUATORS_STARTUP_DELAY for mkk controllers


  Commit: 25f9ec1dda91280cee8488fe5d604ca61c9b4b5e
      
https://github.com/paparazzi/paparazzi/commit/25f9ec1dda91280cee8488fe5d604ca61c9b4b5e
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M conf/airframes/Poine/beth.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

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


  Commit: afb707ce96b214f22b414698cb10c82a89ac56c3
      
https://github.com/paparazzi/paparazzi/commit/afb707ce96b214f22b414698cb10c82a89ac56c3
  Author: Felix Ruess <address@hidden>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M conf/airframes/Poine/beth.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

  Log Message:
  -----------
  Merge branch 'systime' into systime_i2c


Compare: https://github.com/paparazzi/paparazzi/compare/bc760ce^...afb707c