[paparazzi-commits] [paparazzi/paparazzi] 6a52eb: Merge remote-tracking branch 'gautier/uart' into d...

[noreply]

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

Commit: 6a52eb9355489f539afe6e899374b4a3c2cb100d
    
https://github.com/paparazzi/paparazzi/commit/6a52eb9355489f539afe6e899374b4a3c2cb100d
Author: Felix Ruess <address@hidden>
Date:   2011-05-22 (Sun, 22 May 2011)

Changed paths:
  M conf/control_panel.xml.example
  M conf/flight_plans/versatile_carto_fixe_muret.xml
  M conf/messages.xml
  M conf/modules/cartography.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/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/gps_nmea.c
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_module.h
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c

Log Message:
-----------
Merge remote-tracking branch 'gautier/uart' into dev-uart


Commit: 4519a597c6e5fb2be78bb5de593ec7d9c7d730b5
    
https://github.com/paparazzi/paparazzi/commit/4519a597c6e5fb2be78bb5de593ec7d9c7d730b5
Author: Felix Ruess <address@hidden>
Date:   2011-05-22 (Sun, 22 May 2011)

Changed paths:
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/gps_nmea.c
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/ins/ins_module.h
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c

Log Message:
-----------
Merge remote-tracking branch 'flixr/dev-uart' into dev


Compare: https://github.com/paparazzi/paparazzi/compare/7e9f4fd...4519a59