paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [paparazzi/paparazzi] 554585: [ahrs] int_cmpl_quat:


From: GitHub
Subject: [paparazzi-commits] [paparazzi/paparazzi] 554585: [ahrs] int_cmpl_quat: scale the correction in upda...
Date: Fri, 11 Oct 2013 06:12:08 -0700

  Branch: refs/heads/master
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 5545851d20e4c91195db2edec7c7356bb29ace27
      
https://github.com/paparazzi/paparazzi/commit/5545851d20e4c91195db2edec7c7356bb29ace27
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/conf.xml.example
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M conf/tests_conf.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: scale the correction in update_accel with 
AHRS_CORRECT_FREQUENCY
Allow tuning of the rate and bias gains.
Scaling correction by AHRS_CORRECT_FREQUENCY should also give you
roughly correct tuning for 100Hz fixedwings, see #240.


  Commit: 3ebef3b50bf4f7208483120a3f4ef22dfdb463a7
      
https://github.com/paparazzi/paparazzi/commit/3ebef3b50bf4f7208483120a3f4ef22dfdb463a7
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: lower correction from accel update
double gain scale to allow for a nicer range of the gains


  Commit: fa8c283d63282e597180bfc3446663eeeeeb20ee
      
https://github.com/paparazzi/paparazzi/commit/fa8c283d63282e597180bfc3446663eeeeeb20ee
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: some more adjustable correction gains
not tested in flight yet...


  Commit: 3375ffe4a9c9b12ab7efc795fa11dd21c926d339
      
https://github.com/paparazzi/paparazzi/commit/3375ffe4a9c9b12ab7efc795fa11dd21c926d339
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: use signed integers for correction scaling
beware of the usual arithmetic conversions!!


  Commit: 6f33b8364c5e933176e46245bd4941646c49d527
      
https://github.com/paparazzi/paparazzi/commit/6f33b8364c5e933176e46245bd4941646c49d527
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/hen1.xml
    M conf/firmwares/subsystems/shared/imu_navgo.makefile
    M sw/airborne/boards/navgo/imu_navgo.c

  Log Message:
  -----------
  [imu] default settings for navgo imu


  Commit: b26a15799aaa667f7b4b9f9802ed4169e5cb11fc
      
https://github.com/paparazzi/paparazzi/commit/b26a15799aaa667f7b4b9f9802ed4169e5cb11fc
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: always run FIR on pseudo_gravity_measurement
so it doesn't misbehave if you switch the gravity heuristic off in between


  Commit: 5fdbf28abbb9fbce58ef8aff01bb2b28c60c10d5
      
https://github.com/paparazzi/paparazzi/commit/5fdbf28abbb9fbce58ef8aff01bb2b28c60c10d5
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: use linear instead of hyperbolic weight in gravity 
heuristic


  Commit: 970c3037ff55e7fd7faceba74f0ceadb263487ee
      
https://github.com/paparazzi/paparazzi/commit/970c3037ff55e7fd7faceba74f0ceadb263487ee
  Author: Felix Ruess <address@hidden>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: turn on gravity heuristic by default


  Commit: f7dc61a7641d57345a716ec0571a6644577cb8e7
      
https://github.com/paparazzi/paparazzi/commit/f7dc61a7641d57345a716ec0571a6644577cb8e7
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-03-08 (Fri, 08 Mar 2013)

  Changed paths:
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  scaling rate with weight, scaling bias with weight*weight. accel filter 
parameters are now cut-off frequency and damping instead of gains. Defaults 
values set to 100 s response time.


  Commit: fe1cd22b5af647889221d8fc0a7d5560c04fb259
      
https://github.com/paparazzi/paparazzi/commit/fe1cd22b5af647889221d8fc0a7d5560c04fb259
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M Makefile.ac
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/examples/microjet_lisa_m.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
    A conf/firmwares/subsystems/rotorcraft/stabilization_float_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/messages.xml
    A conf/modules/airspeed_otf.xml
    M conf/modules/imu_quality_assessment.xml
    M conf/modules/mag_hmc5843.xml
    M conf/modules/sonar_adc.xml
    M conf/settings/modules/imu_quality_assessment.xml
    M conf/settings/rotorcraft_basic.xml
    A conf/system/launcher/Paparazzi.desktop
    A conf/system/launcher/logo.png
    A conf/system/launcher/readme.txt
    M conf/system/udev/rules/50-paparazzi.rules
    M conf/units.xml
    M sw/airborne/Makefile
    M sw/airborne/arch/sim/ivy_transport.h
    M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    M sw/airborne/boards/tiny_0.99.h
    M sw/airborne/boards/tiny_1.1.h
    M sw/airborne/boards/tiny_2.0.h
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/i2c.h
    M sw/airborne/modules/benchmark/imu_quality_assessment.c
    M sw/airborne/modules/benchmark/imu_quality_assessment.h
    M sw/airborne/modules/gain_scheduling/gain_scheduling.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/ir_mlx.h
    M sw/airborne/modules/optical_flow/px4flow.c
    A sw/airborne/modules/sensors/airspeed_otf.c
    A sw/airborne/modules/sensors/airspeed_otf.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    A sw/airborne/modules/sensors/met_module.h
    M sw/airborne/modules/sonar/sonar_adc.c
    M sw/airborne/modules/sonar/sonar_adc.h
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.h
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_sim.c
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    M sw/ground_segment/cockpit/compass.ml
    M sw/ground_segment/cockpit/editFP.ml
    M sw/ground_segment/cockpit/gcs.ml
    M sw/ground_segment/cockpit/horizon.ml
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/map2d.ml
    M sw/ground_segment/cockpit/page_settings.ml
    M sw/ground_segment/cockpit/pages.ml
    M sw/ground_segment/cockpit/papgets.ml
    M sw/ground_segment/cockpit/particules.ml
    M sw/ground_segment/cockpit/saveSettings.ml
    M sw/ground_segment/cockpit/sectors.ml
    M sw/ground_segment/cockpit/speech.ml
    M sw/ground_segment/cockpit/strip.ml
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/multimon/test_gen_hdlc.ml
    M sw/ground_segment/python/messages_app/messagesframe.py
    M sw/ground_segment/tmtc/150m.ml
    M sw/ground_segment/tmtc/aircraft.ml
    M sw/ground_segment/tmtc/airprox.ml
    M sw/ground_segment/tmtc/broadcaster.ml
    M sw/ground_segment/tmtc/dia.ml
    M sw/ground_segment/tmtc/diadec.ml
    M sw/ground_segment/tmtc/fw_server.ml
    M sw/ground_segment/tmtc/ihm.ml
    M sw/ground_segment/tmtc/ivy2udp.ml
    M sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
    M sw/ground_segment/tmtc/ivy_tcp_controller.ml
    M sw/ground_segment/tmtc/kml.ml
    M sw/ground_segment/tmtc/link.ml
    M sw/ground_segment/tmtc/messages.ml
    M sw/ground_segment/tmtc/modem.ml
    M sw/ground_segment/tmtc/rotorcraft_server.ml
    M sw/ground_segment/tmtc/server.ml
    M sw/ground_segment/tmtc/server_globals.ml
    M sw/ground_segment/tmtc/settings.ml
    M sw/ground_segment/tmtc/stereo_demod.ml
    M sw/ground_segment/tmtc/wind.ml
    M sw/lib/ocaml/base64.ml
    M sw/lib/ocaml/debug.ml
    M sw/lib/ocaml/defivybus.ml
    M sw/lib/ocaml/editAirframe.ml
    M sw/lib/ocaml/env.ml
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/extXml.ml
    M sw/lib/ocaml/fig.ml
    M sw/lib/ocaml/geometry_2d.ml
    M sw/lib/ocaml/geometry_3d.ml
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/gm.mli
    M sw/lib/ocaml/gtk_3d.ml
    M sw/lib/ocaml/gtk_draw.ml
    M sw/lib/ocaml/gtk_image.ml
    M sw/lib/ocaml/gtk_tools.ml
    M sw/lib/ocaml/gtk_tools.mli
    M sw/lib/ocaml/gtk_tools_GL.ml
    M sw/lib/ocaml/gtk_tools_icons.ml
    M sw/lib/ocaml/gtkgl_Hack.ml
    M sw/lib/ocaml/http.ml
    M sw/lib/ocaml/iGN.ml
    M sw/lib/ocaml/latlong.ml
    M sw/lib/ocaml/logpprz.ml
    M sw/lib/ocaml/mapCanvas.ml
    M sw/lib/ocaml/mapCanvas.mli
    M sw/lib/ocaml/mapFP.ml
    M sw/lib/ocaml/mapGoogle.ml
    M sw/lib/ocaml/mapGoogle.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/ocaml_tools.ml
    M sw/lib/ocaml/os_calls.ml
    M sw/lib/ocaml/papget.ml
    M sw/lib/ocaml/papget_common.ml
    M sw/lib/ocaml/papget_renderer.ml
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/serial.ml
    M sw/lib/ocaml/srtm.ml
    M sw/lib/ocaml/ubx.ml
    M sw/lib/ocaml/wind_sock.ml
    M sw/lib/ocaml/xbee.ml
    M sw/lib/ocaml/xml2h.ml
    M sw/lib/ocaml/xmlCom.ml
    M sw/lib/ocaml/xmlEdit.ml
    M sw/lib/ocaml/xml_get.ml
    M sw/lib/python/messages_tool.py
    M sw/lib/python/messages_xml_map.py
    M sw/lib/python/settings_tool.py
    M sw/lib/python/settings_xml_parse.py
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/find_free_msg_id.ml
    M sw/tools/fp_proc.ml
    M sw/tools/gen_abi.ml
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_autopilot.ml
    M sw/tools/gen_common.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_messages.ml
    M sw/tools/gen_messages2.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_mtk.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_radio.ml
    M sw/tools/gen_settings.ml
    M sw/tools/gen_srtm.ml
    M sw/tools/gen_ubx.ml
    M sw/tools/gen_xsens.ml

  Log Message:
  -----------
  merge with master


  Commit: 28eaceb2a0bb9ac36e26f8fffefadc249f2e184d
      
https://github.com/paparazzi/paparazzi/commit/28eaceb2a0bb9ac36e26f8fffefadc249f2e184d
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M conf/messages.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  complementary filter accel and mag cutt-off frequency and damping in physical 
units, accel weight sent to telemetry


  Commit: f39cc5c25b7e58c7cc939ad129fbfce14aafa770
      
https://github.com/paparazzi/paparazzi/commit/f39cc5c25b7e58c7cc939ad129fbfce14aafa770
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-03-29 (Fri, 29 Mar 2013)

  Changed paths:
    M conf/messages.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: physical units

- accel and mag cutt-off frequency and damping in physical units
- accel weight sent to telemetry


  Commit: 2b712a1b51663313b275d71cbc73c2636fdc8d85
      
https://github.com/paparazzi/paparazzi/commit/2b712a1b51663313b275d71cbc73c2636fdc8d85
  Author: Felix Ruess <address@hidden>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    R Makefile.install
    R conf/Makefile.avr
    M conf/Makefile.sim
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/examples/microjet_lisa_m.xml
    M conf/airframes/examples/microjet_twog_aspirin.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
    A conf/firmwares/subsystems/rotorcraft/stabilization_float_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
    M conf/gps/Makefile
    M conf/messages.xml
    A conf/modules/airspeed_otf.xml
    M conf/modules/imu_quality_assessment.xml
    M conf/modules/mag_hmc5843.xml
    M conf/modules/sonar_adc.xml
    M conf/radios/Corona_24_DIY.xml
    M conf/settings/modules/imu_quality_assessment.xml
    M conf/settings/rotorcraft_basic.xml
    A conf/system/launcher/Paparazzi.desktop
    A conf/system/launcher/logo.png
    A conf/system/launcher/readme.txt
    M conf/system/udev/rules/50-paparazzi.rules
    M conf/units.xml
    M data/maps/Makefile
    R debian/changelog.etch
    R debian/changelog.hardy
    R debian/changelog.lenny
    R debian/changelog.sarge
    R debian/changelog.sid
    R debian/changelog.squeeze
    R debian/compat
    R debian/control.etch
    R debian/control.hardy
    R debian/control.lenny
    R debian/control.sarge
    R debian/control.sid
    R debian/control.squeeze
    R debian/paparazzi-bin.postinst
    R debian/paparazzi-bin.prerm
    R debian/paparazzi.desktop
    R debian/rules
    R debian/shlibs.local
    M doc/ccc07/Makefile
    M doc/pprz_algebra/Makefile
    M doc/pprz_geodetic/Makefile
    A sw/Makefile.ocaml
    M sw/airborne/Makefile
    R sw/airborne/arch/avr/ahrs_asm.S
    R sw/airborne/arch/avr/ant_h_bridge.c
    R sw/airborne/arch/avr/ant_h_bridge.h
    R sw/airborne/arch/avr/ant_servo.c
    R sw/airborne/arch/avr/ant_servo.h
    R sw/airborne/arch/avr/ant_spi.c
    R sw/airborne/arch/avr/ant_spi.h
    R sw/airborne/arch/avr/ant_tracker.c
    R sw/airborne/arch/avr/ant_tracker.h
    R sw/airborne/arch/avr/ant_v2x.c
    R sw/airborne/arch/avr/ant_v2x.h
    R sw/airborne/arch/avr/dc_mc_link.c
    R sw/airborne/arch/avr/dc_mc_link.h
    R sw/airborne/arch/avr/dc_mc_power.c
    R sw/airborne/arch/avr/dc_mc_power.h
    R sw/airborne/arch/avr/gpio.h
    R sw/airborne/arch/avr/interrupt_hw.h
    R sw/airborne/arch/avr/led_hw.h
    R sw/airborne/arch/avr/link_mcu_hw.h
    R sw/airborne/arch/avr/mcu_periph/adc_arch.c
    R sw/airborne/arch/avr/mcu_periph/adc_arch.h
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.c
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.h
    R sw/airborne/arch/avr/mcu_periph/spi_arch.c
    R sw/airborne/arch/avr/mcu_periph/spi_arch.h
    R sw/airborne/arch/avr/mcu_periph/uart_arch.c
    R sw/airborne/arch/avr/mcu_periph/uart_arch.h
    R sw/airborne/arch/avr/ppm_hw.c
    R sw/airborne/arch/avr/ppm_hw.h
    R sw/airborne/arch/avr/servos_4017.c
    R sw/airborne/arch/avr/servos_4017.h
    R sw/airborne/arch/avr/servos_direct_hw.c
    R sw/airborne/arch/avr/servos_direct_hw.h
    R sw/airborne/arch/avr/servos_esc_hw.c
    R sw/airborne/arch/avr/servos_esc_hw.h
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
    R sw/airborne/arch/avr/sys_time_hw.c
    R sw/airborne/arch/avr/sys_time_hw.h
    R sw/airborne/arch/avr/uart_tunnel.c
    M sw/airborne/arch/lpc21/lpcusb/examples/Makefile
    M sw/airborne/arch/lpc21/test/bootloader/Makefile
    M sw/airborne/arch/sim/ivy_transport.h
    M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    M sw/airborne/boards/tiny_0.99.h
    M sw/airborne/boards/tiny_1.1.h
    M sw/airborne/boards/tiny_2.0.h
    M sw/airborne/booz/test/Makefile
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/non_ap/led_flasher/Makefile
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/firmwares/vor/Makefile
    M sw/airborne/fms/Makefile
    M sw/airborne/fms/libeknav/Makefile
    M sw/airborne/math/Makefile
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/i2c.h
    M sw/airborne/modules/benchmark/imu_quality_assessment.c
    M sw/airborne/modules/benchmark/imu_quality_assessment.h
    M sw/airborne/modules/config/config_mkk_v2.h
    M sw/airborne/modules/gain_scheduling/gain_scheduling.c
    M sw/airborne/modules/gps/gps_ubx_ucenter.c
    M sw/airborne/modules/ins/ins_xsens.c
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
    M sw/airborne/modules/meteo/ir_mlx.c
    M sw/airborne/modules/meteo/ir_mlx.h
    M sw/airborne/modules/optical_flow/px4flow.c
    A sw/airborne/modules/sensors/airspeed_otf.c
    A sw/airborne/modules/sensors/airspeed_otf.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    A sw/airborne/modules/sensors/met_module.h
    M sw/airborne/modules/sonar/sonar_adc.c
    M sw/airborne/modules/sonar/sonar_adc.h
    A sw/airborne/peripherals/l3g4200.c
    A sw/airborne/peripherals/l3g4200.h
    A sw/airborne/peripherals/l3g4200_regs.h
    M sw/airborne/peripherals/ms5611.h
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
    M sw/airborne/subsystems/actuators/actuators_asctec_v2.h
    M sw/airborne/subsystems/actuators/actuators_mkk.c
    M sw/airborne/subsystems/actuators/actuators_mkk.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_sim.c
    M sw/airborne/subsystems/imu/imu_aspirin2.c
    M sw/airborne/test/Makefile
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/compass.ml
    M sw/ground_segment/cockpit/editFP.ml
    M sw/ground_segment/cockpit/gcs.ml
    M sw/ground_segment/cockpit/horizon.ml
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/map2d.ml
    M sw/ground_segment/cockpit/page_settings.ml
    M sw/ground_segment/cockpit/pages.ml
    M sw/ground_segment/cockpit/papgets.ml
    M sw/ground_segment/cockpit/particules.ml
    M sw/ground_segment/cockpit/saveSettings.ml
    M sw/ground_segment/cockpit/sectors.ml
    M sw/ground_segment/cockpit/speech.ml
    M sw/ground_segment/cockpit/strip.ml
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/misc/Makefile
    M sw/ground_segment/misc/davis2ivy.c
    R sw/ground_segment/modem/Makefile
    R sw/ground_segment/modem/README
    R sw/ground_segment/modem/adc.c
    R sw/ground_segment/modem/adc.h
    R sw/ground_segment/modem/link_tmtc.h
    R sw/ground_segment/modem/main.c
    R sw/ground_segment/modem/soft_uart.c
    R sw/ground_segment/modem/soft_uart.h
    R sw/ground_segment/modem/timer.h
    R sw/ground_segment/modem/uart.c
    R sw/ground_segment/modem/uart.h
    M sw/ground_segment/multimon/Makefile
    M sw/ground_segment/multimon/test_gen_hdlc.ml
    M sw/ground_segment/python/log_annotate.py
    M sw/ground_segment/python/messages_app/messagesframe.py
    M sw/ground_segment/python/onboard_log_transform.py
    M sw/ground_segment/python/real_time_plot/messagepicker.py
    M sw/ground_segment/python/real_time_plot/plotframe.py
    M sw/ground_segment/python/real_time_plot/plotpanel.py
    M sw/ground_segment/python/real_time_plot/realtimeplotapp.py
    M sw/ground_segment/python/real_time_plot/textdroptarget.py
    M sw/ground_segment/python/settings_app/settingsapp.py
    M sw/ground_segment/python/settings_app/settingsframe.py
    M sw/ground_segment/tmtc/150m.ml
    M sw/ground_segment/tmtc/GSM/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/ground_segment/tmtc/aircraft.ml
    M sw/ground_segment/tmtc/airprox.ml
    M sw/ground_segment/tmtc/broadcaster.ml
    M sw/ground_segment/tmtc/dia.ml
    M sw/ground_segment/tmtc/diadec.ml
    M sw/ground_segment/tmtc/fw_server.ml
    M sw/ground_segment/tmtc/ihm.ml
    M sw/ground_segment/tmtc/ivy2udp.ml
    M sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
    M sw/ground_segment/tmtc/ivy_tcp_controller.ml
    M sw/ground_segment/tmtc/kml.ml
    M sw/ground_segment/tmtc/link.ml
    M sw/ground_segment/tmtc/messages.ml
    M sw/ground_segment/tmtc/modem.ml
    M sw/ground_segment/tmtc/rotorcraft_server.ml
    M sw/ground_segment/tmtc/server.ml
    M sw/ground_segment/tmtc/server_globals.ml
    M sw/ground_segment/tmtc/settings.ml
    M sw/ground_segment/tmtc/stereo_demod.ml
    M sw/ground_segment/tmtc/wind.ml
    M sw/in_progress/button/Makefile
    M sw/in_progress/fdm/Makefile
    M sw/in_progress/inertial/C/Makefile
    M sw/in_progress/ir_calibration/Makefile
    M sw/in_progress/ir_usb_i2c/Makefile
    M sw/in_progress/log_parser/Makefile
    M sw/in_progress/motor_bench/Makefile
    M sw/in_progress/satcom/Makefile
    M sw/in_progress/turbine/Makefile
    M sw/in_progress/wind_tunnel/Makefile
    A sw/lib/ocaml/META.pprz.deb
    A sw/lib/ocaml/META.pprz.osx
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/base64.ml
    M sw/lib/ocaml/debug.ml
    M sw/lib/ocaml/defivybus.ml
    M sw/lib/ocaml/editAirframe.ml
    M sw/lib/ocaml/env.ml
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/extXml.ml
    M sw/lib/ocaml/fig.ml
    M sw/lib/ocaml/geometry_2d.ml
    M sw/lib/ocaml/geometry_3d.ml
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/gm.mli
    M sw/lib/ocaml/gtk_3d.ml
    M sw/lib/ocaml/gtk_draw.ml
    M sw/lib/ocaml/gtk_image.ml
    M sw/lib/ocaml/gtk_tools.ml
    M sw/lib/ocaml/gtk_tools.mli
    M sw/lib/ocaml/gtk_tools_GL.ml
    M sw/lib/ocaml/gtk_tools_icons.ml
    M sw/lib/ocaml/gtkgl_Hack.ml
    M sw/lib/ocaml/http.ml
    M sw/lib/ocaml/iGN.ml
    M sw/lib/ocaml/latlong.ml
    M sw/lib/ocaml/logpprz.ml
    M sw/lib/ocaml/mapCanvas.ml
    M sw/lib/ocaml/mapCanvas.mli
    M sw/lib/ocaml/mapFP.ml
    M sw/lib/ocaml/mapGoogle.ml
    M sw/lib/ocaml/mapGoogle.mli
    M sw/lib/ocaml/mapTrack.ml
    M sw/lib/ocaml/mapWaypoints.ml
    M sw/lib/ocaml/ocaml_tools.ml
    M sw/lib/ocaml/os_calls.ml
    M sw/lib/ocaml/papget.ml
    M sw/lib/ocaml/papget_common.ml
    M sw/lib/ocaml/papget_renderer.ml
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/serial.ml
    M sw/lib/ocaml/srtm.ml
    M sw/lib/ocaml/ubx.ml
    M sw/lib/ocaml/wind_sock.ml
    M sw/lib/ocaml/xbee.ml
    M sw/lib/ocaml/xml2h.ml
    M sw/lib/ocaml/xmlCom.ml
    M sw/lib/ocaml/xmlEdit.ml
    M sw/lib/ocaml/xml_get.ml
    M sw/lib/python/messages_tool.py
    M sw/lib/python/messages_xml_map.py
    M sw/lib/python/settings_tool.py
    M sw/lib/python/settings_xml_parse.py
    M sw/logalizer/Makefile
    M sw/logalizer/matlab/Makefile
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_ivy.c
    M sw/simulator/old_booz/tests/Makefile
    M sw/simulator/scilab/q3d/Makefile
    M sw/simulator/scilab/q3d/fonts/Makefile
    M sw/simulator/scilab/q3d/povray/Makefile
    M sw/simulator/scilab/q6d/povray/Makefile
    M sw/simulator/sim_ac_fw.c
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/Makefile
    M sw/tools/find_free_msg_id.ml
    M sw/tools/fp_proc.ml
    M sw/tools/gen_abi.ml
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_autopilot.ml
    M sw/tools/gen_common.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_messages.ml
    M sw/tools/gen_messages2.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_mtk.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_radio.ml
    M sw/tools/gen_settings.ml
    M sw/tools/gen_srtm.ml
    M sw/tools/gen_ubx.ml
    M sw/tools/gen_xsens.ml
    M sw/tools/wiki_gen/Makefile
    M tests/Makefile

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

get latest code for testing, relevant fixes from master:
- horizontal guidance fixes
- use normal stabilization subsystem in NPS, was always euler in NPS before


  Commit: fae69bd8c6f18d8fc1c86f7ffbee483ee43b74bf
      
https://github.com/paparazzi/paparazzi/commit/fae69bd8c6f18d8fc1c86f7ffbee483ee43b74bf
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    R Makefile.install
    R conf/Makefile.avr
    M conf/Makefile.sim
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/gps/Makefile
    M conf/modules/airspeed_otf.xml
    M conf/radios/Corona_24_DIY.xml
    M data/maps/Makefile
    R debian/changelog.etch
    R debian/changelog.hardy
    R debian/changelog.lenny
    R debian/changelog.sarge
    R debian/changelog.sid
    R debian/changelog.squeeze
    R debian/compat
    R debian/control.etch
    R debian/control.hardy
    R debian/control.lenny
    R debian/control.sarge
    R debian/control.sid
    R debian/control.squeeze
    R debian/paparazzi-bin.postinst
    R debian/paparazzi-bin.prerm
    R debian/paparazzi.desktop
    R debian/rules
    R debian/shlibs.local
    M doc/ccc07/Makefile
    M doc/pprz_algebra/Makefile
    M doc/pprz_geodetic/Makefile
    A sw/Makefile.ocaml
    M sw/airborne/Makefile
    R sw/airborne/arch/avr/ahrs_asm.S
    R sw/airborne/arch/avr/ant_h_bridge.c
    R sw/airborne/arch/avr/ant_h_bridge.h
    R sw/airborne/arch/avr/ant_servo.c
    R sw/airborne/arch/avr/ant_servo.h
    R sw/airborne/arch/avr/ant_spi.c
    R sw/airborne/arch/avr/ant_spi.h
    R sw/airborne/arch/avr/ant_tracker.c
    R sw/airborne/arch/avr/ant_tracker.h
    R sw/airborne/arch/avr/ant_v2x.c
    R sw/airborne/arch/avr/ant_v2x.h
    R sw/airborne/arch/avr/dc_mc_link.c
    R sw/airborne/arch/avr/dc_mc_link.h
    R sw/airborne/arch/avr/dc_mc_power.c
    R sw/airborne/arch/avr/dc_mc_power.h
    R sw/airborne/arch/avr/gpio.h
    R sw/airborne/arch/avr/interrupt_hw.h
    R sw/airborne/arch/avr/led_hw.h
    R sw/airborne/arch/avr/link_mcu_hw.h
    R sw/airborne/arch/avr/mcu_periph/adc_arch.c
    R sw/airborne/arch/avr/mcu_periph/adc_arch.h
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.c
    R sw/airborne/arch/avr/mcu_periph/i2c_arch.h
    R sw/airborne/arch/avr/mcu_periph/spi_arch.c
    R sw/airborne/arch/avr/mcu_periph/spi_arch.h
    R sw/airborne/arch/avr/mcu_periph/uart_arch.c
    R sw/airborne/arch/avr/mcu_periph/uart_arch.h
    R sw/airborne/arch/avr/ppm_hw.c
    R sw/airborne/arch/avr/ppm_hw.h
    R sw/airborne/arch/avr/servos_4017.c
    R sw/airborne/arch/avr/servos_4017.h
    R sw/airborne/arch/avr/servos_direct_hw.c
    R sw/airborne/arch/avr/servos_direct_hw.h
    R sw/airborne/arch/avr/servos_esc_hw.c
    R sw/airborne/arch/avr/servos_esc_hw.h
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
    R sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
    R sw/airborne/arch/avr/sys_time_hw.c
    R sw/airborne/arch/avr/sys_time_hw.h
    R sw/airborne/arch/avr/uart_tunnel.c
    M sw/airborne/arch/lpc21/lpcusb/examples/Makefile
    M sw/airborne/arch/lpc21/test/bootloader/Makefile
    M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
    M sw/airborne/booz/test/Makefile
    M sw/airborne/firmwares/non_ap/led_flasher/Makefile
    M sw/airborne/firmwares/vor/Makefile
    M sw/airborne/fms/Makefile
    M sw/airborne/fms/libeknav/Makefile
    M sw/airborne/math/Makefile
    M sw/airborne/modules/config/config_mkk_v2.h
    A sw/airborne/peripherals/l3g4200.c
    A sw/airborne/peripherals/l3g4200.h
    A sw/airborne/peripherals/l3g4200_regs.h
    M sw/airborne/peripherals/ms5611.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
    M sw/airborne/test/Makefile
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/misc/Makefile
    M sw/ground_segment/misc/davis2ivy.c
    R sw/ground_segment/modem/Makefile
    R sw/ground_segment/modem/README
    R sw/ground_segment/modem/adc.c
    R sw/ground_segment/modem/adc.h
    R sw/ground_segment/modem/link_tmtc.h
    R sw/ground_segment/modem/main.c
    R sw/ground_segment/modem/soft_uart.c
    R sw/ground_segment/modem/soft_uart.h
    R sw/ground_segment/modem/timer.h
    R sw/ground_segment/modem/uart.c
    R sw/ground_segment/modem/uart.h
    M sw/ground_segment/multimon/Makefile
    M sw/ground_segment/python/log_annotate.py
    M sw/ground_segment/python/messages_app/messagesframe.py
    M sw/ground_segment/python/onboard_log_transform.py
    M sw/ground_segment/python/real_time_plot/messagepicker.py
    M sw/ground_segment/python/real_time_plot/plotframe.py
    M sw/ground_segment/python/real_time_plot/plotpanel.py
    M sw/ground_segment/python/real_time_plot/realtimeplotapp.py
    M sw/ground_segment/python/real_time_plot/textdroptarget.py
    M sw/ground_segment/python/settings_app/settingsapp.py
    M sw/ground_segment/python/settings_app/settingsframe.py
    M sw/ground_segment/tmtc/GSM/Makefile
    M sw/ground_segment/tmtc/Makefile
    M sw/in_progress/button/Makefile
    M sw/in_progress/fdm/Makefile
    M sw/in_progress/inertial/C/Makefile
    M sw/in_progress/ir_calibration/Makefile
    M sw/in_progress/ir_usb_i2c/Makefile
    M sw/in_progress/log_parser/Makefile
    M sw/in_progress/motor_bench/Makefile
    M sw/in_progress/satcom/Makefile
    M sw/in_progress/turbine/Makefile
    M sw/in_progress/wind_tunnel/Makefile
    A sw/lib/ocaml/META.pprz.deb
    A sw/lib/ocaml/META.pprz.osx
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/gm.ml
    M sw/lib/ocaml/gm.mli
    M sw/lib/ocaml/mapGoogle.ml
    M sw/lib/python/messages_tool.py
    M sw/lib/python/messages_xml_map.py
    M sw/lib/python/settings_tool.py
    M sw/lib/python/settings_xml_parse.py
    M sw/logalizer/Makefile
    M sw/logalizer/matlab/Makefile
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_ivy.c
    M sw/simulator/old_booz/tests/Makefile
    M sw/simulator/scilab/q3d/Makefile
    M sw/simulator/scilab/q3d/fonts/Makefile
    M sw/simulator/scilab/q3d/povray/Makefile
    M sw/simulator/scilab/q6d/povray/Makefile
    M sw/simulator/sim_ac_fw.c
    M sw/supervision/Makefile
    M sw/tools/Makefile
    M sw/tools/wiki_gen/Makefile
    M tests/Makefile

  Log Message:
  -----------
  merge with paparazzi repo


  Commit: 80f1b19686c59072bbb192644ee12d98935c0fc5
      
https://github.com/paparazzi/paparazzi/commit/80f1b19686c59072bbb192644ee12d98935c0fc5
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  feedback_frac corrected for both accel and mag correction, omega and zeta  
nominal and min/max settings adjusted


  Commit: 347d69d63f7cd31ea79a4a54434722ffbfe2a760
      
https://github.com/paparazzi/paparazzi/commit/347d69d63f7cd31ea79a4a54434722ffbfe2a760
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-04-13 (Sat, 13 Apr 2013)

  Changed paths:
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: feedback_frac corrected

- feedback_frac for both accel and mag correction
- omega and zeta  nominal and min/max settings adjusted


  Commit: fce0ddf9e4499ec1aa4fb47e481d2bbefb9a7006
      
https://github.com/paparazzi/paparazzi/commit/fce0ddf9e4499ec1aa4fb47e481d2bbefb9a7006
  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/examples/quadrotor_lisa_m_2_pwm_spektrum.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
- guidance_h gains for Quad_LisaM_2 example


  Commit: a28db8ebec48c3a1db2053a146d9fb49806f6179
      
https://github.com/paparazzi/paparazzi/commit/a28db8ebec48c3a1db2053a146d9fb49806f6179
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-05-27 (Mon, 27 May 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/examples/quadrotor_lisa_m_2_pwm_spektrum.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 'ahrs_int_cmpl_quat_correction_scaling' of 
https://github.com/paparazzi/paparazzi into 
ahrs_int_cmpl_quat_correction_scaling


  Commit: f45bfc29da5b52a0b62f260052588daf7fcb25ff
      
https://github.com/paparazzi/paparazzi/commit/f45bfc29da5b52a0b62f260052588daf7fcb25ff
  Author: Loic Drumettaz <address@hidden>
  Date:   2013-05-27 (Mon, 27 May 2013)

  Changed paths:
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] Complementary filter gains calculated with cut-off frequency and 
damping settings in physical units, scaled with sensors update frequencies, for 
integer and float filters


  Commit: a228981b8a3407ec701943d036a8263ca341574c
      
https://github.com/paparazzi/paparazzi/commit/a228981b8a3407ec701943d036a8263ca341574c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  Merge pull request #448 from Drumettaz/ahrs_int_cmpl_quat_correction_scaling

Ahrs int cmpl quat correction scaling


  Commit: 62d0070eed7a2f4ae7eb9bc92aed1626650e0150
      
https://github.com/paparazzi/paparazzi/commit/62d0070eed7a2f4ae7eb9bc92aed1626650e0150
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-05-28 (Tue, 28 May 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h

  Log Message:
  -----------
  [fix] compilation issue with float cmpl filter


  Commit: db2e73031e964b004c957789fd4a6ad971fb2aff
      
https://github.com/paparazzi/paparazzi/commit/db2e73031e964b004c957789fd4a6ad971fb2aff
  Author: Felix Ruess <address@hidden>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M .gitignore
    M CHANGELOG.md
    M Makefile
    M conf/Makefile.arm-common
    A conf/Makefile.arm-embedded
    A conf/Makefile.arm-embedded-toolchain
    A conf/Makefile.arm-linux
    R conf/Makefile.arm-toolchain
    M conf/Makefile.lpc21
    M conf/Makefile.omap
    M conf/Makefile.sim
    M conf/Makefile.stm32
    M conf/airframes/CDW/DualBoardApFbw.xml
    A conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/tricopter_cdw.xml
    A conf/airframes/ENAC/fixed-wing/apogee.xml
    M conf/airframes/ENAC/fixed-wing/eternity1.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.xml
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    A conf/airframes/ENAC/fixed-wing/quark1.xml
    M conf/airframes/ENAC/fixed-wing/weasel.xml
    M conf/airframes/ENAC/quadrotor/blender.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    A conf/airframes/ardrone2_raw.xml
    A conf/airframes/ardrone2_sdk.xml
    M conf/airframes/booz2_flixr.xml
    M conf/airframes/booz2_ppzuav.xml
    A conf/airframes/esden/calib/asp22-019.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    A conf/airframes/esden/qs_asp22.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/h_hex.xml
    A conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    A conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
    A conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    A conf/airframes/examples/quadshot_asp21_spektrum.xml
    M conf/airframes/examples/separate_fbw_ap.xml
    A conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/flixr_discovery.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/Poine/booz2_a1.xml
    M conf/airframes/obsolete/Poine/booz2_a7.xml
    M conf/airframes/obsolete/Poine/h_hex.xml
    M conf/airframes/obsolete/Poine/test_libeknav.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/example_heli_lisam.xml
    M conf/airframes/obsolete/mm/extra/logger_sd_adc.xml
    M conf/airframes/obsolete/mm/extra/quiet.xml
    M conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
    M conf/airframes/obsolete/mm/rotor/qmk1.xml
    A conf/boards/apogee_0.99.makefile
    A conf/boards/apogee_1.0.makefile
    A conf/boards/ardrone2_raw.makefile
    A conf/boards/ardrone2_sdk.makefile
    A conf/boards/krooz_sd.makefile
    A conf/boards/stm32f4_discovery.makefile
    M conf/conf.xml.example
    M conf/control_panel.xml.example
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/logger.makefile
    M conf/firmwares/rotorcraft.makefile
    A conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile
    R conf/firmwares/subsystems/fixedwing/joystick.makefile
    R conf/firmwares/subsystems/fixedwing/radio_control_datalink.makefile
    M conf/firmwares/subsystems/fixedwing/spi_slave_hs.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_extern_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_lkf.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_mlkf.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    A conf/firmwares/subsystems/rotorcraft/gps_sirf.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    A conf/firmwares/subsystems/rotorcraft/ins_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    A conf/firmwares/subsystems/rotorcraft/stabilization_int_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    A conf/firmwares/subsystems/rotorcraft/stabilization_passthrough.makefile
    A conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
    A conf/firmwares/subsystems/shared/actuators_ardrone2.makefile
    A conf/firmwares/subsystems/shared/imu_apogee.makefile
    A conf/firmwares/subsystems/shared/imu_ardrone2.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
    A conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    A conf/firmwares/subsystems/shared/imu_gl1.makefile
    A conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    A conf/firmwares/subsystems/shared/radio_control_datalink.makefile
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    A conf/firmwares/subsystems/shared/radio_control_sbus.makefile
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
    A conf/flight_plans/rotorcraft_krooz.xml
    A conf/flight_plans/zamboni_survey_test.xml
    A conf/joystick/esky_ek2_0905a.xml
    A conf/joystick/extreme_3d_pro.xml
    A conf/joystick/ms_sidewinder.xml
    A conf/joystick/xbox_gamepad.xml
    M conf/maps.xml.example
    M conf/messages.xml
    M conf/modules/AOA_adc.xml
    M conf/modules/airspeed_amsys.xml
    M conf/modules/airspeed_ets.xml
    M conf/modules/baro_amsys.xml
    M conf/modules/baro_bmp.xml
    M conf/modules/baro_ets.xml
    M conf/modules/baro_ms5611_i2c.xml
    A conf/modules/baro_ms5611_spi.xml
    A conf/modules/gumstix_qr_code_spi_link.xml
    A conf/modules/osd_max7456.xml
    A conf/modules/zamboni_survey.xml
    A conf/radios/T10CG_SBUS.xml
    A conf/radios/Turnigy_9XR.xml
    A conf/radios/mx-16.xml
    M conf/settings/control/ctl_basic.xml
    M conf/settings/control/rotorcraft_guidance.xml
    A conf/settings/control/stabilization_att_float_quat.xml
    M conf/settings/control/stabilization_att_int.xml
    R conf/settings/estimation/booz2_ahrs_lkf.xml
    A conf/system/preferences.d/paparazzi-uav-ppa
    M conf/system/udev/rules/50-paparazzi.rules
    A conf/telemetry/default_ardrone.xml
    M conf/telemetry/default_rotorcraft.xml
    M conf/tests_conf.xml
    M conf/xsens_MTi-G.xml
    M create_module
    M data/maps/Makefile
    A data/pictures/Penguin.gif
    A make-release-tarball.sh
    M paparazzi_version
    R sw/airborne/arch/lpc21/gpio.c
    R sw/airborne/arch/lpc21/gpio.h
    M sw/airborne/arch/lpc21/lpcusb/Makefile
    M sw/airborne/arch/lpc21/mcu_periph/gpio_arch.h
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
    M sw/airborne/arch/lpc21/subsystems/actuators/servos_ppm_hw.h
    M sw/airborne/arch/lpc21/test/bootloader/Makefile
    A sw/airborne/arch/omap/led_hw.h
    A sw/airborne/arch/omap/mcu_arch.c
    A sw/airborne/arch/omap/mcu_arch.h
    A sw/airborne/arch/omap/mcu_periph/i2c_arch.c
    A sw/airborne/arch/omap/mcu_periph/i2c_arch.h
    A sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
    A sw/airborne/arch/omap/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/omap/mcu_periph/uart_arch.c
    M sw/airborne/arch/omap/mcu_periph/uart_arch.h
    A sw/airborne/arch/omap/serial_port.c
    A sw/airborne/arch/omap/serial_port.h
    A sw/airborne/arch/omap/subsystems/settings_arch.c
    A sw/airborne/arch/omap/subsystems/settings_arch.h
    R sw/airborne/arch/sim/gpio.h
    M sw/airborne/arch/sim/jsbsim_hw.c
    M sw/airborne/arch/sim/sim_ap.c
    M sw/airborne/arch/stm32/TIM_usage_list.txt
    A sw/airborne/arch/stm32/apogee.ld
    R sw/airborne/arch/stm32/gpio.h
    A sw/airborne/arch/stm32/krooz.ld
    M sw/airborne/arch/stm32/led_hw.h
    M sw/airborne/arch/stm32/mcu_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
    M sw/airborne/arch/stm32/mcu_periph/adc_arch.h
    M sw/airborne/arch/stm32/mcu_periph/can_arch.c
    A sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
    M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
    M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
    M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.h
    A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
    A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.h
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
    M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
    M sw/airborne/arch/stm32/subsystems/settings_arch.c
    A sw/airborne/boards/apogee/baro_board.c
    A sw/airborne/boards/apogee/baro_board.h
    A sw/airborne/boards/apogee/imu_apogee.c
    A sw/airborne/boards/apogee/imu_apogee.h
    A sw/airborne/boards/apogee_0.99.h
    A sw/airborne/boards/apogee_1.0.h
    A sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    A sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
    A sw/airborne/boards/ardrone/actuators_at.c
    A sw/airborne/boards/ardrone/actuators_at.h
    A sw/airborne/boards/ardrone/at_com.c
    A sw/airborne/boards/ardrone/at_com.h
    A sw/airborne/boards/ardrone/baro_board.c
    A sw/airborne/boards/ardrone/baro_board.h
    A sw/airborne/boards/ardrone/baro_board_dummy.c
    A sw/airborne/boards/ardrone/electrical_dummy.c
    A sw/airborne/boards/ardrone/electrical_raw.c
    A sw/airborne/boards/ardrone/electrical_raw.h
    A sw/airborne/boards/ardrone/gpio_ardrone.c
    A sw/airborne/boards/ardrone/gpio_ardrone.h
    A sw/airborne/boards/ardrone/i2c-dev.h
    A sw/airborne/boards/ardrone/navdata.c
    A sw/airborne/boards/ardrone/navdata.h
    A sw/airborne/boards/ardrone2_raw.h
    A sw/airborne/boards/ardrone2_sdk.h
    A sw/airborne/boards/krooz/baro_board.h
    A sw/airborne/boards/krooz/imu_krooz.c
    A sw/airborne/boards/krooz/imu_krooz.h
    A sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.h
    R sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
    R sw/airborne/boards/lisa_m/baro_ms5611_spi.c
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    A sw/airborne/boards/lisa_m_common.h
    A sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/umarim/imu_umarim.c
    M sw/airborne/boards/umarim/imu_umarim.h
    M sw/airborne/firmwares/beth/overo_sfb_controller.c
    M sw/airborne/firmwares/beth/overo_test_uart.c
    M sw/airborne/firmwares/beth/uart_hw.c
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/datalink.c
    M sw/airborne/firmwares/fixedwing/fbw_downlink.h
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/datalink.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/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.c
    A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.h
    R sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_float.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.h
    R 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_float.h
    R 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_int.h
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/fms/fms_network.c
    M sw/airborne/fms/fms_network.h
    R sw/airborne/fms/fms_serial_port.c
    R sw/airborne/fms/fms_serial_port.h
    M sw/airborne/inter_mcu.h
    M sw/airborne/led.h
    M sw/airborne/lisa/test/lisa_test_hmc5843.c
    M sw/airborne/lisa/test/lisa_test_itg3200.c
    M sw/airborne/lisa/test/test_board.c
    M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
    M sw/airborne/lisa/test_baro_i2c.c
    M sw/airborne/lisa/tunnel_hw.c
    M sw/airborne/math/pprz_algebra_double.h
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/math/pprz_geodetic.h
    M sw/airborne/math/pprz_geodetic_double.c
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    M sw/airborne/math/pprz_simple_matrix.h
    M sw/airborne/mcu.c
    A sw/airborne/mcu_periph/gpio.h
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/mcu_periph/i2c.h
    M sw/airborne/mcu_periph/spi.h
    M sw/airborne/mcu_periph/uart.c
    M sw/airborne/mcu_periph/uart.h
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/core/sys_mon.h
    M sw/airborne/modules/digital_cam/dc.h
    M sw/airborne/modules/digital_cam/led_cam_ctrl.c
    M sw/airborne/modules/digital_cam/led_cam_ctrl.h
    M sw/airborne/modules/geo_mag/geo_mag.c
    A sw/airborne/modules/gumstix_interface/qr_code_spi_link.c
    A sw/airborne/modules/gumstix_interface/qr_code_spi_link.h
    M sw/airborne/modules/ins/imu_chimu.c
    A sw/airborne/modules/ins/ins_xsens700.c
    M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
    A sw/airborne/modules/max7456/max7456.c
    A sw/airborne/modules/max7456/max7456.h
    A sw/airborne/modules/max7456/max7456_regs.h
    M sw/airborne/modules/meteo/humid_pcap01.c
    M sw/airborne/modules/meteo/humid_sht_i2c.c
    M sw/airborne/modules/multi/tcas.c
    A sw/airborne/modules/nav/zamboni_survey.c
    A sw/airborne/modules/nav/zamboni_survey.h
    R sw/airborne/modules/sensors/AOA_adc.c
    R sw/airborne/modules/sensors/AOA_adc.h
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/airspeed_otf.c
    A sw/airborne/modules/sensors/aoa_adc.c
    A sw/airborne/modules/sensors/aoa_adc.h
    M sw/airborne/modules/sensors/baro_MS5534A.h
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_amsys.h
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_bmp.h
    M sw/airborne/modules/sensors/baro_board_module.h
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_ets.h
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.h
    A sw/airborne/modules/sensors/baro_ms5611_spi.c
    A sw/airborne/modules/sensors/baro_ms5611_spi.h
    M sw/airborne/modules/sensors/baro_scp.h
    M sw/airborne/modules/sensors/mag_hmc58xx.c
    A sw/airborne/peripherals/bmp085.c
    A sw/airborne/peripherals/bmp085.h
    A sw/airborne/peripherals/bmp085_regs.h
    M sw/airborne/peripherals/l3g4200.c
    M sw/airborne/peripherals/l3g4200.h
    M sw/airborne/peripherals/l3g4200_regs.h
    R sw/airborne/peripherals/mpu60X0.h
    A sw/airborne/peripherals/mpu60x0.c
    A sw/airborne/peripherals/mpu60x0.h
    A sw/airborne/peripherals/mpu60x0_i2c.c
    A sw/airborne/peripherals/mpu60x0_i2c.h
    A sw/airborne/peripherals/mpu60x0_regs.h
    A sw/airborne/peripherals/mpu60x0_spi.c
    A sw/airborne/peripherals/mpu60x0_spi.h
    A sw/airborne/peripherals/ms5611.c
    M sw/airborne/peripherals/ms5611.h
    A sw/airborne/peripherals/ms5611_i2c.c
    A sw/airborne/peripherals/ms5611_i2c.h
    A sw/airborne/peripherals/ms5611_regs.h
    A sw/airborne/peripherals/ms5611_spi.c
    A sw/airborne/peripherals/ms5611_spi.h
    R sw/airborne/sd_card/main.c
    R sw/airborne/sd_card/sd_card.c
    R sw/airborne/sd_card/sd_card.h
    M sw/airborne/state.h
    M sw/airborne/subsystems/actuators/motor_mixing.c
    A sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    A sw/airborne/subsystems/ahrs/ahrs_ardrone2.h
    R sw/airborne/subsystems/ahrs/ahrs_extern_quat.c
    R sw/airborne/subsystems/ahrs/ahrs_extern_quat.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
    R sw/airborne/subsystems/ahrs/ahrs_float_ekf.c
    R sw/airborne/subsystems/ahrs/ahrs_float_ekf.h
    R sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
    R sw/airborne/subsystems/ahrs/ahrs_float_lkf.h
    A sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    A sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    A sw/airborne/subsystems/ahrs/ahrs_gx3.c
    A sw/airborne/subsystems/ahrs/ahrs_gx3.h
    M sw/airborne/subsystems/datalink/datalink.h
    M sw/airborne/subsystems/datalink/downlink.h
    M sw/airborne/subsystems/datalink/pprz_transport.h
    A sw/airborne/subsystems/datalink/udp.c
    A sw/airborne/subsystems/datalink/udp.h
    M sw/airborne/subsystems/electrical.c
    A sw/airborne/subsystems/gps/gps_ardrone2.c
    A sw/airborne/subsystems/gps/gps_ardrone2.h
    A sw/airborne/subsystems/gps/gps_sirf.c
    A sw/airborne/subsystems/gps/gps_sirf.h
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu.h
    A sw/airborne/subsystems/imu/imu_ardrone2_raw.c
    A sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    A sw/airborne/subsystems/imu/imu_ardrone2_sdk.c
    A sw/airborne/subsystems/imu/imu_ardrone2_sdk.h
    R sw/airborne/subsystems/imu/imu_aspirin2.c
    R sw/airborne/subsystems/imu/imu_aspirin2.h
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
    A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
    A sw/airborne/subsystems/imu/imu_gl1.c
    A sw/airborne/subsystems/imu/imu_gl1.h
    A sw/airborne/subsystems/imu/imu_gl1_defaults.h
    A sw/airborne/subsystems/imu/imu_mpu60x0_defaults.h
    M sw/airborne/subsystems/imu/imu_nps.h
    M sw/airborne/subsystems/imu/imu_um6.c
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    A sw/airborne/subsystems/ins/ins_ardrone2.c
    A sw/airborne/subsystems/ins/ins_ardrone2.h
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    M sw/airborne/subsystems/ins/ins_int_extended.c
    A sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/nav.c
    M sw/airborne/subsystems/nav.h
    M sw/airborne/subsystems/navigation/OSAMNav.c
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/common_nav.h
    M sw/airborne/subsystems/navigation/gls.c
    M sw/airborne/subsystems/navigation/gls.h
    M sw/airborne/subsystems/navigation/traffic_info.c
    A sw/airborne/subsystems/radio_control/sbus.c
    A sw/airborne/subsystems/radio_control/sbus.h
    A sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    A sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    M sw/airborne/test/subsystems/test_ahrs.c
    M sw/airborne/test/subsystems/test_imu.c
    M sw/ext/Makefile
    A sw/ext/ardrone2_drivers/cdc-acm.ko
    M sw/ext/libopencm3
    M sw/ext/luftboot
    A sw/extras/chdk/pictuav.lua
    M sw/ground_segment/cockpit/Makefile
    M sw/ground_segment/cockpit/gcs.glade
    M sw/ground_segment/cockpit/live.ml
    M sw/ground_segment/cockpit/live.mli
    M sw/ground_segment/cockpit/pages.ml
    M sw/ground_segment/cockpit/pages.mli
    M sw/ground_segment/joystick/Makefile
    M sw/ground_segment/joystick/input2ivy.ml
    M sw/ground_segment/joystick/ml_sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.c
    M sw/ground_segment/joystick/sdl_stick.h
    M sw/ground_segment/lpc21iap/Makefile
    M sw/ground_segment/multimon/Makefile
    A sw/ground_segment/python/redundant_link/README
    A sw/ground_segment/python/redundant_link/link_combiner.py
    M sw/ground_segment/tmtc/Makefile
    M sw/ground_segment/tmtc/link.ml
    M sw/lib/ocaml/Makefile
    M sw/lib/ocaml/convert.c
    M sw/lib/ocaml/mapCanvas.ml
    M sw/lib/ocaml/pprz.ml
    M sw/lib/ocaml/pprz.mli
    M sw/simulator/Makefile
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_ivy.c
    M sw/simulator/pprzsim-launch
    M sw/supervision/Makefile
    M sw/supervision/paparazzicenter.glade
    M sw/supervision/paparazzicenter.ml
    M sw/supervision/pc_aircraft.ml
    M sw/tools/dfu/stm32_mem.py
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_messages.ml
    A sw/tools/process_exif/README
    A sw/tools/process_exif/process_exif.py

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

for testing and conflict resolution


  Commit: 983407997a20b0bc2a96670bd8b0bfa09612de3e
      
https://github.com/paparazzi/paparazzi/commit/983407997a20b0bc2a96670bd8b0bfa09612de3e
  Author: Felix Ruess <address@hidden>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] style fixes

- break overly long lines
- add FIR filter for pseudo_gravity_measurement in float version


  Commit: 5665b37a51b74b8bda9d21f3fd68bd9ab4d4fdae
      
https://github.com/paparazzi/paparazzi/commit/5665b37a51b74b8bda9d21f3fd68bd9ab4d4fdae
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: fix comment


  Commit: 61b45079170bfe048466b67e50286b68ef9f2332
      
https://github.com/paparazzi/paparazzi/commit/61b45079170bfe048466b67e50286b68ef9f2332
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  [ahrs] int_cmpl_quat: precompute some gains for efficiency


  Commit: e31901900f25dec7bb9c99fe92bcedfcb2a496ee
      
https://github.com/paparazzi/paparazzi/commit/e31901900f25dec7bb9c99fe92bcedfcb2a496ee
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  [ahrs] configurable gravity_heuristic_factor

if set to zero, gravity heuristic is disabled
- removed AHRS_USE_GRAVITY_UPDATE_NORM_HEURISTIC


  Commit: d2addc1033c841cd09225fac0de20d77a1a2b8df
      
https://github.com/paparazzi/paparazzi/commit/d2addc1033c841cd09225fac0de20d77a1a2b8df
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c

  Log Message:
  -----------
  [ahrs] float_cmpl: set weight to 1.0 if heuristic is disabled


  Commit: 1235c7d9829e50294e366de6154ffb5ba8054b82
      
https://github.com/paparazzi/paparazzi/commit/1235c7d9829e50294e366de6154ffb5ba8054b82
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

  Changed paths:
    A conf/settings/estimation/ahrs_float_cmpl.xml

  Log Message:
  -----------
  [conf] add ahrs_float_cmpl settings file


  Commit: 900206cd821fd501a9d2b36b9204e6bb077fab15
      
https://github.com/paparazzi/paparazzi/commit/900206cd821fd501a9d2b36b9204e6bb077fab15
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    M README.md
    M conf/Makefile.omap
    M conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/conf.xml
    M conf/airframes/CDW/tricopter_cdw.xml
    M conf/airframes/ENAC/quadrotor/booz2_g1.xml
    M conf/airframes/NoVa_L.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/182_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/184_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/186_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/188_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/189_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/190_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/191_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/192_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/193_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/194_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/195_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ARDrone/196_calib.xml
    A conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    A conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/conf.xml
    A conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    A conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    A conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
    M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
    M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/ardrone2_sdk.xml
    M conf/airframes/booz2_flixr.xml
    A conf/airframes/esden/calib/ls01-default.xml
    M conf/airframes/esden/cocto_lm2a2.xml
    M conf/airframes/esden/gain_scheduling_example.xml
    M conf/airframes/esden/hexy_ll11a2pwm.xml
    M conf/airframes/esden/hexy_lm2a2pwm.xml
    M conf/airframes/esden/lisa2_hex.xml
    M conf/airframes/esden/qs_asp22.xml
    M conf/airframes/esden/quady_ll11a2pwm.xml
    M conf/airframes/esden/quady_lm1a1pwm.xml
    M conf/airframes/esden/quady_lm2a2pwm.xml
    M conf/airframes/esden/quady_lm2a2pwmppm.xml
    A conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/MentorEnergy.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/lisa_asctec.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
    M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
    A conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    A conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/examples/quadshot_asp21_spektrum.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/Poine/booz2_a1.xml
    M conf/airframes/obsolete/Poine/booz2_a7.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/example_heli_lisam.xml
    M conf/airframes/obsolete/mm/rotor/qmk1.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
    M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
    M conf/boards/ardrone2_raw.makefile
    M conf/boards/ardrone2_sdk.makefile
    A conf/boards/lisa_s_0.1.makefile
    A conf/boards/px4fmu_1.7.makefile
    M conf/boards/stm32f4_discovery.makefile
    R conf/conf.xml.example
    R conf/conf.xml.tri
    A conf/conf_example.xml
    A conf/conf_tests.xml
    A conf/conf_tri.xml
    R conf/control_panel.xml.example
    A conf/control_panel_example.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
    M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
    M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
    M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
    M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
    M conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    A conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
    M conf/firmwares/subsystems/lisa_passthrough/radio_control_spektrum.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_sirf.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_skytraq.makefile
    M conf/firmwares/subsystems/rotorcraft/gps_ublox.makefile
    A conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.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_aspirin2_i2c.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
    M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M conf/firmwares/subsystems/shared/imu_gl1.makefile
    A conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
    M conf/firmwares/subsystems/shared/imu_nps.makefile
    A conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
    M conf/firmwares/subsystems/shared/radio_control_datalink.makefile
    M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
    M conf/firmwares/subsystems/shared/radio_control_sbus.makefile
    M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
    A conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
    M conf/flight_plans/flight_plan.dtd
    A conf/flight_plans/mission_fw.xml
    M conf/flight_plans/rotorcraft_basic.xml
    A conf/flight_plans/rotorcraft_basic_superbitrf.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    R conf/maps.xml.example
    A conf/maps_example.xml
    M conf/messages.xml
    A conf/modules/flight_time.xml
    M conf/modules/light.xml
    A conf/modules/mission_fw.xml
    M conf/modules/sys_mon.xml
    A conf/settings/modules/flight_time.xml
    M conf/settings/nps.xml
    A conf/simulator/jsbsim/aircraft/Engines/18x8.xml
    A conf/simulator/jsbsim/aircraft/Engines/Zenoah_G-26A.xml
    A conf/simulator/jsbsim/aircraft/LisaAspirin2.xml
    M conf/telemetry/default_rotorcraft.xml
    R conf/tests_conf.xml
    M data/maps/Makefile
    A select_conf.py
    M sw/airborne/arch/omap/led_hw.h
    A sw/airborne/arch/omap/mcu_periph/gpio_arch.h
    M sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
    A sw/airborne/arch/stm32/lisa-s.ld
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
    M sw/airborne/boards/ardrone/at_com.c
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/electrical_raw.c
    M sw/airborne/boards/ardrone/gpio_ardrone.c
    R sw/airborne/boards/ardrone/gpio_ardrone.h
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    M sw/airborne/boards/krooz/imu_krooz.c
    A sw/airborne/boards/lisa_s/baro_board.h
    A sw/airborne/boards/lisa_s_0.1.h
    A sw/airborne/boards/px4fmu/baro_board.h
    A sw/airborne/boards/px4fmu_1.7.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/math/pprz_algebra.h
    M sw/airborne/math/pprz_algebra_float.h
    M sw/airborne/math/pprz_geodetic_double.h
    M sw/airborne/math/pprz_geodetic_float.h
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    M sw/airborne/mcu_periph/gpio.h
    M sw/airborne/modules/bat_checker/bat_checker.c
    M sw/airborne/modules/bat_checker/bat_checker.h
    A sw/airborne/modules/mission/mission.c
    A sw/airborne/modules/mission/mission.h
    A sw/airborne/modules/mission/mission_fw_nav.c
    M sw/airborne/modules/sensors/airspeed_adc.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.h
    M sw/airborne/modules/sensors/baro_ms5611_spi.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.h
    A sw/airborne/modules/time/flight_time.c
    A sw/airborne/modules/time/flight_time.h
    A sw/airborne/peripherals/cyrf6936.c
    A sw/airborne/peripherals/cyrf6936.h
    A sw/airborne/peripherals/cyrf6936_regs.h
    M sw/airborne/state.c
    M sw/airborne/state.h
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/datalink/datalink.h
    M sw/airborne/subsystems/datalink/downlink.h
    A sw/airborne/subsystems/datalink/superbitrf.c
    A sw/airborne/subsystems/datalink/superbitrf.h
    M sw/airborne/subsystems/datalink/udp.c
    M sw/airborne/subsystems/electrical.c
    M sw/airborne/subsystems/electrical.h
    M sw/airborne/subsystems/gps/gps_ardrone2.c
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    M sw/airborne/subsystems/gps/gps_sim_nps.h
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/imu/imu_px4fmu.c
    A sw/airborne/subsystems/imu/imu_px4fmu.h
    A sw/airborne/subsystems/radio_control/superbitrf_rc.c
    A sw/airborne/subsystems/radio_control/superbitrf_rc.h
    M sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    M sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    A sw/airborne/subsystems/sonar.h
    M sw/airborne/test/Makefile
    M sw/airborne/test/test_geodetic.c
    A sw/ext/ardrone2_drivers/check_update.sh
    A sw/ext/ardrone2_drivers/wifi_setup.sh
    M sw/ground_segment/cockpit/editFP.ml
    M sw/in_progress/python/attitude_viz.py
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/expr_syntax.mli
    M sw/lib/ocaml/latlong.ml
    M sw/lib/ocaml/maps_support.ml
    A sw/simulator/nps/nps_atmosphere.c
    M sw/simulator/nps/nps_atmosphere.h
    A sw/simulator/nps/nps_autopilot_fixedwing.c
    A sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/simulator/nps/nps_autopilot_rotorcraft.h
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h
    M sw/simulator/nps/nps_fdm.h
    M sw/simulator/nps/nps_fdm_jsbsim.c
    R sw/simulator/nps/nps_ivy.c
    M sw/simulator/nps/nps_ivy.h
    A sw/simulator/nps/nps_ivy_common.c
    A sw/simulator/nps/nps_ivy_fixedwing.c
    A sw/simulator/nps/nps_ivy_rotorcraft.c
    M sw/simulator/nps/nps_main.c
    M sw/simulator/nps/nps_radio_control_joystick.c
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/calibration/calibrate.py
    M sw/tools/calibration/calibrate_gyro.py
    M sw/tools/calibration/calibrate_mag_current.py
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/dfu/stm32_mem.py
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_periodic.ml
    M sw/tools/gen_settings.ml
    M tests/examples/01_compile_all_test_targets.t

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

merge to get latest features/fixes from master
for conflict resolution and testing


  Commit: b40da0ae56e861e088017c01426d0c4ed7c43350
      
https://github.com/paparazzi/paparazzi/commit/b40da0ae56e861e088017c01426d0c4ed7c43350
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/conf_example.xml
    M conf/conf_tests.xml
    M conf/messages.xml
    A conf/settings/estimation/ahrs_float_cmpl.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
    M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h

  Log Message:
  -----------
  Merge pull request #371 from paparazzi/ahrs_int_cmpl_quat_correction_scaling

ahrs_int_cmpl_quat frequency scaling

Proper scaling of corrections.
Using AHRS_PROPAGATE_FREQUENCY, AHRS_CORRECT_FREQUENCY and 
AHRS_MAG_CORRECT_FREQUENCY.
Hence this will also give you correct gains for 100Hz fixedwings, see #240.

Allow tuning of the accel and mag correction natural freqency and damping.
Tunable gravity_heuristic_factor (set to zero to turn it off and replaces the 
boolean AHRS_GRAVITY_UPDATE_NORM_HEURISTIC)
If you have high vibrations, reduce this factor or completely turn it off...


Compare: 
https://github.com/paparazzi/paparazzi/compare/754e20a0ac66...b40da0ae56e8

reply via email to

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