[paparazzi-commits] [paparazzi/paparazzi] 345f9d: no trailing whitespaces please

[GitHub]

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 345f9d99811a170ce2830d0fc60ad1fd7a513a43
      
https://github.com/paparazzi/paparazzi/commit/345f9d99811a170ce2830d0fc60ad1fd7a513a43
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
  M conf/airframes/logomatic.xml
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.c

  Log Message:
  -----------
  no trailing whitespaces please


  Commit: 5d9c9a18a3db1b960221a67d178e666ffff20199
      
https://github.com/paparazzi/paparazzi/commit/5d9c9a18a3db1b960221a67d178e666ffff20199
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml

  Log Message:
  -----------
  updated the hardware test airframe files, positive gains, etc.


  Commit: e7e51166f562cae99d50e2f8d677f58ee01a79f0
      
https://github.com/paparazzi/paparazzi/commit/e7e51166f562cae99d50e2f8d677f58ee01a79f0
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M sw/include/std.h

  Log Message:
  -----------
  wrap define of ABS in ifndef in std.h


  Commit: 3dc34d08020766ce3e89519e57ada10ab535f3fb
      
https://github.com/paparazzi/paparazzi/commit/3dc34d08020766ce3e89519e57ada10ab535f3fb
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-11 (Wed, 11 Apr 2012)

  Changed paths:
    M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  R conf/airframes/ENAC/quadrotor/g1_vision.xml
  R conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  R conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  R conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
  R conf/airframes/UofAdelaide/A1000_BOOZ.xml
  R conf/airframes/UofAdelaide/A1000_LISA.xml
  R conf/airframes/UofAdelaide/A1000_NOVA.xml
  R conf/airframes/UofAdelaide/booz2_NoVa_001_1000.xml
  R conf/airframes/UofAdelaide/booz2_a1000.xml
  R conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/logomatic.xml
  A conf/airframes/obsolete/ENAC/g1_vision.xml
  A conf/airframes/obsolete/ENAC/mkk1-vision.xml
  A conf/airframes/obsolete/ENAC/mkk1.xml
  A conf/airframes/obsolete/ENAC/nova1.xml
  A conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
  A conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
  A conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
  A conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
  A conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
  A conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
  M conf/boards/lisa_m_2.0.makefile
  A conf/modules/bat_checker.xml
  M conf/settings/settings_booz2.xml
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.c
  M sw/airborne/boards/lisa_m_1.0.h
  A sw/airborne/boards/lisa_m_2.0.h
  R sw/airborne/firmwares/beth/gps_c.patch
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  A sw/airborne/firmwares/rotorcraft/autopilot_arming_switch.h
  A sw/airborne/firmwares/rotorcraft/autopilot_arming_throttle.h
  A sw/airborne/firmwares/rotorcraft/autopilot_arming_yaw.h
  A sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/firmwares/rotorcraft/navigation.c
  A sw/airborne/modules/bat_checker/bat_checker.c
  A sw/airborne/modules/bat_checker/bat_checker.h
  M sw/airborne/subsystems/ins.c
  M sw/include/std.h
  M sw/lib/ocaml/xml2h.ml

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


Compare: https://github.com/paparazzi/paparazzi/compare/431b4ff...3dc34d0