paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] ffd501: added kill_throttle ag


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] ffd501: added kill_throttle again, is needed because the k...
Date: Tue, 10 Apr 2012 14:03:29 -0700

  Branch: refs/heads/dev_i2c
  Home:   https://github.com/paparazzi/paparazzi
  Commit: ffd501a74461d0ad1d9034ea9ff4905d70e1c9bc
      
https://github.com/paparazzi/paparazzi/commit/ffd501a74461d0ad1d9034ea9ff4905d70e1c9bc
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M conf/settings/settings_booz2.xml
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/firmwares/rotorcraft/autopilot_arming_switch.h

  Log Message:
  -----------
  added kill_throttle again, is needed because the kill button in the GCS is 
connected to the kill_throttle setting


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  rotorcraft: make it the default to go into kill mode until ahrs is aligned
to be able to change the mode via RC if the AHRS is not yet aligned, define 
AUTOPILOT_DISABLE_AHRS_KILL


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

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

  Log Message:
  -----------
  rotorcraft AUTOPILOT_ARMING_THROTTLE: added a small counter/delay for 
arming/unarming via throttle


  Commit: 6c2d32afc1962f4e74cfc6ec72af898139230fe4
      
https://github.com/paparazzi/paparazzi/commit/6c2d32afc1962f4e74cfc6ec72af898139230fe4
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M conf/boards/lisa_m_2.0.makefile
  M sw/airborne/boards/lisa_m_1.0.h
  A sw/airborne/boards/lisa_m_2.0.h

  Log Message:
  -----------
  added lisa_m_2.0 header file and some ADC defines and corrections for lisa/m


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  rotorcraft arming: also prevent switching motors on via settings/GCS if AHRS 
is not aligned (unless AUTOPILOT_DISABLE_AHRS_KILL is defined)


  Commit: 12613b39bc68380c91832889f23ac94e2858ecd2
      
https://github.com/paparazzi/paparazzi/commit/12613b39bc68380c91832889f23ac94e2858ecd2
  Author: Thomas Kolb <address@hidden>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

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

  Log Message:
  -----------
  Make bat_checker configurable via airframe file


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

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml

  Log Message:
  -----------
  minor updates for fraser airframe


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

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

  Log Message:
  -----------
  rotorcraft vertical guidance: set altitude setpoint on hover mode entry, also 
set vert speed setpoint to zero when entering climb mode


  Commit: f2a901bac54e418589596aff9e31f7d24a35e177
      
https://github.com/paparazzi/paparazzi/commit/f2a901bac54e418589596aff9e31f7d24a35e177
  Author: bartremes <address@hidden>
  Date:   2012-04-10 (Tue, 10 Apr 2012)

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

  Log Message:
  -----------
  GUIDANCE_V_GAIN_SCALER Caused overflow in vertical d and i gain


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

  Changed paths:
    M sw/airborne/subsystems/ins.c

  Log Message:
  -----------
  rotorcraft INS: fix ins_ltp_accel.z if VFF is not used or baro not running


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

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

  Log Message:
  -----------
  rotorcraft vertical guidance: when INV_M is defined, use FF_CMD_FRAC instead 
of GV_ADAPT_X_FRAC to convert to BFP representation
no functional change, as both are 18 right now anyway


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

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

  Log Message:
  -----------
  rotorcraft vertical guidance: set a nominal hover throttle instead of INV_M 
if you don't want to use adaptive nominal throttle estimation
define GUIDANCE_V_NOMINAL_HOVER_THROTTLE in your airframe file to use it. it 
has a range of 0-9600 (just like the throttle command)


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/autopilot.c

  Log Message:
  -----------
  fix ahrs_is_aligned()


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

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

  Log Message:
  -----------
  renamed AUTOPILOT_ARMING_x to USE_x_FOR_MOTOR_ARMING


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

  Changed paths:
    A conf/modules/bat_checker.xml
  M sw/airborne/boards/lisa_m_1.0.h
  A sw/airborne/modules/bat_checker/bat_checker.c
  A sw/airborne/modules/bat_checker/bat_checker.h

  Log Message:
  -----------
  Merge pull request #173 from cfr34k/bat_checker

Battery warning module


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

  Changed paths:
    A conf/modules/bat_checker.xml
  M sw/airborne/boards/lisa_m_1.0.h
  A sw/airborne/modules/bat_checker/bat_checker.c
  A sw/airborne/modules/bat_checker/bat_checker.h

  Log Message:
  -----------
  Merge branch 'master' into dev
* adds battery checker module


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

  Changed paths:
    R conf/modules/battery_buzzer.xml
  R sw/airborne/modules/battery_buzzer/battery_buzzer.c
  R sw/airborne/modules/battery_buzzer/battery_buzzer.h

  Log Message:
  -----------
  removed battery_buzzer module, replaced by the more generic bat_checker module


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

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

  Log Message:
  -----------
  really use the nominal_throttle var instead of the define, warn if INV_M is 
still defined


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

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/settings/settings_booz2.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h

  Log Message:
  -----------
  set nominal hover throttle in %


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

  Changed paths:
    M conf/settings/settings_booz2.xml

  Log Message:
  -----------
  added the alt_unit_coef for the nominal throttle setting


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

  Changed paths:
    M conf/settings/settings_booz2.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h

  Log Message:
  -----------
  fix setting of nominal hover throttle


  Commit: 63b24edbd6e605762ca2edd6058dc679aedd995a
      
https://github.com/paparazzi/paparazzi/commit/63b24edbd6e605762ca2edd6058dc679aedd995a
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-10 (Tue, 10 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
  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
  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

  Log Message:
  -----------
  a little rotorcraft airframe cleaning


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

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
  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

  Log Message:
  -----------
  Merge pull request #174 from flixr/rotorcraft_arming

* never start the motors if AHRS is not aligned (disable it with 
AUTOPILOT_DISABLE_AHRS_KILL)
* if USE_KILL_SWITCH_FOR_MOTOR_ARMING is defined (to 1):
  * switch kill switch off to arm the motors
  * if kill switch is off during startup, you need to kill again first, then 
unkill to start
  * throttle needs to be down, other sticks centered to start motors
  * need to be in manual mode to start the motors
* if USE_THROTTLE_FOR_MOTOR_ARMING is defined (to 1):
  * automatically start motors when applying throttle
  * if throttle was not down at startup, you need to put throttle down again 
first
  * other sticks need to be centered to start motors
  * need to be in manual mode to start the motors
* else the "default" arming sequence with the yaw-stick-to-the-corner is used
* if you have a RADIO_KILL_SWITCH defined, it it will be used to go into kill 
mode, regardless of what motor arming option is used


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

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/settings/settings_booz2.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h

  Log Message:
  -----------
  Merge pull request #177 from flixr/rotorcraft_nominal_throttle

Easier setting of a fixed nominal throttle command if one doesn't want to use 
the adaptive vertical filter.
Define GUIDANCE_V_NOMINAL_HOVER_THROTTLE (in percent), otherwise the adaptive 
hover is used.
You can also use settings to tune it.


  Commit: d2071871849e1162466e01b2196442317e3f5ec2
      
https://github.com/paparazzi/paparazzi/commit/d2071871849e1162466e01b2196442317e3f5ec2
  Author: Felix Ruess <address@hidden>
  Date:   2012-04-10 (Tue, 10 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
  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
  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
  R conf/modules/battery_buzzer.xml
  M conf/settings/settings_booz2.xml
  M sw/airborne/boards/lisa_m_1.0.h
  A sw/airborne/boards/lisa_m_2.0.h
  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
  A sw/airborne/modules/bat_checker/bat_checker.c
  A sw/airborne/modules/bat_checker/bat_checker.h
  R sw/airborne/modules/battery_buzzer/battery_buzzer.c
  R sw/airborne/modules/battery_buzzer/battery_buzzer.h
  M sw/airborne/subsystems/ins.c

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


Compare: https://github.com/paparazzi/paparazzi/compare/fff541d...d207187

reply via email to

[Prev in Thread] Current Thread [Next in Thread]