[paparazzi-commits] [paparazzi/paparazzi] d25a33: rotorcraft nav: fix NavVerticalThrottleMode, throt...

[GitHub]

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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/navigation.h

  Log Message:
  -----------
  rotorcraft nav: fix NavVerticalThrottleMode, throttle is no longer scaled to 
200


  Commit: 9f980d65519a84e6bd28af9febf76a2f2723ad5c
      
https://github.com/paparazzi/paparazzi/commit/9f980d65519a84e6bd28af9febf76a2f2723ad5c
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

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

  Log Message:
  -----------
  rotorcraft horizontal guidance: fix earth.y command, rshift instead of lshift


  Commit: 9be470a9085671bb12cd75e6c45c4ccc834257d3
      
https://github.com/paparazzi/paparazzi/commit/9be470a9085671bb12cd75e6c45c4ccc834257d3
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

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

  Log Message:
  -----------
  rotorcraft guidance horizontal: divide gain scale for accel (feed-forward) 
gain by 256, should be same as in master again


  Commit: 4e570aeb479abbc3fffb163bbcafa81139d8dff2
      
https://github.com/paparazzi/paparazzi/commit/4e570aeb479abbc3fffb163bbcafa81139d8dff2
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-03 (Tue, 03 Apr 2012)

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c

  Log Message:
  -----------
  rotorcraft guidance_h: make max bank angle in nav configurable in airframe 
file, default is still 20deg


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

  Changed paths:
    M Makefile.ac
  M conf/airframes/CDW/LisaAspirin2.xml
  M conf/airframes/CDW/yapa3_aspirin2.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  A conf/airframes/esden/calib/asp21-000.xml
  A conf/airframes/esden/calib/asp21-default.xml
  M conf/airframes/esden/lisa_m_2_asp_2_pwm.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  A conf/airframes/mm/fixed-wing/trojan.xml
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/messages.xml
  M conf/radios/mc24r.xml
  R conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  R conf/settings/settings_booz2_jtm.xml
  M conf/telemetry/default_rotorcraft.xml
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/modules/sensors/imu_aspirin2.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/peripherals/adxl345.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
  M sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/test/ahrs/ahrs_on_synth.c
  M sw/airborne/test/ahrs/ahrs_on_synth.h
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/supervision/pc_aircraft.ml
  M tests/LisaL/01_With_b2_v1.2.t
  M tests/LisaL/02_With_aspirin_v1.5_and_overo.t

  Log Message:
  -----------
  Merge branch 'dev' into locm3
* fixes for rotorcraft supervision
* fixes for rotorcraft horizontal guidance
* ahrs: improved gps course based heading estimation
* make it globally configurable whether to use mag or not
  to disable the mag, explicitly configure USE_MAGNETOMETER to zero. e.g.:
  <subsystem name"ahrs" type="int_cmpl_quat">
    <configure name="USE_MAGNETOMETER" value="0"/>
  </subsystem)


Compare: https://github.com/paparazzi/paparazzi/compare/3a4b6ca...5ccb42f