[paparazzi-commits] [paparazzi/paparazzi] 985ebd: - fix in GLS due to positive gains

[GitHub]

  Branch: refs/heads/v4.1
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 985ebdacb7fdf974f1db19fa54c13736defb4881
      
https://github.com/paparazzi/paparazzi/commit/985ebdacb7fdf974f1db19fa54c13736defb4881
  Author: Tobias Muench <address@hidden>
  Date:   2012-09-30 (Sun, 30 Sep 2012)

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

  Log Message:
  -----------
  - fix in GLS due to positive gains
- new vertical controll "energyadaptive"
  -energy ctl from TUDelft+adaptive stabilisation with some additionals
  -grounspeed protection
  -predefined values


  Commit: 65078f37849fdbb3ea793f3db10baa05d515d70e
      
https://github.com/paparazzi/paparazzi/commit/65078f37849fdbb3ea793f3db10baa05d515d70e
  Author: Tobias Muench <address@hidden>
  Date:   2012-09-30 (Sun, 30 Sep 2012)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl_add.h

  Log Message:
  -----------
  fix due to guidance_common.h


  Commit: 0e00bf1e234b567d2cba4f39745a5cb6036aecfa
      
https://github.com/paparazzi/paparazzi/commit/0e00bf1e234b567d2cba4f39745a5cb6036aecfa
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-10-24 (Wed, 24 Oct 2012)

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

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

V4.1


Compare: 
https://github.com/paparazzi/paparazzi/compare/413e0326ed95...0e00bf1e234b