[paparazzi-commits] [paparazzi/paparazzi] 4bb7e7: Merging changes from the dev branch.

[GitHub]

  Branch: refs/heads/dev_i2c
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 4bb7e7c2465651080c0d5ead227ea0a111f691f1
      
https://github.com/paparazzi/paparazzi/commit/4bb7e7c2465651080c0d5ead227ea0a111f691f1
  Author: Bernard Davison <address@hidden>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
  M 
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_l_1.1.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/lisa_m_2.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_0.99.makefile
  M conf/boards/tiny_1.1.makefile
  M conf/boards/tiny_2.1.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/twog_1.0.makefile
  R conf/boards/twog_1.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/mtk.dtd
  M sw/airborne/firmwares/rotorcraft/actuators.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.h
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
  M sw/airborne/firmwares/rotorcraft/stabilization.c
  M sw/airborne/firmwares/rotorcraft/stabilization.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h
  M sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/simulator/flightModel.ml

  Log Message:
  -----------
  Merging changes from the dev branch.


  Commit: 8a95ddd256ffbbc0877e8fcfc1824e485966d0c6
      
https://github.com/paparazzi/paparazzi/commit/8a95ddd256ffbbc0877e8fcfc1824e485966d0c6
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c

  Log Message:
  -----------
  rotorcraft guidance: if quaternion stabilization is used, compute quat 
setpoint from eulers in hover and attitude nav as well


  Commit: 7a609aec2ab48f8ffd36b04a1665b51b5f62e5fb
      
https://github.com/paparazzi/paparazzi/commit/7a609aec2ab48f8ffd36b04a1665b51b5f62e5fb
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M sw/airborne/math/pprz_algebra_int.h

  Log Message:
  -----------
  math: added INT32_EULERS_LSHIFT and INT32_EULERS_RSHIFT macros


  Commit: f8fd4f8799b6692285e3672c695b3c91c68f0628
      
https://github.com/paparazzi/paparazzi/commit/f8fd4f8799b6692285e3672c695b3c91c68f0628
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/navigation.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h

  Log Message:
  -----------
  rotorcraft guidance: hopefully fixed the fixedpoint resolution for attitude 
setpoint when using the quaternion stabilization
* still needs to be cleaned up properly, it's bad that the stab_att_sp_euler 
has a different fixedpoint fraction for quat than for euler


  Commit: 4a027cadc92df7a7f95fbdcc758505f6d210db3a
      
https://github.com/paparazzi/paparazzi/commit/4a027cadc92df7a7f95fbdcc758505f6d210db3a
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M Makefile
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  M conf/conf.xml.example
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/navigation.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/in_progress/videolizer/wis-go7007-linux/Makefile
  A tests/LisaL/01_With_b2_v1.2.t
  R tests/LisaL/01_upload.t
  A tests/LisaL/02_With_aspirin_v1.5_and_overo.t
  M tests/Makefile
  M tests/examples/01_compile_all_example_targets.t
  A tests/sim/01_Microjet.t

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


Compare: https://github.com/paparazzi/paparazzi/compare/892238a...4a027ca