[paparazzi-commits] [paparazzi/paparazzi] bdb910: Revert "Merge pull request #309 from TobiasMue/v4....

[GitHub]

  Branch: refs/heads/v4.1
  Home:   https://github.com/paparazzi/paparazzi
  Commit: bdb9108a292ae5ec97e945701c405cbee3b7fbea
      
https://github.com/paparazzi/paparazzi/commit/bdb9108a292ae5ec97e945701c405cbee3b7fbea
  Author: Felix Ruess <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    R conf/firmwares/subsystems/fixedwing/control_energyadaptive.makefile
    R conf/settings/control/ctl_energyadaptive.xml
    R sw/airborne/firmwares/fixedwing/guidance/energy_ctrl_add.c
    R sw/airborne/firmwares/fixedwing/guidance/energy_ctrl_add.h
    M sw/airborne/subsystems/navigation/gls.c

  Log Message:
  -----------
  Revert "Merge pull request #309 from TobiasMue/v4.1"

This reverts commit 0e00bf1e234b567d2cba4f39745a5cb6036aecfa, reversing
changes made to 413e0326ed957f2f3e568cb44f6c821fe7e6508b.


  Commit: e120a8ef7c03c6171cc410342a21aff564a4e67c
      
https://github.com/paparazzi/paparazzi/commit/e120a8ef7c03c6171cc410342a21aff564a4e67c
  Author: Tobias Muench <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M sw/airborne/subsystems/navigation/gls.c

  Log Message:
  -----------
  fix due to positive gains in airframe.xml


  Commit: 7627992f3a90e54c8f1512011756993276c9c578
      
https://github.com/paparazzi/paparazzi/commit/7627992f3a90e54c8f1512011756993276c9c578
  Author: Tobias Muench <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M conf/modules/baro_ets.xml
    M sw/airborne/modules/sensors/baro_ets.c

  Log Message:
  -----------
  BARO_ETS_SCALE from airframe.xml


  Commit: a69420cfff62324cdc52992591bb840289e86832
      
https://github.com/paparazzi/paparazzi/commit/a69420cfff62324cdc52992591bb840289e86832
  Author: Tobias Muench <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    A conf/firmwares/subsystems/fixedwing/control_energyadaptive.makefile

  Log Message:
  -----------
  new ctl energyadaptive
energy_ctrl.c + stabilisation_adaptive.c


  Commit: d0a5bd41505067b129b9b50edbe8c907936910f2
      
https://github.com/paparazzi/paparazzi/commit/d0a5bd41505067b129b9b50edbe8c907936910f2
  Author: Tobias Muench <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

  Changed paths:
    M conf/settings/control/ctl_energy.xml
    A conf/settings/control/ctl_energyadaptive.xml
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.h

  Log Message:
  -----------
  some additional for the energy_ctl

groundspeedprotection
no v_ctl_airspeed_setpoint below STALL_AIRSPEED
use of V_CTL_ALTITUDE_MAX_CLIMB
and
V_CTLAUTO_PITCH_AIRSPEED_gains can be set from airframe.xml

settings file for energyadaptive
energyadaptive.xml


Compare: 
https://github.com/paparazzi/paparazzi/compare/0e00bf1e234b...d0a5bd415050