[paparazzi-commits] [paparazzi/paparazzi] a5032d: [nps] don't bypass ahrs by default

[GitHub]

  Branch: refs/heads/ahrs_int_cmpl_quat_correction_scaling
  Home:   https://github.com/paparazzi/paparazzi
  Commit: a5032dd7ca4f6a406e0cd8e771224175ebf652a9
      
https://github.com/paparazzi/paparazzi/commit/a5032dd7ca4f6a406e0cd8e771224175ebf652a9
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M sw/simulator/nps/nps_autopilot_rotorcraft.c

  Log Message:
  -----------
  [nps] don't bypass ahrs by default

By default use the result of the normal ahrs estimation,
if you want to bypass that and use the attitude from NPS define NPS_BYPASS_AHRS 
to TRUE.


  Commit: 28b2b1ef2dd258f54278770e5c26c8d47e608efe
      
https://github.com/paparazzi/paparazzi/commit/28b2b1ef2dd258f54278770e5c26c8d47e608efe
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M conf/messages.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  [rotorcraft][messages] GUIDANCE_H_INT message


  Commit: 4e41b4845bce2b9023ec24785055d38be201e7cd
      
https://github.com/paparazzi/paparazzi/commit/4e41b4845bce2b9023ec24785055d38be201e7cd
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/booz2_flixr.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1-vision.xml
    M conf/firmwares/lisa_passthrough.makefile
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec.makefile
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/firmwares/subsystems/shared/actuators_skiron.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
    M conf/messages.xml
    M conf/modules/sonar_adc.xml
    A conf/modules/sonar_adc_ins.xml
    R conf/modules/sonar_maxbotix_booz.xml
    M conf/settings/control/rotorcraft_guidance.xml
    M conf/telemetry/default_rotorcraft.xml
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/mcu.c
    M sw/airborne/modules/config/config_mkk_v2.c
    M sw/airborne/state.h
    M sw/airborne/subsystems/actuators/actuators_asctec.c
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk_v2.c
    M sw/airborne/subsystems/actuators/actuators_skiron.c
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu/imu_aspirin.c
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    M sw/ext/luftboot
    M sw/logalizer/Makefile
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/supervision/pc_control_panel.ml
    M sw/tools/dfu/dfu.py
    M sw/tools/dfu/stm32_mem.py

  Log Message:
  -----------
  Merge branch 'master' into ahrs_int_cmpl_quat_correction_scaling

relevant fixes/features from master:
- don't bypass normal ahrs estimation in NPS by default
- use horizontal guidance ref by default (and for HOVER mode)
- abs(c_route) and abs(s_route) instead of abs(route) in north and east route 
components calculation


Compare: 
https://github.com/paparazzi/paparazzi/compare/e9e5109700b5...4e41b4845bce