[paparazzi-commits] [paparazzi/paparazzi] b57d21: Merge branch 'dev' into locm3

[GitHub]

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: b57d21a180429b928367ccd6cfbd106e8e86922d
      
https://github.com/paparazzi/paparazzi/commit/b57d21a180429b928367ccd6cfbd106e8e86922d
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-12 (Sun, 12 Feb 2012)

  Changed paths:
    M Makefile
  M Makefile.ac
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/multimon/Makefile
  M sw/lib/ocaml/xml2h.ml
  M sw/supervision/Makefile

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

Conflicts:
        Makefile


  Commit: 41e3608d7f30a46e8d41eba0d9dc69f55e9c15e3
      
https://github.com/paparazzi/paparazzi/commit/41e3608d7f30a46e8d41eba0d9dc69f55e9c15e3
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

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

  Log Message:
  -----------
  Updated libopencm3 to provide BANKs for GPIO. Converted UART code to use 
those.


  Commit: 078cfeaf084874e83c419b5f4616c8be65df7a33
      
https://github.com/paparazzi/paparazzi/commit/078cfeaf084874e83c419b5f4616c8be65df7a33
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/ext/libopencm3

  Log Message:
  -----------
  Ported actuators pwm arch using test_servos test as reference to libopencm3.


Compare: https://github.com/paparazzi/paparazzi/compare/0a26e6e...078cfea