[paparazzi-commits] [paparazzi/paparazzi] ba8aa3: rotorcraft horizontal guidance:

[GitHub]

  Branch: refs/heads/quadshot_integration
  Home:   https://github.com/paparazzi/paparazzi
  Commit: ba8aa325af86e000cab5a08015ab5830e3ef3246
      
https://github.com/paparazzi/paparazzi/commit/ba8aa325af86e000cab5a08015ab5830e3ef3246
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

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

  Log Message:
  -----------
  rotorcraft horizontal guidance:
* removed tracking algorithm (no integral part) from nav_run
  * was used if position error > HOLD_DISTANCE
  * but was not working properly
* use the same traj_run for both hover and nav modes
* in hover set the reference speed and accel to zero
* in nav use compute real reference if GUIDANCE_H_USE_REF, just like before


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

  Changed paths:
    M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h

  Log Message:
  -----------
  rotorcraft guidance: removed ngain since tracking algorithm was removed


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

  Changed paths:
    M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h

  Log Message:
  -----------
  Merge branch 'attitude_ref_frac' into quadshot_integration
* same guidance for hover and nav, so same gains
  (except that in nav the reference is used, in hover reference is zero)


Compare: https://github.com/paparazzi/paparazzi/compare/a24b802...6c39bcd