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: Mon, 14 Oct 2013 06:16:42 -0700

  Branch: refs/heads/telemetry
  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: 5a344232d9b40a00da3c0357912740f3bef1fdb1
      
https://github.com/paparazzi/paparazzi/commit/5a344232d9b40a00da3c0357912740f3bef1fdb1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M conf/messages.xml

  Log Message:
  -----------
  [mission] add mission messages


  Commit: b361afdeaf3cf800bee0a8f20a2833ad23032ef2
      
https://github.com/paparazzi/paparazzi/commit/b361afdeaf3cf800bee0a8f20a2833ad23032ef2
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    A conf/modules/mission_msg.xml
    A sw/airborne/modules/mission/mission_msg.c
    A sw/airborne/modules/mission/mission_msg.h

  Log Message:
  -----------
  [mission] add mission module (only parsing messages for now)


  Commit: 0c5e8e4807671268727412cf4e1ff7e71e30eb67
      
https://github.com/paparazzi/paparazzi/commit/0c5e8e4807671268727412cf4e1ff7e71e30eb67
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M sw/airborne/modules/mission/mission_msg.c
    M sw/airborne/modules/mission/mission_msg.h

  Log Message:
  -----------
  [mission] define mission structures


  Commit: c82262d5dc95ef2b2d2b7141d81cd25d95dfbc65
      
https://github.com/paparazzi/paparazzi/commit/c82262d5dc95ef2b2d2b7141d81cd25d95dfbc65
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M sw/airborne/modules/mission/mission_msg.h

  Log Message:
  -----------
  [mission] forgot some files


  Commit: 0362b747b31108b62657f9256aac42cbbbee3e7f
      
https://github.com/paparazzi/paparazzi/commit/0362b747b31108b62657f9256aac42cbbbee3e7f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M sw/tools/gen_flight_plan.ml

  Log Message:
  -----------
  [flight_plan] add 'until' attribute to 'survey' and 'call' statement


  Commit: cc10e482d76e926b623f5d64330b21ef7ba8dd83
      
https://github.com/paparazzi/paparazzi/commit/cc10e482d76e926b623f5d64330b21ef7ba8dd83
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M conf/flight_plans/flight_plan.dtd

  Log Message:
  -----------
  [flight_plan] update DTD for until attribute with call and survey


  Commit: 71104eb89b961104a28dc2a087325abd4bc5291c
      
https://github.com/paparazzi/paparazzi/commit/71104eb89b961104a28dc2a087325abd4bc5291c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    A sw/airborne/math/pprz_isa.h

  Log Message:
  -----------
  [isa] conversion tools from pressure to meters


  Commit: 4bb23aeb840aaceaef16ef481ea433f619cf4102
      
https://github.com/paparazzi/paparazzi/commit/4bb23aeb840aaceaef16ef481ea433f619cf4102
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M conf/messages.xml
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/subsystems/abi_common.h
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/sensors/baro.h
    M sw/tools/gen_abi.ml

  Log Message:
  -----------
  [abi/baro] binding to ABI baro message is compiling


  Commit: 3230e0a868ad7e4e28bc509c002006d068e63a84
      
https://github.com/paparazzi/paparazzi/commit/3230e0a868ad7e4e28bc509c002006d068e63a84
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/subsystems/ins/ins_int.c

  Log Message:
  -----------
  [baro] data are send and received with ABI (works on a navgo)


  Commit: 629dd68bad2b5be2db79689c4f8bad84714217c7
      
https://github.com/paparazzi/paparazzi/commit/629dd68bad2b5be2db79689c4f8bad84714217c7
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M sw/airborne/math/pprz_isa.h

  Log Message:
  -----------
  [isa] atmosphere function all in float


  Commit: 3604171f35b96f0883245c2781d9cae254cdf592
      
https://github.com/paparazzi/paparazzi/commit/3604171f35b96f0883245c2781d9cae254cdf592
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M sw/tools/gen_abi.ml

  Log Message:
  -----------
  [abi] pass sender id in the callback function


  Commit: 82589c709ce73c71c6afa76b4621bb97cf4e2eb1
      
https://github.com/paparazzi/paparazzi/commit/82589c709ce73c71c6afa76b4621bb97cf4e2eb1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    A sw/airborne/subsystems/air_data.c
    A sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/sensors/baro.h

  Log Message:
  -----------
  [air_data] introduice air_data subsystem

- split air data structure and baro interface
- keep baro interface for integrated baro board
- replace BOARD_HAS_BARO by USE_BARO_BOARD
- add air data and baro_board to both firmwares


  Commit: 046ce69f2b93c7991cacf39a2a92b3b7768e2ac9
      
https://github.com/paparazzi/paparazzi/commit/046ce69f2b93c7991cacf39a2a92b3b7768e2ac9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M conf/messages.xml
    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
    M sw/airborne/subsystems/ins/ins_int_extended.h

  Log Message:
  -----------
  [ins/baro] pressure in float in ABI messages


  Commit: 4970368a2c2acf318ff97d08cbaaa48e31a92660
      
https://github.com/paparazzi/paparazzi/commit/4970368a2c2acf318ff97d08cbaaa48e31a92660
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/apogee/baro_board.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/baro_board.h
    M sw/airborne/boards/ardrone2_raw.h
    M sw/airborne/boards/ardrone2_sdk.h
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/booz/baro_board.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/krooz_sd.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_ms5611_i2c.c
    M 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
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/pc/baro_board.c
    M sw/airborne/boards/pc/baro_board.h
    M sw/airborne/boards/pc_sim.h
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/boards/umarim/baro_board.h
    M sw/airborne/boards/umarim_1.0.h

  Log Message:
  -----------
  [baro] update baro_board files for ABI

- except most of the lisa boards since I'm waiting for another work to
  be merged into master


  Commit: cb14ba37b4ec0172e975be1ffccc4f44b48cd064
      
https://github.com/paparazzi/paparazzi/commit/cb14ba37b4ec0172e975be1ffccc4f44b48cd064
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    A conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/tricopter_cdw.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    M conf/messages.xml
    M conf/modules/baro_bmp.xml
    M conf/modules/baro_ms5611_i2c.xml
    A conf/modules/baro_ms5611_spi.xml
    M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
    M sw/airborne/arch/lpc21/mcu_periph/uart_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
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
    M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
    M sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/electrical_raw.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    R sw/airborne/boards/krooz/baro_board.c
    M sw/airborne/boards/krooz/baro_board.h
    M sw/airborne/boards/krooz/imu_krooz.c
    M sw/airborne/boards/krooz/imu_krooz.h
    M sw/airborne/boards/lia/baro_board.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/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/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    R sw/airborne/fms/fms_serial_port.c
    R sw/airborne/fms/fms_serial_port.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/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    M sw/airborne/mcu_periph/i2c.h
    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/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.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
    A sw/airborne/peripherals/bmp085.c
    A sw/airborne/peripherals/bmp085.h
    A sw/airborne/peripherals/bmp085_regs.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
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    M sw/airborne/subsystems/imu/imu_nps.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    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

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into baro_abi

Conflicts:
        sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
        sw/airborne/boards/lisa_m/baro_ms5611_spi.c


  Commit: 815f7a9a0fe9e35ad36c7a835b17e0fe04a114f1
      
https://github.com/paparazzi/paparazzi/commit/815f7a9a0fe9e35ad36c7a835b17e0fe04a114f1
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.h
    R sw/airborne/boards/ardrone/baro_board_dummy.c
    M sw/airborne/boards/krooz/baro_board.h
    R sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_l/baro_board.h
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.h

  Log Message:
  -----------
  [baro] convert remaining baro_board to ABI


  Commit: 081188d11b14f33cf51ec16723fd8040d7e13856
      
https://github.com/paparazzi/paparazzi/commit/081188d11b14f33cf51ec16723fd8040d7e13856
  Author: Felix Ruess <address@hidden>
  Date:   2013-08-28 (Wed, 28 Aug 2013)

  Changed paths:
    M sw/airborne/boards/lisa_m/baro_board.c

  Log Message:
  -----------
  [boards] fix baro for lisa_m


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

  Changed paths:
    M sw/airborne/subsystems/abi.h
    M sw/airborne/subsystems/abi_common.h

  Log Message:
  -----------
  [dox] doxygen headers for abi


  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: d1d1a7e57dbfed2c7c5cb4a3b359a39a518ab118
      
https://github.com/paparazzi/paparazzi/commit/d1d1a7e57dbfed2c7c5cb4a3b359a39a518ab118
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-01 (Sun, 01 Sep 2013)

  Changed paths:
    M sw/airborne/modules/sensors/baro_MS5534A.c
    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
    R sw/airborne/modules/sensors/baro_board_module.c
    R 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_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.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
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp.h
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    M sw/airborne/modules/sensors/pressure_board_navarro.c
    M sw/airborne/modules/sensors/pressure_board_navarro.h

  Log Message:
  -----------
  [baro] convert baro modules to ABI


  Commit: 0896232488fb730e55e66de40c2e8e7cf5c4fc45
      
https://github.com/paparazzi/paparazzi/commit/0896232488fb730e55e66de40c2e8e7cf5c4fc45
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M Makefile
    M conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/conf.xml
    M conf/airframes/CDW/tricopter_cdw.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/ardrone2_raw.xml
    A conf/airframes/esden/calib/ls01-default.xml
    A conf/airframes/esden/quady_ls01pwm.xml
    A conf/airframes/examples/quadrotor_lisa_s.xml
    A conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/boards/ardrone2_raw.makefile
    A conf/boards/lisa_s_0.1.makefile
    A conf/boards/px4fmu_1.7.makefile
    M conf/conf.xml.example
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    R conf/firmwares/subsystems/fixedwing/joystick.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
    A conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
    A conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
    A conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
    A conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
    M conf/messages.xml
    M conf/modules/sys_mon.xml
    M conf/telemetry/default_rotorcraft.xml
    A make-release-tarball.sh
    M sw/airborne/arch/omap/led_hw.h
    A sw/airborne/arch/omap/mcu_periph/gpio_arch.h
    A sw/airborne/arch/stm32/lisa-s.ld
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
    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/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/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/main.c
    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_float.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
    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/peripherals/cyrf6936.c
    A sw/airborne/peripherals/cyrf6936.h
    A sw/airborne/peripherals/cyrf6936_regs.h
    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/electrical.c
    M sw/airborne/subsystems/electrical.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
    M sw/airborne/subsystems/ins/vf_extended_float.c
    M sw/airborne/subsystems/ins/vf_float.c
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/common_nav.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
    M sw/tools/calibration/calibrate.py

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into baro_abi

Conflicts:
        sw/airborne/boards/ardrone/baro_board.c
        sw/airborne/modules/sensors/baro_ms5611_spi.h


  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: 175e51a7e3ce38a2493aa67f18f14d6e41571345
      
https://github.com/paparazzi/paparazzi/commit/175e51a7e3ce38a2493aa67f18f14d6e41571345
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M sw/airborne/boards/lisa_s/baro_board.h
    M sw/airborne/boards/px4fmu/baro_board.h

  Log Message:
  -----------
  [baro] convert new boards to ABI for baro


  Commit: 4dd6772565b6c00d1ee03baa7ad70247085eed05
      
https://github.com/paparazzi/paparazzi/commit/4dd6772565b6c00d1ee03baa7ad70247085eed05
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

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

  Log Message:
  -----------
  [ins] conver alt_float ins to ABI for baro


  Commit: 93cf55b07f3402c491dd478411d6d520234704f5
      
https://github.com/paparazzi/paparazzi/commit/93cf55b07f3402c491dd478411d6d520234704f5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/math/pprz_isa.h
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/subsystems/navigation/common_nav.c

  Log Message:
  -----------
  [baro] fix baro ABI for sim target with amsys sensor


  Commit: 6f15edbb101c22b0553ff369a11f04cac7ae899f
      
https://github.com/paparazzi/paparazzi/commit/6f15edbb101c22b0553ff369a11f04cac7ae899f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-02 (Mon, 02 Sep 2013)

  Changed paths:
    M conf/messages.xml

  Log Message:
  -----------
  [message] fix message format for BARO_RAW


  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: a7eeb488108277058c53d4de032f7dd7ac35c558
      
https://github.com/paparazzi/paparazzi/commit/a7eeb488108277058c53d4de032f7dd7ac35c558
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/simulator/nps/nps_sensors_params_aspirin_1.5.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
    M conf/simulator/nps/nps_sensors_params_default.h
    M sw/simulator/nps/nps_sensor_baro.c
    M sw/simulator/nps/nps_sensor_baro.h

  Log Message:
  -----------
  [nps] sim proper baro pressure in pascal


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

  Changed paths:
    M conf/messages.xml

  Log Message:
  -----------
  [messages] INS_REF: baro_qfe in float


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

  Changed paths:
    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

  Log Message:
  -----------
  [ins] fix ins_baro_alt, ned frame, z-down!


  Commit: 2d87a6a5f06a8542585edd17d1e8bd447239e810
      
https://github.com/paparazzi/paparazzi/commit/2d87a6a5f06a8542585edd17d1e8bd447239e810
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    M sw/airborne/firmwares/rotorcraft/datalink.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/vehicle_interface/vi_test_signal.c
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/hf_float.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/ins/ins_ardrone2.h
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    R sw/airborne/subsystems/ins/ins_int_extended.c
    R sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/simulator/nps/nps_ivy.c

  Log Message:
  -----------
  [ins] some cleanup and refactoring

- ins_int and ins_int_extended combinded to avoid code duplication
- ins_impl struct
- american spelling: x_initialised -> x_initialzed
- vff is mandatory for ins_int (if needed rather make a new simple 
gps_passthrough ins with ned coordinates)


  Commit: 577df9089e294b441ee3c2d104510459335f447a
      
https://github.com/paparazzi/paparazzi/commit/577df9089e294b441ee3c2d104510459335f447a
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.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/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/conf.xml
    M conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M 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
    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
    M 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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/examples/quadshot_asp21_spektrum.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/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_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/rotorcraft/fdm_jsbsim.makefile
    A conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
    M conf/firmwares/subsystems/shared/imu_nps.makefile
    M conf/firmwares/subsystems/shared/radio_control_datalink.makefile
    R conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
    M conf/flight_plans/rotorcraft_basic.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    M conf/modules/light.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 sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
    M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
    M sw/airborne/boards/ardrone/at_com.c
    M sw/airborne/boards/ardrone/at_com.h
    M sw/airborne/boards/ardrone/gpio_ardrone.c
    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/main.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    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/math/pprz_algebra.h
    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/subsystems/ahrs/ahrs_ardrone2.c
    M sw/airborne/subsystems/datalink/superbitrf.c
    M sw/airborne/subsystems/datalink/superbitrf.h
    M sw/airborne/subsystems/gps/gps_ardrone2.c
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    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
    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_radio_control_joystick.c
    M sw/tools/calibration/calibrate.py

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

get latest stuff from master, especially NPS updates


  Commit: 3aada5265d8f2cf1df9286d3a2030adca3c2381c
      
https://github.com/paparazzi/paparazzi/commit/3aada5265d8f2cf1df9286d3a2030adca3c2381c
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/rotorcraft/main.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/simulator/nps/nps_autopilot.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    R sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    R sw/simulator/nps/nps_autopilot_rotorcraft.h

  Log Message:
  -----------
  [nps] sim_overwrite_ins updates


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

  Changed paths:
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    A conf/firmwares/subsystems/shared/baro_board.makefile

  Log Message:
  -----------
  [conf] baro_board makefile for both fw and rotorcraft


  Commit: 9deae5e6733b0d7cbfe95787d8114e8f53f651b4
      
https://github.com/paparazzi/paparazzi/commit/9deae5e6733b0d7cbfe95787d8114e8f53f651b4
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    M sw/airborne/subsystems/sensors/baro_ms5611_spi.c

  Log Message:
  -----------
  [baro] fix baro_board ms5611 wrappers


  Commit: 0845b6f53349b88ad42cbfcfe2e74bebd1eb8cb9
      
https://github.com/paparazzi/paparazzi/commit/0845b6f53349b88ad42cbfcfe2e74bebd1eb8cb9
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M conf/settings/nps.xml

  Log Message:
  -----------
  [conf] fix nps settings file


  Commit: 4eced1b096867bf7c36eb4d356cd0ad50e3e9be8
      
https://github.com/paparazzi/paparazzi/commit/4eced1b096867bf7c36eb4d356cd0ad50e3e9be8
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

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

  Log Message:
  -----------
  [ins] clean ins_ardrone2


  Commit: 1e50aacf20175d96005ecc2ccadffab9d2c3d2cd
      
https://github.com/paparazzi/paparazzi/commit/1e50aacf20175d96005ecc2ccadffab9d2c3d2cd
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/datalink.c
    M sw/airborne/firmwares/rotorcraft/navigation.c
    M sw/airborne/firmwares/rotorcraft/navigation.h
    M sw/simulator/nps/nps_ivy_rotorcraft.c

  Log Message:
  -----------
  [rotorcraft] add nav_move_waypoint_lla function

and use it in MOVE_WP in nps and datalink


  Commit: 5e4f494806314991b59842d7970f770e737f530b
      
https://github.com/paparazzi/paparazzi/commit/5e4f494806314991b59842d7970f770e737f530b
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/modules/baro_ms5611_spi.xml
    A sw/airborne/boards/baro_board_ms5611_i2c.c
    A sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.c
    R sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    R sw/airborne/subsystems/sensors/baro_ms5611_spi.c

  Log Message:
  -----------
  [baro] some ms5611 cleanup

- move ms5611 baro board wrappers to boards dir
- no defaults devices for baro_board_ms5611_x wrappers
- rename MS5611_SLAVE_DEV to MS5611_SLAVE_IDX


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

  Changed paths:
    M conf/firmwares/lisa_test_progs.makefile
    M sw/airborne/lisa/test_baro_i2c.c

  Log Message:
  -----------
  [tests] fix test_baro


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

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile

  Log Message:
  -----------
  [jsbsim] fix baro


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

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/funjet2.xml
    M conf/airframes/ENAC/fixed-wing/mythe.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml

  Log Message:
  -----------
  [conf] remove obsolete baro_board module from airframes


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

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile

  Log Message:
  -----------
  [conf] fix some fixedwing ins makefiles


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

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

  Log Message:
  -----------
  [ins] ins.status to running for fw ins


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

  Changed paths:
    M conf/firmwares/subsystems/shared/baro_board.makefile
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone2_raw.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lisa_l_1.0.h
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/umarim_1.0.h

  Log Message:
  -----------
  [baro_board] disable onboard baro with <configure name="USE_BARO_BOARD" 
value="FALSE"/>


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

  Changed paths:
    M sw/airborne/lisa/test_baro_i2c.c

  Log Message:
  -----------
  [tests] finally fix test_baro


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

  Changed paths:
    M sw/airborne/math/pprz_isa.h

  Log Message:
  -----------
  [math] convert PPRZ_ISA_M_OF_P_CONST from define to static const float

so it doesn't have to be recomputed every time


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

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.xml
    M conf/airframes/ENAC/fixed-wing/firestorm.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/NoVa_L.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M 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/booz2_flixr.xml
    M conf/airframes/booz2_ppzuav.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
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/h_hex.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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M 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/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.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 sw/airborne/modules/sensors/baro_amsys.c

  Log Message:
  -----------
  [conf] remove all INS_BARO_SENS

this is not needed anymore.
Instead every baro sensor has to output pressure in Pascal.


  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: 4c8e57fe07bd8a814d396ad25ea590ebda8ac649
      
https://github.com/paparazzi/paparazzi/commit/4c8e57fe07bd8a814d396ad25ea590ebda8ac649
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M sw/airborne/state.h

  Log Message:
  -----------
  [state] fix local/global coordinate validity checks


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

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

  Log Message:
  -----------
  [rotorcraft] telemetry: use state interface instead of ins_impl


  Commit: 381eb343d96f4d31f01258b873a19390e6450199
      
https://github.com/paparazzi/paparazzi/commit/381eb343d96f4d31f01258b873a19390e6450199
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/main_fbw.c

  Log Message:
  -----------
  [fixedwing] fix nps autopilot include


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

  Changed paths:
    M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.h

  Log Message:
  -----------
  [rotorcraft] add rpy/earth commands to quaternion transformations


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.c
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  [rotorcraft] guidance_h commands in earth frame


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

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c

  Log Message:
  -----------
  [rotorcraft] quat_int: still compute "euler" setpoints


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

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c

  Log Message:
  -----------
  [rotorcraft] update read_rc_roll_pitch_quat


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

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c

  Log Message:
  -----------
  [rotorcraft][stabilization] set_rpy|earth_cmd for quat_float


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

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c

  Log Message:
  -----------
  [rotorcraft][stabilization] set_rpy|earth_cmd for euler


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

  Changed paths:
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/shared/baro_board.makefile

  Log Message:
  -----------
  [conf] add baro_board for simulators from baro_board.makefile


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

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

  Log Message:
  -----------
  [rotorcraft] ups, fix setting commands from guidance_h


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

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

  Log Message:
  -----------
  [rotorcraft] add GUIDANCE_H_APPROX_FORCE_BY_THRUST

based on the idea of Sergei from pull request #532

Still need to use only the vertical thrust instead of total thrust.
Will be corrected later using the get_vertical_thrust_coeff from pull request 
#528


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

  Changed paths:
    M Makefile.ac
    M README.md
    M conf/Makefile.omap
    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
    M conf/airframes/TUDelft/IMAV2013/conf.xml
    M conf/airframes/examples/MentorEnergy.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_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_px4fmu.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/boards/ardrone2_raw.makefile
    M conf/boards/ardrone2_sdk.makefile
    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
    M 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/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
    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_common.makefile
    M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
    M conf/firmwares/subsystems/shared/imu_gl1.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
    M conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
    M conf/messages.xml
    M conf/settings/nps.xml
    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/baro_board.c
    M sw/airborne/boards/ardrone/electrical_raw.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.h
    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/telemetry.h
    M sw/airborne/subsystems/datalink/udp.c
    M sw/airborne/subsystems/electrical.c
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    A sw/ext/ardrone2_drivers/check_update.sh
    A sw/ext/ardrone2_drivers/wifi_setup.sh
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    M sw/supervision/pc_aircraft.ml
    M sw/supervision/pc_control_panel.ml
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_periodic.ml

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

get fixes from master for further testing
e.g. the ardrone navdata fixes


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

  Changed paths:
    M Makefile.ac
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h

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

get fixes from master:
  TELEMETRY_FREQUENCY defaults to PERIODIC_FREQUENCY or 60Hz
  [nps] ups, add missing nps_electrical files


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

  Changed paths:
    M Makefile.ac
    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_px4fmu.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/settings/nps.xml
    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/baro_board.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    M sw/airborne/firmwares/fixedwing/main_ap.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/telemetry.h
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    A sw/simulator/nps/nps_electrical.c
    A sw/simulator/nps/nps_electrical.h
    M sw/tools/gen_aircraft.ml
    M sw/tools/gen_modules.ml
    M sw/tools/gen_periodic.ml

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

merge to get refactored vert loop with get_vertical_thrust_coeff


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

  Changed paths:
    M conf/airframes/fraser_lisa_m_rotorcraft.xml
    M conf/settings/control/rotorcraft_guidance.xml
    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_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    M sw/airborne/firmwares/rotorcraft/navigation.c

  Log Message:
  -----------
  [rotorcraft][guidance_h] guidance_h_approx_force_by_thrust

- enable/disable via settings
- gets a better approximation of vertical thrust using guidance_v_thrust_coeff
- vertical thrust is recomputed in guidance_h to take the latest thrust command 
after guidance_v was run


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

  Changed paths:
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/peripherals/mpl3115.h

  Log Message:
  -----------
  [boards][apogee] remove unneeded APOGEE_BARO_SENS

pressure is already in Pascal


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

  Changed paths:
    M Makefile.ac
    M conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/settings/nps.xml
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    M sw/airborne/subsystems/gps/gps_sim_nps.h
    A sw/simulator/nps/nps_atmosphere.c
    M sw/simulator/nps/nps_atmosphere.h
    M sw/simulator/nps/nps_electrical.c
    M sw/simulator/nps/nps_electrical.h
    M sw/simulator/nps/nps_fdm.h
    M sw/simulator/nps/nps_fdm_jsbsim.c
    M sw/simulator/nps/nps_ivy_common.c
    M sw/simulator/nps/nps_main.c

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

get fixes from master


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

  Changed paths:
    M conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/modules/baro_mpl3115.xml
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_mpl3115.h
    M sw/airborne/peripherals/mpl3115.c
    M sw/airborne/peripherals/mpl3115.h

  Log Message:
  -----------
  [peripherals] refactor baro mpl3115


  Commit: 6e4d2020b9bd3d05efac46f9a3dcc539b373f684
      
https://github.com/paparazzi/paparazzi/commit/6e4d2020b9bd3d05efac46f9a3dcc539b373f684
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-14 (Sat, 14 Sep 2013)

  Changed paths:
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/peripherals/mpl3115.h

  Log Message:
  -----------
  [peripherals] baro mpl3115 pressure is in 1/4 pascal


  Commit: 4775fc5244dab5698e1b8c7adbe325287d3b87be
      
https://github.com/paparazzi/paparazzi/commit/4775fc5244dab5698e1b8c7adbe325287d3b87be
  Author: softsr <address@hidden>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c

  Log Message:
  -----------
  Added RC setpoint control in H-H mode


  Commit: 7dae549f314c1edea60b3d943fe8b065191eca6c
      
https://github.com/paparazzi/paparazzi/commit/7dae549f314c1edea60b3d943fe8b065191eca6c
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

  Changed paths:
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.c

  Log Message:
  -----------
  [modules] fix baro_m5611

- set data_available to false after it is read
- use pprz_isa_altitude_of_pressure


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

  Changed paths:
    M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
    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_h_ref.h

  Log Message:
  -----------
  [rotorcraft] fix hover speed RC setpoint

- fix rc_x and rc_y values
  - still needs to be scaled to max speed using circle instead of box bounding,
    but while making sure a division by zero can't occur!
- only copy pos_ref to pos_sp in hover mode
- move GUIDANCE_H_REF_MAX_SPEED|ACCEL to ref header file so it can be used
- refactor rc speed setpoint reading into separate function

closes #543


  Commit: a0b81eac001bbb57d48fab2a9390b756b685fd94
      
https://github.com/paparazzi/paparazzi/commit/a0b81eac001bbb57d48fab2a9390b756b685fd94
  Author: softsr <address@hidden>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

  Changed paths:
    M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c

  Log Message:
  -----------
  Proper vertical climb/descend speed calculation


  Commit: 91678391d0c52b6210a279d155cfad6d7b2d5934
      
https://github.com/paparazzi/paparazzi/commit/91678391d0c52b6210a279d155cfad6d7b2d5934
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

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

  Log Message:
  -----------
  [rotorcraft] RC_CLIMB cleanup

- add GUIDANCE_V_CLIMB_RC_DEADBAND (in pprz units, default MAX_PPRZ/10)
  - GUIDANCE_V_RC_CLIMB_DEAD_BAND is obsolete
- GUIDANCE_V_MAX_RC_CLIMB_SPEED defaults to GUIDANCE_V_REF_MIN_ZD
- GUIDANCE_V_MAX_RC_DESCENT_SPEED defaults to GUIDANCE_V_REF_MAX_ZD


  Commit: 6b7fdd25a71f22a782342a0073398f62f63b8d83
      
https://github.com/paparazzi/paparazzi/commit/6b7fdd25a71f22a782342a0073398f62f63b8d83
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-15 (Sun, 15 Sep 2013)

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.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/NoVa_L.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M 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
    M conf/airframes/booz2_ppzuav.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
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/h_hex.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_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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M 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/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.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

  Log Message:
  -----------
  [conf][airframes] remove obsolete RC_CLIMB_COEF and RC_CLIMB_DEAD_BAND


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

  Changed paths:
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.c

  Log Message:
  -----------
  [modules] baro_ms611 SENSOR_SYNC_SEND for sending coeff every 30s


  Commit: 4e7975cea974d36ec1df90a9021cbb551e513793
      
https://github.com/paparazzi/paparazzi/commit/4e7975cea974d36ec1df90a9021cbb551e513793
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M conf/Makefile.omap

  Log Message:
  -----------
  [ArDrone] Fix breaking autoconfig


  Commit: a1f48373fa5eeeadf85d8a30481445596e3781de
      
https://github.com/paparazzi/paparazzi/commit/a1f48373fa5eeeadf85d8a30481445596e3781de
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M conf/messages.xml
    M conf/modules/mission_msg.xml
    M sw/airborne/modules/mission/mission_msg.c
    M sw/airborne/modules/mission/mission_msg.h

  Log Message:
  -----------
  [mission] update mission interface


  Commit: a22c015801287d7bd4a00d55cf65f5834e2dd68f
      
https://github.com/paparazzi/paparazzi/commit/a22c015801287d7bd4a00d55cf65f5834e2dd68f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    A sw/airborne/modules/mission/mission_nav.c
    A sw/airborne/modules/mission/mission_nav.h

  Log Message:
  -----------
  [mission] add missing files


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

  Changed paths:
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    M sw/airborne/test/Makefile
    M sw/airborne/test/test_geodetic.c

  Log Message:
  -----------
  [math] geodetic_int: add extra ecef <-> enu/ned position functions

- ecef_of_enu_point_i has coordinates in cm
- ecef_of_enu_pos_i has ned in meter with INT32_POS_FRAC and ecef with cm


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

  Changed paths:
    M sw/airborne/state.c

  Log Message:
  -----------
  [state] fix local ned/enu to ecef conversion

by using new ecef_of_enu_pos_i functions which have enu in meter with 
INT32_POS_FRAC and ecef with cm
instead of everything in cm


  Commit: 9add5d1c316b251f064197ee65ca7c7ddb928f47
      
https://github.com/paparazzi/paparazzi/commit/9add5d1c316b251f064197ee65ca7c7ddb928f47
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M conf/airframes/ardrone2_raw.xml

  Log Message:
  -----------
  [Ardrone][Raw] More general airframe


  Commit: 45ff6dbc1167b4f0d35d66d0bd3b25ec18dc4434
      
https://github.com/paparazzi/paparazzi/commit/45ff6dbc1167b4f0d35d66d0bd3b25ec18dc4434
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

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

  Log Message:
  -----------
  [rotorcraft] guidance_h MAX_BANK

In case of wind, the -20 to 20 max bank should become -40 deg in the wind 
direction and +0 in
the opposite direction. The i-gain should be sufficiently SLOW but with HIGH 
authority.
This commit suggests to split the max-bank from PD an I with separate 
saturation and have the
I-gain before the integrator so better insight is gained in its authority.


  Commit: cad1ca2ad271c3d21feb5f171c7504003b51a3c1
      
https://github.com/paparazzi/paparazzi/commit/cad1ca2ad271c3d21feb5f171c7504003b51a3c1
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  [rotorcraft] guidance_h: Rename sum err for clarity


  Commit: 8a3b8b4991a928510d9941d7d6eb85ed9e529789
      
https://github.com/paparazzi/paparazzi/commit/8a3b8b4991a928510d9941d7d6eb85ed9e529789
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

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

  Log Message:
  -----------
  [rotorcraft] guidance_h: Updated integrator dynamics

Integrate twice as fast when not only POS but also SPEED are wrong,
but do not integrate POS errors when the SPEED is already catching up.


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

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

  Log Message:
  -----------
  [rotorcraft] guidance_h total_max_bank


  Commit: b6c2a8fef44a8405abab8ba74f35bce43cf3923a
      
https://github.com/paparazzi/paparazzi/commit/b6c2a8fef44a8405abab8ba74f35bce43cf3923a
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

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

  Log Message:
  -----------
  [rotorcraft] guidance_h Resolution of integrator increased, AGain not in 
integration.


  Commit: 90778612108538a099a2f1652a48438e05dc504e
      
https://github.com/paparazzi/paparazzi/commit/90778612108538a099a2f1652a48438e05dc504e
  Author: Christophe De Wagter <address@hidden>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

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

  Log Message:
  -----------
  [rotorcraft] guidance_h typo in saturation and better resolution of the 
integrator


  Commit: d3ac39c6fc1414cf1dbb11b392a4e2fd4d53d4cf
      
https://github.com/paparazzi/paparazzi/commit/d3ac39c6fc1414cf1dbb11b392a4e2fd4d53d4cf
  Author: fvantienen <address@hidden>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_settings.ml

  Log Message:
  -----------
  [generator] Fix special characters in flight plan and settings


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

  Changed paths:
    M .gitignore
    M Makefile
    M conf/Makefile.omap
    M conf/airframes/TUDelft/IMAV2013/ARDrone/182_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/184_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/186_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/188_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/189_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/190_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/191_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/192_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/193_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/194_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/195_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ARDrone/196_calib.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/conf.xml
    M conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M conf/airframes/ardrone2_raw.xml
    M conf/airframes/examples/quadrotor_lisa_s.xml
    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/subsystems/fixedwing/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/flight_plans/rotorcraft_basic_superbitrf.xml
    R conf/maps.xml.example
    A conf/maps_example.xml
    M conf/messages.xml
    A conf/modules/flight_time.xml
    A conf/settings/modules/flight_time.xml
    M conf/settings/nps.xml
    R conf/tests_conf.xml
    M data/maps/Makefile
    A select_conf.py
    M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
    M sw/airborne/boards/ardrone/electrical_raw.c
    M sw/airborne/boards/ardrone/navdata.c
    M sw/airborne/boards/ardrone/navdata.h
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/firmwares/rotorcraft/telemetry.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
    A sw/airborne/modules/time/flight_time.c
    A sw/airborne/modules/time/flight_time.h
    M sw/airborne/state.c
    M sw/airborne/state.h
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    M sw/airborne/subsystems/gps/gps_sim_nps.h
    M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    A sw/airborne/subsystems/sonar.h
    M sw/airborne/test/Makefile
    M sw/airborne/test/test_geodetic.c
    M sw/ground_segment/cockpit/editFP.ml
    M sw/lib/ocaml/maps_support.ml
    A sw/simulator/nps/nps_atmosphere.c
    M sw/simulator/nps/nps_atmosphere.h
    M sw/simulator/nps/nps_electrical.c
    M sw/simulator/nps/nps_electrical.h
    M sw/simulator/nps/nps_fdm.h
    M sw/simulator/nps/nps_fdm_jsbsim.c
    M sw/simulator/nps/nps_ivy_common.c
    M sw/simulator/nps/nps_main.c
    M sw/tools/calibration/calibration_utils.py
    M sw/tools/dfu/stm32_mem.py
    M sw/tools/gen_airframe.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_settings.ml
    M tests/examples/01_compile_all_test_targets.t

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

to get updates/fixes from master for testing


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

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.h
    R 
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
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_saturate.h

  Log Message:
  -----------
  [rotorcraft] stabilization attitude ref include cleanup


  Commit: 50a8ae9634282f9f21c86b7da1ff976727098105
      
https://github.com/paparazzi/paparazzi/commit/50a8ae9634282f9f21c86b7da1ff976727098105
  Author: Felix Ruess <address@hidden>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M conf/airframes/ardrone2_raw.xml

  Log Message:
  -----------
  [airframes] ardrone_raw: RC_CLIMB defines still needed here

Can only be removed once pull request #539 is merged


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

  Changed paths:
    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

  Log Message:
  -----------
  [tools] minor code style updates


  Commit: 1499a6f7beccb2f2ce3caca200cebcc183128ab7
      
https://github.com/paparazzi/paparazzi/commit/1499a6f7beccb2f2ce3caca200cebcc183128ab7
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M sw/in_progress/python/attitude_viz.py

  Log Message:
  -----------
  [tools] attitude_viz pep8


  Commit: 7b8f824fbdba670e496237d3b805bf228bd60540
      
https://github.com/paparazzi/paparazzi/commit/7b8f824fbdba670e496237d3b805bf228bd60540
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M conf/messages.xml
    A conf/modules/mission_fw.xml
    R conf/modules/mission_msg.xml
    A sw/airborne/modules/mission/mission.c
    A sw/airborne/modules/mission/mission.h
    A sw/airborne/modules/mission/mission_fw_nav.c
    R sw/airborne/modules/mission/mission_msg.c
    R sw/airborne/modules/mission/mission_msg.h
    R sw/airborne/modules/mission/mission_nav.c
    R sw/airborne/modules/mission/mission_nav.h

  Log Message:
  -----------
  [mission] better mission interface

- cleaning interface
- better parsing
- better handling of navigation routine
- implement several insertion modes
- implement duration
- conversions from LLA to local are missing in parsing function
- some patterns are missing
- only fixedwing so far


  Commit: f45d69a323695d3248c70b24bdb363053e9c8331
      
https://github.com/paparazzi/paparazzi/commit/f45d69a323695d3248c70b24bdb363053e9c8331
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M .gitignore
    M Makefile
    M Makefile.ac
    M README.md
    M conf/Makefile.omap
    A conf/airframes/CDW/asctec_cdw.xml
    A conf/airframes/CDW/conf.xml
    A conf/airframes/CDW/tricopter_cdw.xml
    M 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/booz2_g1.xml
    M conf/airframes/ENAC/quadrotor/hen1.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
    M conf/airframes/booz2_ppzuav.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/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
    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
    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/g1_vision.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/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/fixed-wing/slowfast2.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
    A conf/boards/apogee_1.0.makefile
    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
    A 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/lisa_test_progs.makefile
    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
    A 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
    R conf/firmwares/subsystems/fixedwing/joystick.makefile
    M conf/firmwares/subsystems/fixedwing/spi_slave_hs.makefile
    A conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
    M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
    M conf/firmwares/subsystems/lisa_passthrough/radio_control_spektrum.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
    M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
    A conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
    M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
    R conf/firmwares/subsystems/rotorcraft/ahrs_lkf.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
    M conf/firmwares/subsystems/rotorcraft/ins.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
    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
    R conf/firmwares/subsystems/shared/ahrs_gx3.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.1.makefile
    R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
    M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
    A conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
    M 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/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
    A 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/rotorcraft_basic.xml
    A conf/flight_plans/rotorcraft_basic_superbitrf.xml
    M conf/flight_plans/versatile.xml
    M conf/flight_plans/versatile_airspeed.xml
    A conf/flight_plans/zamboni_survey_test.xml
    R conf/maps.xml.example
    A conf/maps_example.xml
    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/flight_time.xml
    A conf/modules/gumstix_qr_code_spi_link.xml
    M conf/modules/light.xml
    A conf/modules/osd_max7456.xml
    M conf/modules/sys_mon.xml
    A conf/modules/zamboni_survey.xml
    A conf/radios/T10CG_SBUS.xml
    M conf/settings/control/rotorcraft_guidance.xml
    R conf/settings/estimation/booz2_ahrs_lkf.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
    A conf/system/preferences.d/paparazzi-uav-ppa
    M conf/system/udev/rules/50-paparazzi.rules
    M conf/telemetry/default_rotorcraft.xml
    R conf/tests_conf.xml
    M data/maps/Makefile
    A data/pictures/Penguin.gif
    A make-release-tarball.sh
    M paparazzi_version
    A select_conf.py
    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/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
    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
    R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
    R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
    A sw/airborne/arch/stm32/lisa-s.ld
    M sw/airborne/arch/stm32/mcu_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/spi_arch.c
    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/subsystems/actuators/actuators_pwm_arch.c
    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/settings_arch.c
    M sw/airborne/boards/apogee_0.99.h
    A sw/airborne/boards/apogee_1.0.h
    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/baro_board.h
    A sw/airborne/boards/ardrone/electrical_raw.c
    A sw/airborne/boards/ardrone/electrical_raw.h
    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
    A sw/airborne/boards/krooz/baro_board.h
    A sw/airborne/boards/krooz/imu_krooz.c
    A sw/airborne/boards/krooz/imu_krooz.h
    M sw/airborne/boards/krooz_sd.h
    M sw/airborne/boards/lia/baro_board.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
    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
    A sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/umarim/imu_umarim.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/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.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
    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
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
    R 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler.h
    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_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/telemetry.h
    R sw/airborne/fms/fms_serial_port.c
    R sw/airborne/fms/fms_serial_port.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.h
    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_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/math/pprz_simple_matrix.h
    M sw/airborne/mcu.c
    M 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.h
    M sw/airborne/modules/bat_checker/bat_checker.c
    M sw/airborne/modules/bat_checker/bat_checker.h
    M sw/airborne/modules/core/sys_mon.c
    M sw/airborne/modules/core/sys_mon.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/max7456/max7456.c
    A sw/airborne/modules/max7456/max7456.h
    A sw/airborne/modules/max7456/max7456_regs.h
    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_adc.c
    M sw/airborne/modules/sensors/airspeed_amsys.c
    M sw/airborne/modules/sensors/airspeed_ets.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
    A sw/airborne/modules/time/flight_time.c
    A sw/airborne/modules/time/flight_time.h
    A sw/airborne/peripherals/bmp085.c
    A sw/airborne/peripherals/bmp085.h
    A sw/airborne/peripherals/bmp085_regs.h
    A sw/airborne/peripherals/cyrf6936.c
    A sw/airborne/peripherals/cyrf6936.h
    A sw/airborne/peripherals/cyrf6936_regs.h
    M sw/airborne/peripherals/l3g4200.c
    M sw/airborne/peripherals/l3g4200.h
    M sw/airborne/peripherals/l3g4200_regs.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.c
    M sw/airborne/state.h
    M sw/airborne/subsystems/actuators/motor_mixing.c
    M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
    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
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
    M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
    M sw/airborne/subsystems/ahrs/ahrs_gx3.c
    M 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/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_ardrone2.h
    M sw/airborne/subsystems/gps/gps_sim_nps.c
    M sw/airborne/subsystems/gps/gps_sim_nps.h
    M sw/airborne/subsystems/imu.c
    M sw/airborne/subsystems/imu.h
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
    M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
    R sw/airborne/subsystems/imu/imu_aspirin2.c
    R sw/airborne/subsystems/imu/imu_aspirin2.h
    M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
    M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
    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
    M sw/airborne/subsystems/imu/imu_nps.h
    A sw/airborne/subsystems/imu/imu_px4fmu.c
    A sw/airborne/subsystems/imu/imu_px4fmu.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.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/navigation/common_nav.c
    M sw/airborne/subsystems/navigation/common_nav.h
    A sw/airborne/subsystems/radio_control/sbus.c
    A sw/airborne/subsystems/radio_control/sbus.h
    A sw/airborne/subsystems/radio_control/superbitrf_rc.c
    A sw/airborne/subsystems/radio_control/superbitrf_rc.h
    A sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    A sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    A sw/airborne/subsystems/sonar.h
    M sw/airborne/test/Makefile
    M sw/airborne/test/subsystems/test_ahrs.c
    M sw/airborne/test/subsystems/test_imu.c
    M sw/airborne/test/test_geodetic.c
    M sw/ext/ardrone2_drivers/cdc-acm.ko
    A sw/ext/ardrone2_drivers/check_update.sh
    R sw/ext/ardrone2_drivers/cp210x.ko
    R sw/ext/ardrone2_drivers/ftdi-sio.ko
    R sw/ext/ardrone2_drivers/pl2303.ko
    R sw/ext/ardrone2_drivers/usbserial.ko
    A sw/ext/ardrone2_drivers/wifi_setup.sh
    A sw/extras/chdk/pictuav.lua
    M sw/ground_segment/cockpit/editFP.ml
    M sw/in_progress/python/attitude_viz.py
    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/simulator/pprzsim-launch
    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/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
    A sw/tools/process_exif/README
    A sw/tools/process_exif/process_exif.py
    M tests/examples/01_compile_all_test_targets.t

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into mission


  Commit: d7b84baf60d9bb4ee8cb7835a64632a9c4ff46da
      
https://github.com/paparazzi/paparazzi/commit/d7b84baf60d9bb4ee8cb7835a64632a9c4ff46da
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M sw/lib/ocaml/expr_syntax.ml
    M sw/lib/ocaml/expr_syntax.mli
    M sw/tools/gen_flight_plan.ml

  Log Message:
  -----------
  [flightplan] add IndexOfBlock function to FP parser


  Commit: 780c03c05acf93e687f7627b8af8f4a92b919fc4
      
https://github.com/paparazzi/paparazzi/commit/780c03c05acf93e687f7627b8af8f4a92b919fc4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_settings.ml

  Log Message:
  -----------
  [generator] generate arrays of the settings and fp blocks names

not used yet, but it can be later to send the settings and block names
to the ground of to implement to associate a name to an index at runtime


  Commit: ddab784efb846887fb1dff643dd56c31b00d3f84
      
https://github.com/paparazzi/paparazzi/commit/ddab784efb846887fb1dff643dd56c31b00d3f84
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    A conf/flight_plans/mission_fw.xml
    M sw/airborne/modules/mission/mission.c
    M sw/airborne/modules/mission/mission.h
    M sw/airborne/modules/mission/mission_fw_nav.c

  Log Message:
  -----------
  [mission] fix segmentation fault and add generic mission FP


  Commit: cf2e893204ee61f52abf31de5ba4bb8f1db4716f
      
https://github.com/paparazzi/paparazzi/commit/cf2e893204ee61f52abf31de5ba4bb8f1db4716f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-04 (Fri, 04 Oct 2013)

  Changed paths:
    M conf/flight_plans/flight_plan.dtd
    A conf/flight_plans/mission_fw.xml
    M conf/messages.xml
    A conf/modules/mission_fw.xml
    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/tools/gen_flight_plan.ml

  Log Message:
  -----------
  Merge pull request #548 from enacuavlab/mission

Mission


  Commit: 1008f946d82154579cd65726633afca3da079cc4
      
https://github.com/paparazzi/paparazzi/commit/1008f946d82154579cd65726633afca3da079cc4
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M sw/lib/ocaml/latlong.ml

  Log Message:
  -----------
  [lib/ocaml] update leap_seconds

most recent leap second was inserted on June 30, 2012 at 23:59:60 UTC
So since the gps epoch 1980 we have 16 leap seconds.

closes #549


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

  Changed paths:
    M conf/boards/stm32f4_discovery.makefile
    M sw/airborne/boards/stm32f4_discovery.h

  Log Message:
  -----------
  [boards] update stm32f4_discovery


  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: 49ab9baa7b51a33170aa180c858852b482e577a7
      
https://github.com/paparazzi/paparazzi/commit/49ab9baa7b51a33170aa180c858852b482e577a7
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    R conf/modules/baro_board.xml

  Log Message:
  -----------
  [conf] remove baro_board.xml module file


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

  Changed paths:
    M conf/modules/baro_amsys.xml
    M conf/modules/baro_ets.xml
    M conf/modules/baro_hca.xml
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_bmp.h
    M sw/airborne/modules/sensors/baro_ets.c

  Log Message:
  -----------
  [modules] baro modules for real sensors only for ap target, not sim


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

  Changed paths:
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/stm32f4_discovery_test.xml
    M conf/modules/baro_ets.xml
    M sw/airborne/modules/sensors/baro_ets.c

  Log Message:
  -----------
  [modules] baro_ets: BARO_ETS_SCALE

Conversion of ADC to Pascal should be roughly correct now, not tested though.


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

  Changed paths:
    M sw/airborne/boards/booz/baro_board.c

  Log Message:
  -----------
  [boards] roughly correct BOOZ_BARO_SENS


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

  Changed paths:
    M sw/airborne/boards/stm32f4_discovery.h

  Log Message:
  -----------
  [boards] stm32f4_discovery typo in description

typo at line 25: SPI1 SKL -> SPI1 SCL
added info line 15: UART2 -> UART2 (Spektrum input)

closes #552


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

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README for recommended gcc-arm-embedded toolchain


  Commit: 934e4838b08860d9af9895f2b22265cce2b73e09
      
https://github.com/paparazzi/paparazzi/commit/934e4838b08860d9af9895f2b22265cce2b73e09
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/modules/sensors/baro_mpl3115.h

  Log Message:
  -----------
  [apogee] fix baro mpl3115 init on apogee


  Commit: 1734b1d004b5569416d563c45bdbf7cb76e2760a
      
https://github.com/paparazzi/paparazzi/commit/1734b1d004b5569416d563c45bdbf7cb76e2760a
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    R sw/airborne/arch/sim/sim_baro.c

  Log Message:
  -----------
  [sim] remove unused sim_baro


  Commit: 3c4f223366da4a0052650118bdfd168938d00c40
      
https://github.com/paparazzi/paparazzi/commit/3c4f223366da4a0052650118bdfd168938d00c40
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/firmwares/subsystems/shared/baro_board.makefile
    A conf/modules/baro_sim.xml
    M sw/airborne/boards/pc_sim.h
    A sw/airborne/modules/sensors/baro_sim.c
    A sw/airborne/modules/sensors/baro_sim.h
    M sw/airborne/subsystems/ins/ins_alt_float.c

  Log Message:
  -----------
  [modules] add baro_sim

as a temporary workaround to get baro simulation in ocaml sim


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

  Changed paths:
    R conf/airframes/NoVa_L.xml
    R conf/airframes/booz2_flixr.xml
    R conf/airframes/booz2_ppzuav.xml
    R conf/airframes/mentor_tum.xml
    A conf/airframes/obsolete/NoVa_L.xml
    A conf/airframes/obsolete/booz2_flixr.xml
    A conf/airframes/obsolete/booz2_ppzuav.xml
    A conf/airframes/obsolete/mentor_tum.xml

  Log Message:
  -----------
  [conf] move some airframes to obsolete


  Commit: 4dd2226fff78fab215fb4a4369b4c2b56fc70ed3
      
https://github.com/paparazzi/paparazzi/commit/4dd2226fff78fab215fb4a4369b4c2b56fc70ed3
  Author: Felix Ruess <address@hidden>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M sw/airborne/boards/pc_sim.h

  Log Message:
  -----------
  [boards] sim pc: only USE_BARO_BOARD for nps


  Commit: c0b9260c23cf11b784a3c6e0f8bc301dbf7009c9
      
https://github.com/paparazzi/paparazzi/commit/c0b9260c23cf11b784a3c6e0f8bc301dbf7009c9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/navgo/baro_board.c

  Log Message:
  -----------
  [baro] fix baro scaling for booz and navgo


  Commit: 007120aa9af3b71a77447c8f8f15d7a79802e980
      
https://github.com/paparazzi/paparazzi/commit/007120aa9af3b71a77447c8f8f15d7a79802e980
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile

  Log Message:
  -----------
  [fix] fix typo in actuators asctec v2


  Commit: b2814e7169863845fbe60af962e13f3eeb8f86db
      
https://github.com/paparazzi/paparazzi/commit/b2814e7169863845fbe60af962e13f3eeb8f86db
  Author: Gautier Hattenberger <address@hidden>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M Makefile
    A conf/abi.xml
    M conf/messages.xml

  Log Message:
  -----------
  [abi] split abi messages from telemetry messages

currently, the dtd is the same, but it can be changed in the future to
be more adapted to ABI messages


  Commit: 754e20a0ac66a6e306cf9fa8b30ec96f7f006915
      
https://github.com/paparazzi/paparazzi/commit/754e20a0ac66a6e306cf9fa8b30ec96f7f006915
  Author: TU Delft developer <address@hidden>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M sw/simulator/fg.c

  Log Message:
  -----------
  [sim] flight gear viz: daytime on all spots on the planet, not only France

closes #555


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

  Changed paths:
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/baro_board_ms5611_i2c.c
    M sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_m/baro_board.c
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/pc/baro_board.c
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    M sw/airborne/modules/sensors/baro_amsys.c
    M sw/airborne/modules/sensors/baro_bmp.c
    M sw/airborne/modules/sensors/baro_ets.c
    M sw/airborne/modules/sensors/baro_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_ms5611_i2c.c
    M sw/airborne/modules/sensors/baro_ms5611_spi.c
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    M sw/airborne/modules/sensors/baro_sim.c
    M sw/airborne/modules/sensors/pressure_board_navarro.c
    M sw/airborne/subsystems/abi_common.h
    A sw/airborne/subsystems/abi_sender_ids.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_int.c

  Log Message:
  -----------
  [abi] define ABI x_SENDER_IDs in abi_sender_ids.h

Same BARO_BOARD_SENDER_ID for all baro_board implementations.
Since there can only be one baro_board at the same time and
this provides a good default for INS_BARO_ID.

The abi_sender_ids.h can be considered a temporary solution,
we might come up with a different scheme later...


  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...


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

  Changed paths:
    M Makefile
    A conf/abi.xml
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.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
    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/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M 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/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
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/h_hex.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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M 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/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/NoVa_L.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    M conf/airframes/obsolete/booz2_flixr.xml
    M conf/airframes/obsolete/booz2_ppzuav.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.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/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
    A conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/messages.xml
    M conf/modules/baro_amsys.xml
    R conf/modules/baro_board.xml
    M conf/modules/baro_ets.xml
    M conf/modules/baro_hca.xml
    M conf/modules/baro_mpl3115.xml
    M conf/modules/baro_ms5611_spi.xml
    A conf/modules/baro_sim.xml
    M conf/settings/nps.xml
    M conf/simulator/nps/nps_sensors_params_aspirin_1.5.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
    M conf/simulator/nps/nps_sensors_params_default.h
    R sw/airborne/arch/sim/sim_baro.c
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/apogee/baro_board.h
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.h
    R sw/airborne/boards/ardrone/baro_board_dummy.c
    M sw/airborne/boards/ardrone2_raw.h
    M sw/airborne/boards/ardrone2_sdk.h
    A sw/airborne/boards/baro_board_ms5611_i2c.c
    A sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/booz/baro_board.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/krooz/baro_board.h
    M sw/airborne/boards/krooz_sd.h
    R sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_l/baro_board.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
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_s/baro_board.h
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/pc/baro_board.c
    M sw/airborne/boards/pc/baro_board.h
    M sw/airborne/boards/pc_sim.h
    M sw/airborne/boards/px4fmu/baro_board.h
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/boards/umarim/baro_board.h
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/firmwares/fixedwing/ap_downlink.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    M sw/airborne/firmwares/rotorcraft/datalink.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/telemetry.h
    M sw/airborne/lisa/test_baro_i2c.c
    A sw/airborne/math/pprz_isa.h
    M sw/airborne/modules/cam_control/cam_track.c
    M sw/airborne/modules/sensors/baro_MS5534A.c
    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
    R sw/airborne/modules/sensors/baro_board_module.c
    R 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_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_mpl3115.h
    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
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp.h
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    A sw/airborne/modules/sensors/baro_sim.c
    A sw/airborne/modules/sensors/baro_sim.h
    M sw/airborne/modules/sensors/pressure_board_navarro.c
    M sw/airborne/modules/sensors/pressure_board_navarro.h
    M sw/airborne/modules/vehicle_interface/vi_test_signal.c
    M sw/airborne/peripherals/mpl3115.c
    M sw/airborne/peripherals/mpl3115.h
    M sw/airborne/subsystems/abi.h
    M sw/airborne/subsystems/abi_common.h
    A sw/airborne/subsystems/abi_sender_ids.h
    A sw/airborne/subsystems/air_data.c
    A sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/hf_float.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/ins/ins_ardrone2.h
    M sw/airborne/subsystems/ins/ins_gps_passthrough.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    R sw/airborne/subsystems/ins/ins_int_extended.c
    R sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/sensors/baro.h
    R sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    R sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    M sw/simulator/nps/nps_autopilot.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    R sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    R sw/simulator/nps/nps_autopilot_rotorcraft.h
    M sw/simulator/nps/nps_ivy_rotorcraft.c
    M sw/simulator/nps/nps_sensor_baro.c
    M sw/simulator/nps/nps_sensor_baro.h
    M sw/tools/gen_abi.ml

  Log Message:
  -----------
  Merge pull request #525 baro_abi

Baro event handling using ABI interface

Main benefits:

less crappy handler functions in main.c files
possibility to use multiple sources of sensors (integrated to the board or not)
the filters don't need to know who is sending the raw values (not completely 
true with the old alt_float filter yet)

the pressure are now standardized in Pascal and the standard atmosphere model 
is used

The INS_BARO_SENS is hence not needed anymore.
onboard baros are automatically available in fixedwing firmware as well (use 
same code as rotorcraft now)

disable onboard baro with <configure name="USE_BARO_BOARD" value="FALSE"/>
Some stuff to do before using: find the default conversion factor to convert 
ADC values to Pascal
(mostly older boards/baro, recent digital sensors can output pressure in Pascal 
already)

Also all baro_board implementations use the same BARO_BOARD_SENDER_ID,
since there can only be one baro_board at the same time and this provides a 
good default for INS_BARO_ID.
So if you want to use an onboard baro the INS_BARO_ID is already ok (also if 
you have additional baro modules).
To use a baro module for INS: <define name="INS_BARO_ID" 
value="BARO_x_SENDER_ID"/>

closes #525


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

  Changed paths:
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.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/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M 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_sdk.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
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/h_hex.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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M 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/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    M conf/airframes/obsolete/NoVa_L.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    M conf/airframes/obsolete/booz2_flixr.xml
    M conf/airframes/obsolete/booz2_ppzuav.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.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/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
    M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
    M conf/settings/control/rotorcraft_guidance.xml
    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_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    M 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
    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_quat_float.c
    M 
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_transformations.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    R 
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
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_saturate.h
    M sw/airborne/firmwares/rotorcraft/telemetry.h

  Log Message:
  -----------
  Merge pull request #539 quat_transformations

Rotorcraft guidance fixes/improvements

So now horizontal guidance returns commands in north/east earth frame and 
doesn't already rotate it to body frame.
This allows for better handling of them in different controllers.

New and properly working transformations from earth commands to quaternions 
added.
No proper fixedpoint implementation so far... no change there compared to 
current master though.
Should still be done for efficiency.

Tested the int_quat stablizitation with this in simulation and it works 
perfectly as expected.

IMPORTANT: This does currently not have the feature to "add" roll/pitch 
setpoints via RC in nav/hover anymore.
Is that really used, instead of switching to manual if needed?
Instead you can give velocity commands in hover mode via RC.

Includes max bank improvements proposed in #546

Split PD and I-gain with separate max bank
no wind: integrator (trim attitude) = 0, PD maxbank = -20 to 20 extra: total: 
-20 to 20
huge wind: integrator (trim attitude) = 20, PD maxbank = -20 to 20 extra: 
total: 0 to 40
Put gain before integrator to get better insight in the saturation values
Reduce integration overshoots while increasing integration speed by adding the 
speed error as well
no speed error: integrate as before
counterproductive speed error, integrate faster
if the position error is already decreasing fast, no integrator is needed or it 
will overshoot

closes #539


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

  Changed paths:
    M Makefile
    M README.md
    M conf/Makefile.omap
    A conf/abi.xml
    M conf/airframes/CDW/asctec_cdw.xml
    M conf/airframes/CDW/tricopter_cdw.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
    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
    R conf/airframes/NoVa_L.xml
    M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
    M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
    M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
    M 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
    R conf/airframes/booz2_flixr.xml
    R conf/airframes/booz2_ppzuav.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
    M conf/airframes/esden/quady_ls01pwm.xml
    M conf/airframes/examples/Twinstar_energyadaptive.xml
    M conf/airframes/examples/booz2.xml
    M conf/airframes/examples/easystar_ets.xml
    M conf/airframes/examples/h_hex.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
    M conf/airframes/examples/quadrotor_lisa_s.xml
    M conf/airframes/examples/quadrotor_mlkf.xml
    M conf/airframes/examples/quadrotor_navgo.xml
    M 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
    R conf/airframes/mentor_tum.xml
    M conf/airframes/obsolete/ENAC/g1_vision.xml
    M conf/airframes/obsolete/ENAC/mkk1-vision.xml
    M conf/airframes/obsolete/ENAC/mkk1.xml
    M conf/airframes/obsolete/ENAC/nova1.xml
    A conf/airframes/obsolete/NoVa_L.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
    M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.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/UofAdelaide/A1000_BOOZ.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
    M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
    M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
    M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
    M conf/airframes/obsolete/booz2_Aron.xml
    M conf/airframes/obsolete/booz2_NoVa.xml
    M conf/airframes/obsolete/booz2_NoVa_001.xml
    M conf/airframes/obsolete/booz2_NoVa_002.xml
    M conf/airframes/obsolete/booz2_a1p.xml
    M conf/airframes/obsolete/booz2_a2.xml
    M conf/airframes/obsolete/booz2_a3.xml
    M conf/airframes/obsolete/booz2_a4.xml
    M conf/airframes/obsolete/booz2_a5.xml
    A conf/airframes/obsolete/booz2_flixr.xml
    A conf/airframes/obsolete/booz2_ppzuav.xml
    M conf/airframes/obsolete/booz2_s1.xml
    M conf/airframes/obsolete/booz2_x1.xml
    M conf/airframes/obsolete/example_heli_lisam.xml
    A conf/airframes/obsolete/mentor_tum.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/stm32f4_discovery.makefile
    M conf/conf_example.xml
    M conf/conf_tests.xml
    M conf/firmwares/lisa_test_progs.makefile
    M conf/firmwares/rotorcraft.makefile
    M conf/firmwares/subsystems/fixedwing/autopilot.makefile
    M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
    M conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile
    M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
    M conf/firmwares/subsystems/rotorcraft/ins.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
    M conf/firmwares/subsystems/rotorcraft/ins_hff.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_asctec_v2.makefile
    A conf/firmwares/subsystems/shared/baro_board.makefile
    M conf/flight_plans/flight_plan.dtd
    A conf/flight_plans/mission_fw.xml
    M conf/messages.xml
    M conf/modules/baro_amsys.xml
    R conf/modules/baro_board.xml
    M conf/modules/baro_ets.xml
    M conf/modules/baro_hca.xml
    M conf/modules/baro_mpl3115.xml
    M conf/modules/baro_ms5611_spi.xml
    A conf/modules/baro_sim.xml
    A conf/modules/mission_fw.xml
    M conf/settings/control/rotorcraft_guidance.xml
    A conf/settings/estimation/ahrs_float_cmpl.xml
    M conf/settings/estimation/ahrs_int_cmpl_quat.xml
    M conf/settings/nps.xml
    M conf/simulator/nps/nps_sensors_params_aspirin_1.5.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1.h
    M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
    M conf/simulator/nps/nps_sensors_params_default.h
    R sw/airborne/arch/sim/sim_baro.c
    M sw/airborne/boards/apogee/baro_board.c
    M sw/airborne/boards/apogee/baro_board.h
    M sw/airborne/boards/apogee/imu_apogee.c
    M sw/airborne/boards/apogee_0.99.h
    M sw/airborne/boards/apogee_1.0.h
    M sw/airborne/boards/ardrone/baro_board.c
    M sw/airborne/boards/ardrone/baro_board.h
    R sw/airborne/boards/ardrone/baro_board_dummy.c
    M sw/airborne/boards/ardrone2_raw.h
    M sw/airborne/boards/ardrone2_sdk.h
    A sw/airborne/boards/baro_board_ms5611_i2c.c
    A sw/airborne/boards/baro_board_ms5611_spi.c
    M sw/airborne/boards/booz/baro_board.c
    M sw/airborne/boards/booz/baro_board.h
    M sw/airborne/boards/booz_1.0.h
    M sw/airborne/boards/krooz/baro_board.h
    M sw/airborne/boards/krooz_sd.h
    R sw/airborne/boards/lia/baro_board.h
    M sw/airborne/boards/lia_1.1.h
    M sw/airborne/boards/lisa_l/baro_board.c
    M sw/airborne/boards/lisa_l/baro_board.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
    M sw/airborne/boards/lisa_m_1.0.h
    M sw/airborne/boards/lisa_m_2.0.h
    M sw/airborne/boards/lisa_s/baro_board.h
    M sw/airborne/boards/navgo/baro_board.c
    M sw/airborne/boards/navgo/baro_board.h
    M sw/airborne/boards/navgo_1.0.h
    M sw/airborne/boards/pc/baro_board.c
    M sw/airborne/boards/pc/baro_board.h
    M sw/airborne/boards/pc_sim.h
    M sw/airborne/boards/px4fmu/baro_board.h
    M sw/airborne/boards/stm32f4_discovery.h
    M sw/airborne/boards/umarim/baro_board.c
    M sw/airborne/boards/umarim/baro_board.h
    M sw/airborne/boards/umarim_1.0.h
    M sw/airborne/firmwares/fixedwing/main_ap.c
    M sw/airborne/firmwares/fixedwing/main_fbw.c
    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_h_ref.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.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
    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_quat_float.c
    M 
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_transformations.c
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.h
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
    R 
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
    A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_saturate.h
    M sw/airborne/lisa/test_baro_i2c.c
    M sw/airborne/math/pprz_algebra_int.h
    M sw/airborne/math/pprz_geodetic_int.c
    M sw/airborne/math/pprz_geodetic_int.h
    A sw/airborne/math/pprz_isa.h
    M sw/airborne/modules/cam_control/cam_track.c
    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/baro_MS5534A.c
    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
    R sw/airborne/modules/sensors/baro_board_module.c
    R 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_hca.c
    M sw/airborne/modules/sensors/baro_mpl3115.c
    M sw/airborne/modules/sensors/baro_mpl3115.h
    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
    M sw/airborne/modules/sensors/baro_scp.c
    M sw/airborne/modules/sensors/baro_scp.h
    M sw/airborne/modules/sensors/baro_scp_i2c.c
    A sw/airborne/modules/sensors/baro_sim.c
    A sw/airborne/modules/sensors/baro_sim.h
    M sw/airborne/modules/sensors/pressure_board_navarro.c
    M sw/airborne/modules/sensors/pressure_board_navarro.h
    M sw/airborne/modules/vehicle_interface/vi_test_signal.c
    M sw/airborne/peripherals/mpl3115.c
    M sw/airborne/peripherals/mpl3115.h
    M sw/airborne/state.c
    M sw/airborne/subsystems/abi.h
    M sw/airborne/subsystems/abi_common.h
    A sw/airborne/subsystems/abi_sender_ids.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
    A sw/airborne/subsystems/air_data.c
    A sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/ins/hf_float.c
    M sw/airborne/subsystems/ins/hf_float.h
    M sw/airborne/subsystems/ins/ins_alt_float.c
    M sw/airborne/subsystems/ins/ins_alt_float.h
    M sw/airborne/subsystems/ins/ins_ardrone2.c
    M sw/airborne/subsystems/ins/ins_ardrone2.h
    M sw/airborne/subsystems/ins/ins_gps_passthrough.c
    M sw/airborne/subsystems/ins/ins_int.c
    M sw/airborne/subsystems/ins/ins_int.h
    R sw/airborne/subsystems/ins/ins_int_extended.c
    R sw/airborne/subsystems/ins/ins_int_extended.h
    M sw/airborne/subsystems/navigation/common_nav.c
    M sw/airborne/subsystems/sensors/baro.h
    R sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
    R sw/airborne/subsystems/sensors/baro_ms5611_spi.c
    M sw/airborne/test/Makefile
    M sw/airborne/test/test_geodetic.c
    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/simulator/fg.c
    M sw/simulator/nps/nps_autopilot.h
    M sw/simulator/nps/nps_autopilot_fixedwing.c
    R sw/simulator/nps/nps_autopilot_fixedwing.h
    M sw/simulator/nps/nps_autopilot_rotorcraft.c
    R sw/simulator/nps/nps_autopilot_rotorcraft.h
    M sw/simulator/nps/nps_ivy_rotorcraft.c
    M sw/simulator/nps/nps_sensor_baro.c
    M sw/simulator/nps/nps_sensor_baro.h
    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/gen_abi.ml
    M sw/tools/gen_flight_plan.ml
    M sw/tools/gen_settings.ml

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

* master: (125 commits)
  [abi] define ABI x_SENDER_IDs in abi_sender_ids.h
  [sim] flight gear viz: daytime on all spots on the planet, not only France
  [abi] split abi messages from telemetry messages
  [fix] fix typo in actuators asctec v2
  [baro] fix baro scaling for booz and navgo
  [boards] sim pc: only USE_BARO_BOARD for nps
  [conf] move some airframes to obsolete
  [modules] add baro_sim
  [sim] remove unused sim_baro
  [apogee] fix baro mpl3115 init on apogee
  Update README for recommended gcc-arm-embedded toolchain
  [boards] stm32f4_discovery typo in description
  [boards] roughly correct BOOZ_BARO_SENS
  [modules] baro_ets: BARO_ETS_SCALE
  [modules] baro modules for real sensors only for ap target, not sim
  [conf] remove baro_board.xml module file
  [boards] update stm32f4_discovery
  [lib/ocaml] update leap_seconds
  [mission] fix segmentation fault and add generic mission FP
  [generator] generate arrays of the settings and fp blocks names
  ...

Conflicts:
        sw/airborne/firmwares/fixedwing/ap_downlink.h
        sw/airborne/firmwares/fixedwing/main_ap.c
        sw/airborne/firmwares/rotorcraft/telemetry.h
        sw/airborne/modules/sensors/baro_MS5534A.c


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

  Changed paths:
    M conf/messages.xml
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
    M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h

  Log Message:
  -----------
  [telemetry] update HOVER_LOOP

remove unused cmd_body and nav_err


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

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.c
    M sw/airborne/firmwares/rotorcraft/autopilot.c
    M sw/airborne/mcu_periph/i2c.c
    M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
    M sw/airborne/subsystems/air_data.c
    M sw/airborne/subsystems/air_data.h
    M sw/airborne/subsystems/ins/ins_int.c

  Log Message:
  -----------
  [telemetry] some updates for baro, ins, etc..

after merging master


Compare: 
https://github.com/paparazzi/paparazzi/compare/8de915bbf26c...61cb9a568ee2

reply via email to

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