paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [paparazzi/paparazzi] 578852: Aspirin calibration fo


From: noreply
Subject: [paparazzi-commits] [paparazzi/paparazzi] 578852: Aspirin calibration for JT lisa m
Date: Sun, 19 Jun 2011 23:06:26 -0700

  Branch: refs/heads/new-state-interface
  Home:   https://github.com/paparazzi/paparazzi

  Commit: 578852886498c274ce95d53ca70734fe8a0e7d9b
      
https://github.com/paparazzi/paparazzi/commit/578852886498c274ce95d53ca70734fe8a0e7d9b
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M conf/airframes/esden/calib/aspirin_jtm.xml

  Log Message:
  -----------
  Aspirin calibration for JT lisa m


  Commit: db2995515a7c91da33203fe17e770bd6f4d68f59
      
https://github.com/paparazzi/paparazzi/commit/db2995515a7c91da33203fe17e770bd6f4d68f59
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Swap aileron directions for different hardware


  Commit: 81eff511a3123fb00190a6875d8134989e5f421b
      
https://github.com/paparazzi/paparazzi/commit/81eff511a3123fb00190a6875d8134989e5f421b
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Adjust min/max motor for lisa_m, idle lower, max lower


  Commit: 8de402034750643b5f85342b2365f2aae8dab8e0
      
https://github.com/paparazzi/paparazzi/commit/8de402034750643b5f85342b2365f2aae8dab8e0
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Hover tuning for JT + lisa_m


  Commit: 0cccf2582ad1a99e10148951544dd5d07ddcec83
      
https://github.com/paparazzi/paparazzi/commit/0cccf2582ad1a99e10148951544dd5d07ddcec83
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    A conf/settings/settings_booz2_jtm.xml

  Log Message:
  -----------
  Add new settings file for booz2_jtm


  Commit: 440c7a6dd052ec5ecf3460514e480aa0c5f9ce8f
      
https://github.com/paparazzi/paparazzi/commit/440c7a6dd052ec5ecf3460514e480aa0c5f9ce8f
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c

  Log Message:
  -----------
  Add SetActuatorsFromCommands to actuators_pwm_supervisiot to allow using
command laws (useful for servos for example)


  Commit: b5094d3ae8e305bb37c791a9157df134f25e147e
      
https://github.com/paparazzi/paparazzi/commit/b5094d3ae8e305bb37c791a9157df134f25e147e
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  More tuning for jt_lisam


  Commit: 8e07d4945276ba662cc1c27e84607e69e00c07b2
      
https://github.com/paparazzi/paparazzi/commit/8e07d4945276ba662cc1c27e84607e69e00c07b2
  Author: Allen <address@hidden>
  Date:   2011-05-18 (Wed, 18 May 2011)

  Changed paths:
    M sw/ground_segment/python/joystick/arduino_dangerboard.py
  M sw/ground_segment/python/joystick/ivydanger.py
  M sw/lib/python/settings_xml_parse.py

  Log Message:
  -----------
  Fixes/kludgeness for case sensitivity in XML parsing for joystick tuner
and add command line option for serial port


  Commit: 6213f5ae92eec65bb99f661f80af7c2621c731e1
      
https://github.com/paparazzi/paparazzi/commit/6213f5ae92eec65bb99f661f80af7c2621c731e1
  Author: Martin Mueller <address@hidden>
  Date:   2011-05-19 (Thu, 19 May 2011)

  Changed paths:
    M conf/messages.xml
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/ir_mlx.h

  Log Message:
  -----------
  add serial number readout for MLX90614


  Commit: 6b03871bfd7a0ffd589749e6b8fbb6a28064831f
      
https://github.com/paparazzi/paparazzi/commit/6b03871bfd7a0ffd589749e6b8fbb6a28064831f
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-19 (Thu, 19 May 2011)

  Changed paths:
    M conf/airframes/esden/lisa_asctec.xml
  M sw/airborne/lisa/lisa_overo_link.h

  Log Message:
  -----------
  only include lisa_overo_link_arch.h if not building sim, outcomment 
vehicle_interface_overo_link.xml module in piotr's lisa asctec airframe file 
for now


  Commit: e07bfae0f198672a2c27d88ae4d2919f32ad495e
      
https://github.com/paparazzi/paparazzi/commit/e07bfae0f198672a2c27d88ae4d2919f32ad495e
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-19 (Thu, 19 May 2011)

  Changed paths:
    M sw/airborne/modules/ins/ins_arduimu_basic.c

  Log Message:
  -----------
  fix typo, thx Chris


  Commit: f0e845b20a623cfa967909e92f7e14c7dc2044d3
      
https://github.com/paparazzi/paparazzi/commit/f0e845b20a623cfa967909e92f7e14c7dc2044d3
  Author: Martin Mueller <address@hidden>
  Date:   2011-05-21 (Sat, 21 May 2011)

  Changed paths:
    M conf/messages.xml
  A conf/modules/humid_htm_b71.xml
  A sw/airborne/modules/meteo/humid_htm_b71.c
  A sw/airborne/modules/meteo/humid_htm_b71.h

  Log Message:
  -----------
  add TronSens HTM-B71 humidity sensor


  Commit: 7e9f4fd7b15527de31c847fec6ee5192dcc58f22
      
https://github.com/paparazzi/paparazzi/commit/7e9f4fd7b15527de31c847fec6ee5192dcc58f22
  Author: Martin Mueller <address@hidden>
  Date:   2011-05-21 (Sat, 21 May 2011)

  Changed paths:
    M conf/messages.xml
  A conf/modules/baro_ms5611_i2c.xml
  A sw/airborne/modules/sensors/baro_ms5611_i2c.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.h

  Log Message:
  -----------
  add Measurement Specialties MS5611-01BA pressure/temperature sensor


  Commit: 64fde73611368441612bdf69295eaeb8c0a2f8f5
      
https://github.com/paparazzi/paparazzi/commit/64fde73611368441612bdf69295eaeb8c0a2f8f5
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-22 (Sun, 22 May 2011)

  Changed paths:
    M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  A conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/booz2_flixr.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/obsolete/booz_test_progs.makefile
  A conf/autopilot/obsolete/gps_ugear.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  A conf/autopilot/obsolete/sitl.makefile
  A conf/autopilot/obsolete/sitl_jsbsim.makefile
  A conf/autopilot/obsolete/sitl_link_pprz.makefile
  A conf/autopilot/obsolete/sitl_link_xbee.makefile
  M conf/autopilot/rotorcraft.makefile
  R conf/autopilot/sitl.makefile
  R conf/autopilot/sitl_jsbsim.makefile
  R conf/autopilot/sitl_link_pprz.makefile
  R conf/autopilot/sitl_link_xbee.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
  R conf/autopilot/subsystems/fixedwing/gps_ugear.makefile
  M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/navigation.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
  M conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/messages.xml
  A conf/modules/baro_ms5611_i2c.xml
  A conf/modules/gps_ubx_uart.xml
  A conf/modules/humid_htm_b71.xml
  A conf/modules/ins_aspirin_via_i2c.xml
  M conf/modules/ins_xsens_MTiG_fixedwing.xml
  A conf/modules/mag_hmc5843.xml
  A conf/radios/R6107SP_7ch.xml
  M conf/settings/basic.xml
  M conf/settings/lisa.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_basic_ins.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_tp_auto.xml
  M conf/settings/ugv.xml
  M conf/telemetry/booz_minimal.xml
  M conf/telemetry/telemetry_booz2.xml
  M conf/xsens_MTi-G.xml
  M sw/airborne/ap_downlink.h
  R sw/airborne/arch/lpc21/gps_hw.h
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.h
  R sw/airborne/arch/sim/gps_hw.c
  R sw/airborne/arch/sim/gps_hw.h
  M sw/airborne/arch/sim/jsbsim_gps.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_baro.c
  M sw/airborne/arch/sim/sim_gps.c
  R sw/airborne/arch/sim/sim_jsbsim.c
  R sw/airborne/arch/stm32/gps_hw.h
  R sw/airborne/booz/booz2_commands.c
  R sw/airborne/booz/booz2_commands.h
  R sw/airborne/booz/booz_gps.c
  R sw/airborne/booz/booz_gps.h
  R sw/airborne/booz/gps/booz_gps_skytraq.c
  R sw/airborne/booz/gps/booz_gps_skytraq.h
  R sw/airborne/booz/gps/booz_gps_ubx.c
  R sw/airborne/booz/gps/booz_gps_ubx.h
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/csc/mercury_ap.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  A sw/airborne/firmwares/rotorcraft/commands.c
  A sw/airborne/firmwares/rotorcraft/commands.h
  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
  R sw/airborne/gps.c
  R sw/airborne/gps.h
  R sw/airborne/gps_ubx.c
  R sw/airborne/gps_ubx.h
  R sw/airborne/gps_xsens.c
  R sw/airborne/gps_xsens.h
  R sw/airborne/latlong.c
  R sw/airborne/latlong.h
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.c
  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/math/pprz_geodetic_utm.h
  A sw/airborne/math/pprz_geodetic_wgs84.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  A sw/airborne/modules/gps/gps_ubx_uart.h
  M sw/airborne/modules/gps_i2c/gps_i2c.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  R sw/airborne/modules/ins/ins_osam_ugear.c
  R sw/airborne/modules/ins/ins_osam_ugear.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/meteo/humid_htm_b71.c
  A sw/airborne/modules/meteo/humid_htm_b71.h
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/ir_mlx.h
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.c
  M sw/airborne/modules/sensors/baro_ets.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.h
  A sw/airborne/modules/sensors/mag_hmc5843.c
  A sw/airborne/modules/sensors/mag_hmc5843.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/modules/vehicle_interface/vi.c
  M sw/airborne/modules/vehicle_interface/vi_overo_link.c
  A sw/airborne/obsolete/booz_gps.c
  A sw/airborne/obsolete/booz_gps.h
  A sw/airborne/obsolete/booz_gps_skytraq.c
  A sw/airborne/obsolete/booz_gps_skytraq.h
  A sw/airborne/obsolete/booz_gps_ubx.c
  A sw/airborne/obsolete/booz_gps_ubx.h
  A sw/airborne/obsolete/gps.c
  A sw/airborne/obsolete/gps.h
  A sw/airborne/obsolete/gps_ubx.c
  A sw/airborne/obsolete/gps_ubx.h
  A sw/airborne/obsolete/ins_osam_ugear.c
  A sw/airborne/obsolete/ins_osam_ugear.h
  A sw/airborne/obsolete/latlong.c
  A sw/airborne/obsolete/latlong.h
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/peripherals/hmc5843.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/gps.c
  A sw/airborne/subsystems/gps.h
  A sw/airborne/subsystems/gps/gps_sim.c
  A sw/airborne/subsystems/gps/gps_sim.h
  A sw/airborne/subsystems/gps/gps_sim_nps.c
  A sw/airborne/subsystems/gps/gps_sim_nps.h
  A sw/airborne/subsystems/gps/gps_skytraq.c
  A sw/airborne/subsystems/gps/gps_skytraq.h
  A sw/airborne/subsystems/gps/gps_ubx.c
  A sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins/hf_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/OSAMNav.h
  A sw/airborne/subsystems/navigation/common_flight_plan.c
  A sw/airborne/subsystems/navigation/common_flight_plan.h
  M sw/airborne/subsystems/navigation/common_nav.c
  M sw/airborne/subsystems/navigation/common_nav.h
  M sw/airborne/subsystems/navigation/discsurvey.c
  M sw/airborne/subsystems/navigation/nav_cube.c
  M sw/airborne/subsystems/navigation/nav_line.c
  M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
  M sw/airborne/subsystems/navigation/snav.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/test/test_actuators.c
  M sw/airborne/test/test_geodetic.c
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/include/std.h
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/export.ml
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/tools/gen_flight_plan.ml

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


  Commit: 6a52eb9355489f539afe6e899374b4a3c2cb100d
      
https://github.com/paparazzi/paparazzi/commit/6a52eb9355489f539afe6e899374b4a3c2cb100d
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-22 (Sun, 22 May 2011)

  Changed paths:
    M conf/control_panel.xml.example
  M conf/flight_plans/versatile_carto_fixe_muret.xml
  M conf/messages.xml
  M conf/modules/cartography.xml
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.c
  M sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/gps_nmea.c
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/ins/ins_module.h
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c

  Log Message:
  -----------
  Merge remote-tracking branch 'gautier/uart' into dev-uart


  Commit: 4519a597c6e5fb2be78bb5de593ec7d9c7d730b5
      
https://github.com/paparazzi/paparazzi/commit/4519a597c6e5fb2be78bb5de593ec7d9c7d730b5
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-22 (Sun, 22 May 2011)

  Changed paths:
    M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_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/gps_nmea.c
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/ins/ins_module.h
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c

  Log Message:
  -----------
  Merge remote-tracking branch 'flixr/dev-uart' into dev


  Commit: a22ff3b070e2d109f75997f28640ab1121467fe5
      
https://github.com/paparazzi/paparazzi/commit/a22ff3b070e2d109f75997f28640ab1121467fe5
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-22 (Sun, 22 May 2011)

  Changed paths:
    A conf/airframes/esden/calib/aspirin_jtm.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  A conf/settings/settings_booz2_jtm.xml
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/lisa/lisa_overo_link.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/ground_segment/python/joystick/arduino_dangerboard.py
  M sw/ground_segment/python/joystick/ivydanger.py
  M sw/lib/python/settings_xml_parse.py

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


  Commit: 1604d98406bcf99511d9fe13bd85e9bfdf38ec95
      
https://github.com/paparazzi/paparazzi/commit/1604d98406bcf99511d9fe13bd85e9bfdf38ec95
  Author: Martin Mueller <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/messages.xml
  A conf/modules/charge_sens.xml
  A sw/airborne/firmwares/non_ap/charge_sens/charge_sens.pde
  A sw/airborne/modules/meteo/charge_sens.c
  A sw/airborne/modules/meteo/charge_sens.h

  Log Message:
  -----------
  add University of Reading atmosphere charge sensor


  Commit: 56ea7cc7fa8c040c42364f1fe43aed9cf9572653
      
https://github.com/paparazzi/paparazzi/commit/56ea7cc7fa8c040c42364f1fe43aed9cf9572653
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    A conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  A conf/flight_plans/corsica.xml
  A conf/flight_plans/corsica_sectors.xml
  A conf/modules/alt_filter.xml
  A conf/modules/generic_com.xml
  A sw/airborne/modules/com/generic_com.c
  A sw/airborne/modules/com/generic_com.h
  A sw/airborne/modules/ins/alt_filter.c
  A sw/airborne/modules/ins/alt_filter.h
  M sw/airborne/modules/sensors/baro_ets.c

  Log Message:
  -----------
  airframe and utilities for corsica


  Commit: 0f73cd4efaf2e33e7892e1f7899c64ddec6483fd
      
https://github.com/paparazzi/paparazzi/commit/0f73cd4efaf2e33e7892e1f7899c64ddec6483fd
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M sw/airborne/arch/sim/jsbsim_ir.c

  Log Message:
  -----------
  try to compile jsbsim with arduimu


  Commit: fd4d0218d553edea5bca6077bb34cb45ef83562c
      
https://github.com/paparazzi/paparazzi/commit/fd4d0218d553edea5bca6077bb34cb45ef83562c
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M sw/airborne/modules/vehicle_interface/vi.c

  Log Message:
  -----------
  vehicle interface: fix include for gps header


  Commit: 402342726bc316a8b9b88aededd30403587820c5
      
https://github.com/paparazzi/paparazzi/commit/402342726bc316a8b9b88aededd30403587820c5
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M sw/ground_segment/cockpit/live.ml

  Log Message:
  -----------
  fix gps reset from gcs


  Commit: ff32873da00955e18063fa3bc2955549face8e1d
      
https://github.com/paparazzi/paparazzi/commit/ff32873da00955e18063fa3bc2955549face8e1d
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Add a few defines to lisa JT_M airframe for stabilization


  Commit: d4a7fb0add03bbc1180d5907a8d47d6ef09caa73
      
https://github.com/paparazzi/paparazzi/commit/d4a7fb0add03bbc1180d5907a8d47d6ef09caa73
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

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

  Log Message:
  -----------
  Add a few new quaternion macros to pprz_algebra_int (not yet tested)


  Commit: 194f1784950057fc3efa42e45440d0c81b55b87d
      
https://github.com/paparazzi/paparazzi/commit/194f1784950057fc3efa42e45440d0c81b55b87d
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

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

  Log Message:
  -----------
  Fix SIN/COS typo in INT32_QUAT_OF_AXIS_ANGLE


  Commit: d097224b5697e9357030da588f749c55fc2fc0bd
      
https://github.com/paparazzi/paparazzi/commit/d097224b5697e9357030da588f749c55fc2fc0bd
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

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

  Log Message:
  -----------
  Update attitude_viz -- ported to pygame


  Commit: 53699e61eeacf7036cfbd8ec6da17c471c3fc4a4
      
https://github.com/paparazzi/paparazzi/commit/53699e61eeacf7036cfbd8ec6da17c471c3fc4a4
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    A conf/autopilot/subsystems/rotorcraft/stabilization_euler.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile

  Log Message:
  -----------
  Add stabilization files for euler and quaternion variants


  Commit: ad17a73acd37b971420512adfd62d9a24766c8db
      
https://github.com/paparazzi/paparazzi/commit/ad17a73acd37b971420512adfd62d9a24766c8db
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  A conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/obsolete/booz_test_progs.makefile
  A conf/autopilot/obsolete/gps_ugear.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  A conf/autopilot/obsolete/sitl.makefile
  A conf/autopilot/obsolete/sitl_jsbsim.makefile
  A conf/autopilot/obsolete/sitl_link_pprz.makefile
  A conf/autopilot/obsolete/sitl_link_xbee.makefile
  M conf/autopilot/rotorcraft.makefile
  R conf/autopilot/sitl.makefile
  R conf/autopilot/sitl_jsbsim.makefile
  R conf/autopilot/sitl_link_pprz.makefile
  R conf/autopilot/sitl_link_xbee.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
  R conf/autopilot/subsystems/fixedwing/gps_ugear.makefile
  M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/navigation.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
  M conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/messages.xml
  A conf/modules/baro_ms5611_i2c.xml
  A conf/modules/charge_sens.xml
  A conf/modules/gps_ubx_uart.xml
  A conf/modules/humid_htm_b71.xml
  A conf/modules/ins_aspirin_via_i2c.xml
  M conf/modules/ins_xsens_MTiG_fixedwing.xml
  A conf/modules/mag_hmc5843.xml
  A conf/radios/R6107SP_7ch.xml
  M conf/settings/basic.xml
  M conf/settings/lisa.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_basic_ins.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_tp_auto.xml
  M conf/settings/ugv.xml
  M conf/telemetry/booz_minimal.xml
  M conf/telemetry/telemetry_booz2.xml
  M conf/xsens_MTi-G.xml
  M sw/airborne/ap_downlink.h
  R sw/airborne/arch/lpc21/gps_hw.h
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.h
  R sw/airborne/arch/sim/gps_hw.c
  R sw/airborne/arch/sim/gps_hw.h
  M sw/airborne/arch/sim/jsbsim_gps.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_baro.c
  M sw/airborne/arch/sim/sim_gps.c
  R sw/airborne/arch/sim/sim_jsbsim.c
  R sw/airborne/arch/stm32/gps_hw.h
  R sw/airborne/booz/booz2_commands.c
  R sw/airborne/booz/booz2_commands.h
  R sw/airborne/booz/booz_gps.c
  R sw/airborne/booz/booz_gps.h
  R sw/airborne/booz/gps/booz_gps_skytraq.c
  R sw/airborne/booz/gps/booz_gps_skytraq.h
  R sw/airborne/booz/gps/booz_gps_ubx.c
  R sw/airborne/booz/gps/booz_gps_ubx.h
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/csc/mercury_ap.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  A sw/airborne/firmwares/non_ap/charge_sens/charge_sens.pde
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  A sw/airborne/firmwares/rotorcraft/commands.c
  A sw/airborne/firmwares/rotorcraft/commands.h
  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
  R sw/airborne/gps.c
  R sw/airborne/gps.h
  R sw/airborne/gps_ubx.c
  R sw/airborne/gps_ubx.h
  R sw/airborne/gps_xsens.c
  R sw/airborne/gps_xsens.h
  R sw/airborne/latlong.c
  R sw/airborne/latlong.h
  M sw/airborne/lisa/lisa_overo_link.h
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.c
  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/math/pprz_geodetic_utm.h
  A sw/airborne/math/pprz_geodetic_wgs84.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  A sw/airborne/modules/gps/gps_ubx_uart.h
  M sw/airborne/modules/gps_i2c/gps_i2c.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  R sw/airborne/modules/ins/ins_osam_ugear.c
  R sw/airborne/modules/ins/ins_osam_ugear.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/meteo/charge_sens.c
  A sw/airborne/modules/meteo/charge_sens.h
  A sw/airborne/modules/meteo/humid_htm_b71.c
  A sw/airborne/modules/meteo/humid_htm_b71.h
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/ir_mlx.h
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.c
  M sw/airborne/modules/sensors/baro_ets.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.h
  A sw/airborne/modules/sensors/mag_hmc5843.c
  A sw/airborne/modules/sensors/mag_hmc5843.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/modules/vehicle_interface/vi.c
  M sw/airborne/modules/vehicle_interface/vi_overo_link.c
  A sw/airborne/obsolete/booz_gps.c
  A sw/airborne/obsolete/booz_gps.h
  A sw/airborne/obsolete/booz_gps_skytraq.c
  A sw/airborne/obsolete/booz_gps_skytraq.h
  A sw/airborne/obsolete/booz_gps_ubx.c
  A sw/airborne/obsolete/booz_gps_ubx.h
  A sw/airborne/obsolete/gps.c
  A sw/airborne/obsolete/gps.h
  A sw/airborne/obsolete/gps_ubx.c
  A sw/airborne/obsolete/gps_ubx.h
  A sw/airborne/obsolete/ins_osam_ugear.c
  A sw/airborne/obsolete/ins_osam_ugear.h
  A sw/airborne/obsolete/latlong.c
  A sw/airborne/obsolete/latlong.h
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/peripherals/hmc5843.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/gps.c
  A sw/airborne/subsystems/gps.h
  A sw/airborne/subsystems/gps/gps_sim.c
  A sw/airborne/subsystems/gps/gps_sim.h
  A sw/airborne/subsystems/gps/gps_sim_nps.c
  A sw/airborne/subsystems/gps/gps_sim_nps.h
  A sw/airborne/subsystems/gps/gps_skytraq.c
  A sw/airborne/subsystems/gps/gps_skytraq.h
  A sw/airborne/subsystems/gps/gps_ubx.c
  A sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins/hf_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/OSAMNav.h
  A sw/airborne/subsystems/navigation/common_flight_plan.c
  A sw/airborne/subsystems/navigation/common_flight_plan.h
  M sw/airborne/subsystems/navigation/common_nav.c
  M sw/airborne/subsystems/navigation/common_nav.h
  M sw/airborne/subsystems/navigation/discsurvey.c
  M sw/airborne/subsystems/navigation/nav_cube.c
  M sw/airborne/subsystems/navigation/nav_line.c
  M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
  M sw/airborne/subsystems/navigation/snav.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/test/test_actuators.c
  M sw/airborne/test/test_geodetic.c
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/include/std.h
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/export.ml
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/tools/gen_flight_plan.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 03afbbf05644dc635e2a91ea1331ad8636311ec9
      
https://github.com/paparazzi/paparazzi/commit/03afbbf05644dc635e2a91ea1331ad8636311ec9
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/autopilot/rotorcraft.xml

  Log Message:
  -----------
  Add xml for euler / quaternion stabilization options


  Commit: b3d362adfb5fbb61019a3a254f27319f66cb0585
      
https://github.com/paparazzi/paparazzi/commit/b3d362adfb5fbb61019a3a254f27319f66cb0585
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h

  Log Message:
  -----------
  Add Int32RefModel struct


  Commit: 849d47234c82b3b9483b27fb2e221f27145c2174
      
https://github.com/paparazzi/paparazzi/commit/849d47234c82b3b9483b27fb2e221f27145c2174
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c

  Log Message:
  -----------
  Adjust to booz2_commands -> commands renaming in
actuators_pwm_supervision


  Commit: c5f2dd968c8dbc9f889dfee383c6747bc6544073
      
https://github.com/paparazzi/paparazzi/commit/c5f2dd968c8dbc9f889dfee383c6747bc6544073
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/autopilot/rotorcraft.makefile

  Log Message:
  -----------
  Split stabilization into separate bits euler and quaternion


  Commit: bcd7f7136bd5e568281e1267890b3b9affc62205
      
https://github.com/paparazzi/paparazzi/commit/bcd7f7136bd5e568281e1267890b3b9affc62205
  Author: Allen <address@hidden>
  Date:   2011-05-23 (Mon, 23 May 2011)

  Changed paths:
    A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h

  Log Message:
  -----------
  Add new quaternion integer code


  Commit: d5ebb963f1b18dda84b7b635e89ee9bd0fe3991e
      
https://github.com/paparazzi/paparazzi/commit/d5ebb963f1b18dda84b7b635e89ee9bd0fe3991e
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    A conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  R conf/autopilot/subsystems/shared/ahrs_ic.makefile

  Log Message:
  -----------
  fix ahrs_ic: seperate makefiles for rotorcraft and fixedwing


  Commit: e3162388fb609292689af591d7380cc44b2ad4ef
      
https://github.com/paparazzi/paparazzi/commit/e3162388fb609292689af591d7380cc44b2ad4ef
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile

  Log Message:
  -----------
  add math files to sources in main autopilot.makefile (fixedwing) and 
rotorcraft.makefile, no longer in subsystem makefiles


  Commit: 98be01562f9df3b4acec7f1eba45ca6f58804db0
      
https://github.com/paparazzi/paparazzi/commit/98be01562f9df3b4acec7f1eba45ca6f58804db0
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c

  Log Message:
  -----------
  use Antoines new i2c arch by default


  Commit: 43118060213a3e20902beceb106b5b94397a44ff
      
https://github.com/paparazzi/paparazzi/commit/43118060213a3e20902beceb106b5b94397a44ff
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/rotorcraft.xml
  A conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_euler.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile
  R conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/messages.xml
  A conf/modules/charge_sens.xml
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  A sw/airborne/firmwares/non_ap/charge_sens/charge_sens.pde
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/math/pprz_algebra_int.h
  A sw/airborne/modules/meteo/charge_sens.c
  A sw/airborne/modules/meteo/charge_sens.h
  M sw/airborne/modules/vehicle_interface/vi.c
  M sw/ground_segment/cockpit/live.ml
  M sw/in_progress/python/attitude_viz.py

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


  Commit: f3988edf49b0b5b62f887d6408d48b05110ff518
      
https://github.com/paparazzi/paparazzi/commit/f3988edf49b0b5b62f887d6408d48b05110ff518
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

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

  Log Message:
  -----------
  Fix INT32_QUAT_DERIVATIVE


  Commit: cb47489255330e5881363a9b5df2de8616acaf9c
      
https://github.com/paparazzi/paparazzi/commit/cb47489255330e5881363a9b5df2de8616acaf9c
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Adjust order of commands for JT lisa M to match assumptions in
attitude_quat_int


  Commit: 562f9db31124b731a98fc77c64a97ca84d96c120
      
https://github.com/paparazzi/paparazzi/commit/562f9db31124b731a98fc77c64a97ca84d96c120
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Switch to 2D update for now for jt_lisam


  Commit: 3f0c9f2180eb5843b2622ee2a05a22c5cb287dc7
      
https://github.com/paparazzi/paparazzi/commit/3f0c9f2180eb5843b2622ee2a05a22c5cb287dc7
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Body to IMU rotations for airplane system


  Commit: b8ebe81363bb34c7a410238bb284b2dff36713a6
      
https://github.com/paparazzi/paparazzi/commit/b8ebe81363bb34c7a410238bb284b2dff36713a6
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h

  Log Message:
  -----------
  Add some #defines for fixed point quaternion reference


  Commit: 084b5f5b37c07d01f84b717622684637a6d9ca82
      
https://github.com/paparazzi/paparazzi/commit/084b5f5b37c07d01f84b717622684637a6d9ca82
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

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

  Log Message:
  -----------
  Update attitude_quat_int controller to try and match gains to euler
controller


  Commit: f8187b0b2d7680b2bbf052bbf1a4f9ddbc9a40d8
      
https://github.com/paparazzi/paparazzi/commit/f8187b0b2d7680b2bbf052bbf1a4f9ddbc9a40d8
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

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

  Log Message:
  -----------
  Fixes to integer quaternion reference generation for rotorcraft
stabilization , still WIP


  Commit: 8995cc339a8485d7e46339d5a4cd15a274b0558c
      
https://github.com/paparazzi/paparazzi/commit/8995cc339a8485d7e46339d5a4cd15a274b0558c
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  R conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 6c48298e96ed0350b3f0a4227676c6f9b89ebde9
      
https://github.com/paparazzi/paparazzi/commit/6c48298e96ed0350b3f0a4227676c6f9b89ebde9
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

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

  Log Message:
  -----------
  Few minor cleanups for integer quaternion stuff


  Commit: cafd7b8d73acfa40249caa97771de65579235226
      
https://github.com/paparazzi/paparazzi/commit/cafd7b8d73acfa40249caa97771de65579235226
  Author: Allen <address@hidden>
  Date:   2011-05-24 (Tue, 24 May 2011)

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

  Log Message:
  -----------
  Few more cleanups for quat int


  Commit: 837c6ce2495e573d088999d6e738a50eefec356f
      
https://github.com/paparazzi/paparazzi/commit/837c6ce2495e573d088999d6e738a50eefec356f
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M sw/airborne/modules/sensors/airspeed_ets.c

  Log Message:
  -----------
  add an option to reverse airspeed measure when you stupidely mix static
and dynamic pressure


  Commit: 1b2228ed67b7296591125bc9fa30ad12ed22cb99
      
https://github.com/paparazzi/paparazzi/commit/1b2228ed67b7296591125bc9fa30ad12ed22cb99
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  fix number of bytes to send


  Commit: df76d5e80e8840abf6130439fbbf1c96f4e92845
      
https://github.com/paparazzi/paparazzi/commit/df76d5e80e8840abf6130439fbbf1c96f4e92845
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M sw/airborne/modules/ins/alt_filter.c

  Log Message:
  -----------
  fix bugs in altitude filter


  Commit: af5f3c40679d8da79139b9a85980f5d80aa53235
      
https://github.com/paparazzi/paparazzi/commit/af5f3c40679d8da79139b9a85980f5d80aa53235
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Update jt_lisam for airplane coordinates


  Commit: 194272933b84ce5f94dc214a8e2a645174c2d796
      
https://github.com/paparazzi/paparazzi/commit/194272933b84ce5f94dc214a8e2a645174c2d796
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Add option to leave yaw command always enabled


  Commit: a42cd1cbb2fa9259afa2a71654ccbb0f78d7548a
      
https://github.com/paparazzi/paparazzi/commit/a42cd1cbb2fa9259afa2a71654ccbb0f78d7548a
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c

  Log Message:
  -----------
  Minor tweaks to pwm supervision, adjust order to pitch/roll/yaw (no
    functional change)


  Commit: a804537310ea8fc1579f9feb53b8a3119398b90d
      
https://github.com/paparazzi/paparazzi/commit/a804537310ea8fc1579f9feb53b8a3119398b90d
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Fix quat_int stabilization bug (don't reference floating point ahrs!)


  Commit: 304f308cc74cfd35674548855e6101137beab6c4
      
https://github.com/paparazzi/paparazzi/commit/304f308cc74cfd35674548855e6101137beab6c4
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Remove hard coded telemetry sending from quat int ref


  Commit: dc3bcd371bc461b6e44f7d939acecc66e3c968d1
      
https://github.com/paparazzi/paparazzi/commit/dc3bcd371bc461b6e44f7d939acecc66e3c968d1
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Make fixed/floating point telemetry an option for attitude_viz, rather
than hard coded


  Commit: 16ee4afbbe3b310ced20105f4f614b5bd5ca7700
      
https://github.com/paparazzi/paparazzi/commit/16ee4afbbe3b310ced20105f4f614b5bd5ca7700
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/messages.xml

  Log Message:
  -----------
  Add AHRS_REF_QUAT message


  Commit: 087ef252ce5dd5f143c5ae5d046313b0b6afb650
      
https://github.com/paparazzi/paparazzi/commit/087ef252ce5dd5f143c5ae5d046313b0b6afb650
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Add code to send AHRS_REF_QUAT periodically


  Commit: 191d8951b4959dac817e116afe49cad09391b2c8
      
https://github.com/paparazzi/paparazzi/commit/191d8951b4959dac817e116afe49cad09391b2c8
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    A conf/telemetry/telemetry_jtm.xml

  Log Message:
  -----------
  New telemtry file for JT_M lisa/m JT (send AHRS_REF_QUAT in attitude
    mode)


  Commit: ef47d70c86cedadc38f7604251e7833b66bf3e33
      
https://github.com/paparazzi/paparazzi/commit/ef47d70c86cedadc38f7604251e7833b66bf3e33
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  More fixes for rotorcraft quaternion int attitude stabilization -- need
to divide rate by 16 to match euler controler, remove dead code


  Commit: 0d3039e384618b0e31b01b11207c339a7c21d0f6
      
https://github.com/paparazzi/paparazzi/commit/0d3039e384618b0e31b01b11207c339a7c21d0f6
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Airframe updates for jt_lisam (adjust gains to match airplane axis)


  Commit: 9adce97a6fd2f6a66b28e1623c56c61ecda57d8f
      
https://github.com/paparazzi/paparazzi/commit/9adce97a6fd2f6a66b28e1623c56c61ecda57d8f
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Renable feedfoward for quaternion integer controller, needs testing


  Commit: 805c565e5174fce4d42eee5296ecf01d84878e6a
      
https://github.com/paparazzi/paparazzi/commit/805c565e5174fce4d42eee5296ecf01d84878e6a
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Add option to prevent motor startup while the ahrs is not aligned


  Commit: f420e285274cd1eaff0fe923fb117b976ec23776
      
https://github.com/paparazzi/paparazzi/commit/f420e285274cd1eaff0fe923fb117b976ec23776
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Be sure to initialize setpoint/ref on stabilization_attitude_enter


  Commit: 0432551ca5881d750ddcbccdf0d5a08a2d5c3248
      
https://github.com/paparazzi/paparazzi/commit/0432551ca5881d750ddcbccdf0d5a08a2d5c3248
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Fix scaling on feedforward in quaternion


  Commit: 8d2d1ea06d0c52c2eb92da19d7f508566e524577
      
https://github.com/paparazzi/paparazzi/commit/8d2d1ea06d0c52c2eb92da19d7f508566e524577
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Fix scaling or attitude_quat p gains


  Commit: 643fe791f469c3c67631c96aaec81f0500c7392e
      
https://github.com/paparazzi/paparazzi/commit/643fe791f469c3c67631c96aaec81f0500c7392e
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Remove dead code


  Commit: d15a90f3c68dea1d24d390965bf6d6254a94277b
      
https://github.com/paparazzi/paparazzi/commit/d15a90f3c68dea1d24d390965bf6d6254a94277b
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Fix quat int ref enter to set rates/accels to zero and ref to setpoint


  Commit: b1e5d4e968ae28278a67338175b7d5d04f326166
      
https://github.com/paparazzi/paparazzi/commit/b1e5d4e968ae28278a67338175b7d5d04f326166
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Force KILL mode when ahrs is not running


  Commit: 1142c844be585a66295bd0766a4555509a4107ce
      
https://github.com/paparazzi/paparazzi/commit/1142c844be585a66295bd0766a4555509a4107ce
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Raise MAX_THROTTLE back up for lisa JT_M


  Commit: 128e428a526bf0ff9bdda07e7824774b39fdae82
      
https://github.com/paparazzi/paparazzi/commit/128e428a526bf0ff9bdda07e7824774b39fdae82
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Add some bounding on commands, fix scaling on feedforward commands


  Commit: 7bd3f148668645a3a2dce66897017954627b80e7
      
https://github.com/paparazzi/paparazzi/commit/7bd3f148668645a3a2dce66897017954627b80e7
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

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

  Log Message:
  -----------
  Airplane vs quad sticks mode


  Commit: 783fb9fd0397904839a7be81238dc22adb8fd135
      
https://github.com/paparazzi/paparazzi/commit/783fb9fd0397904839a7be81238dc22adb8fd135
  Author: Allen <address@hidden>
  Date:   2011-05-25 (Wed, 25 May 2011)

  Changed paths:
    M conf/airframes/esden/jt_lisam.xml

  Log Message:
  -----------
  Adjust aileron gains for jt_lisam


  Commit: dd9e8b4c5bc3d553a47c5f3f5d2d499175ce7f66
      
https://github.com/paparazzi/paparazzi/commit/dd9e8b4c5bc3d553a47c5f3f5d2d499175ce7f66
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-27 (Fri, 27 May 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  A conf/joystick/gp_interlink.xml

  Log Message:
  -----------
  add joystich and airframe files


  Commit: 2c132bee00ef32a8fbeb4cbfc19cd0ab84c07671
      
https://github.com/paparazzi/paparazzi/commit/2c132bee00ef32a8fbeb4cbfc19cd0ab84c07671
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-27 (Fri, 27 May 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c

  Log Message:
  -----------
  fill pitch rate value in estimator


  Commit: e5cc774582daf1188bc128268e096e3a8d96a977
      
https://github.com/paparazzi/paparazzi/commit/e5cc774582daf1188bc128268e096e3a8d96a977
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-27 (Fri, 27 May 2011)

  Changed paths:
    M conf/airframes/booz2_flixr.xml

  Log Message:
  -----------
  update my airframe to use quaternion complementary filter


  Commit: 926594f3a1c355129d27acd6ff05c77381b97d3a
      
https://github.com/paparazzi/paparazzi/commit/926594f3a1c355129d27acd6ff05c77381b97d3a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

  Changed paths:
    M conf/flight_plans/corsica.xml
  M conf/flight_plans/corsica_sectors.xml

  Log Message:
  -----------
  update flight plans for corsica


  Commit: 3dc09477d6559ec9a92bc48620fab5a21f45438b
      
https://github.com/paparazzi/paparazzi/commit/3dc09477d6559ec9a92bc48620fab5a21f45438b
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/modules/com/generic_com.c

  Log Message:
  -----------
  add energy to message for gsm/satcom module


  Commit: f6d4047d42cae606dc37a8876784446185e3423e
      
https://github.com/paparazzi/paparazzi/commit/f6d4047d42cae606dc37a8876784446185e3423e
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

  Changed paths:
    M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

  Log Message:
  -----------
  removed obsolete booz includes


  Commit: a173cad716a8a8ede7c15d78525e15b435949c26
      
https://github.com/paparazzi/paparazzi/commit/a173cad716a8a8ede7c15d78525e15b435949c26
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c

  Log Message:
  -----------
  define AHRS_UPDATE_FW_ESTIMATOR if you want to update the fixedwing estimator


  Commit: 6f152afae212720add46f1bc32141e781b96ceac
      
https://github.com/paparazzi/paparazzi/commit/6f152afae212720add46f1bc32141e781b96ceac
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

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

  Log Message:
  -----------
  also ifdef AHRS_UPDATE_FW_ESTIMATOR around declaration in header file


  Commit: 3ef5188a1bbd55b0937310b74006f1ef065149f6
      
https://github.com/paparazzi/paparazzi/commit/3ef5188a1bbd55b0937310b74006f1ef065149f6
  Author: Felix Ruess <address@hidden>
  Date:   2011-05-30 (Mon, 30 May 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.h
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.h

  Log Message:
  -----------
  started adding some sim arch fils for aspirin, still needs some work


  Commit: 950ca967eff5c66a95b066ea12dc01272109d300
      
https://github.com/paparazzi/paparazzi/commit/950ca967eff5c66a95b066ea12dc01272109d300
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    A conf/conf.xml.corsica
  A conf/control_panel.xml.corsica
  A conf/gcs/wide.xml

  Log Message:
  -----------
  custom conf and control panel for corsica


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

  Changed paths:
    M conf/conf.xml.corsica

  Log Message:
  -----------
  fix setting file


  Commit: 775a03b10edf8f1592b7c8fe504ca8eb9a4019f9
      
https://github.com/paparazzi/paparazzi/commit/775a03b10edf8f1592b7c8fe504ca8eb9a4019f9
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-05-31 (Tue, 31 May 2011)

  Changed paths:
    M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/skywalker.xml

  Log Message:
  -----------
  TU airframes


  Commit: 746ebf9cf017e18c0b873b6066af1c758c13194d
      
https://github.com/paparazzi/paparazzi/commit/746ebf9cf017e18c0b873b6066af1c758c13194d
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-01 (Wed, 01 Jun 2011)

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

  Log Message:
  -----------
  Revert "macro FLOAT_QUAT_MULT is normal quaterion multiplicationl, q_a2c = 
q_b2c * q_a2b. QUAT_COMP has switched order"

This reverts commit b8c0344482841cde6142fd591a84bcc10132d26f.


  Commit: 6bca79cf1ee29a0e96e7f63d98337fdea05b418c
      
https://github.com/paparazzi/paparazzi/commit/6bca79cf1ee29a0e96e7f63d98337fdea05b418c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-01 (Wed, 01 Jun 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/conf.xml.corsica

  Log Message:
  -----------
  update conf for corsica planes


  Commit: fae373fc18df7914eef7c8611957f1f8bbc9a356
      
https://github.com/paparazzi/paparazzi/commit/fae373fc18df7914eef7c8611957f1f8bbc9a356
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-01 (Wed, 01 Jun 2011)

  Changed paths:
    A conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  added first version of aiframe file for discovery trainer


  Commit: febc061ee469148225ed458e4fa775d21c82c11b
      
https://github.com/paparazzi/paparazzi/commit/febc061ee469148225ed458e4fa775d21c82c11b
  Author: Martin Mueller <address@hidden>
  Date:   2011-06-02 (Thu, 02 Jun 2011)

  Changed paths:
    A sw/in_progress/satcom/Makefile
  A sw/in_progress/satcom/email2udp.c
  A sw/in_progress/satcom/grlobke
  A sw/in_progress/satcom/tcp2ivy.c
  A sw/in_progress/satcom/udp2tcp.c

  Log Message:
  -----------
  seems to work


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

  Changed paths:
    M sw/airborne/modules/com/generic_com.c

  Log Message:
  -----------
  fix buffer index


  Commit: 3cdebeb7d5811da765dcf64be72c359addea6c69
      
https://github.com/paparazzi/paparazzi/commit/3cdebeb7d5811da765dcf64be72c359addea6c69
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-02 (Thu, 02 Jun 2011)

  Changed paths:
    M conf/messages.xml
  M sw/airborne/modules/com/generic_com.c
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/in_progress/satcom/Makefile
  M sw/in_progress/satcom/tcp2ivy.c
  A sw/in_progress/satcom/tcp2ivy_generic.c

  Log Message:
  -----------
  add a new message comming from the generic_com module and parsed by the
server


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

  Changed paths:
    M sw/airborne/modules/com/generic_com.c
  M sw/in_progress/satcom/tcp2ivy_generic.c

  Log Message:
  -----------
  generic_com should start correctly; raw messages from satcom are printed


  Commit: bc175a3ab6c8413a4198d5fc5d29cf185daf0533
      
https://github.com/paparazzi/paparazzi/commit/bc175a3ab6c8413a4198d5fc5d29cf185daf0533
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

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

  Log Message:
  -----------
  fix initalization of dcm filter, works correctly with BODY_TO_IMU now


  Commit: e390e3ea0afeb6aa1eb9b3834c8f6b153ee8377c
      
https://github.com/paparazzi/paparazzi/commit/e390e3ea0afeb6aa1eb9b3834c8f6b153ee8377c
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-03 (Fri, 03 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  update airframe for imu stuff


  Commit: a42f69003e6668b6ddc5083c3eb10a37b0ad97e4
      
https://github.com/paparazzi/paparazzi/commit/a42f69003e6668b6ddc5083c3eb10a37b0ad97e4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-04 (Sat, 04 Jun 2011)

  Changed paths:
    A sw/airborne/firmwares/non_ap/satcom/satcom.pde

  Log Message:
  -----------
  arduino code to handle iridium satcom modules


  Commit: dde4cdea6cdd086f3c7b04bd3d67ca8c4c8ac175
      
https://github.com/paparazzi/paparazzi/commit/dde4cdea6cdd086f3c7b04bd3d67ca8c4c8ac175
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M sw/airborne/subsystems/imu/imu_aspirin.h

  Log Message:
  -----------
  remove double include


  Commit: 28d0b02bec7da06dd546c1dec69ff3c0206d7957
      
https://github.com/paparazzi/paparazzi/commit/28d0b02bec7da06dd546c1dec69ff3c0206d7957
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    A conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  M sw/airborne/arch/lpc21/subsystems/imu/imu_crista_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h

  Log Message:
  -----------
  added possibility to use crista imu with hmc5843 mag


  Commit: 56a3add28d0a1db8e630731b51c45014fd2b1179
      
https://github.com/paparazzi/paparazzi/commit/56a3add28d0a1db8e630731b51c45014fd2b1179
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

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

  Log Message:
  -----------
  Set rates in estimator from dcm filter. reset to body_to_imu_rmat if in 
trouble


  Commit: e18f88ff26d66412e5391f8ea1e2156d3bfedbb8
      
https://github.com/paparazzi/paparazzi/commit/e18f88ff26d66412e5391f8ea1e2156d3bfedbb8
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

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

  Log Message:
  -----------
  ahrs ic: copy correct body attitude and rates to fw estimator


  Commit: 2ceb371c7b670533996351e142cb3382166c8540
      
https://github.com/paparazzi/paparazzi/commit/2ceb371c7b670533996351e142cb3382166c8540
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M sw/airborne/ap_downlink.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/electrical.h

  Log Message:
  -----------
  send amps in bat message


  Commit: f51a3c1a327ace9c9c4941665731fd9b1aa88607
      
https://github.com/paparazzi/paparazzi/commit/f51a3c1a327ace9c9c4941665731fd9b1aa88607
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  update airframe file, change imu channels since imu is mounted sideways


  Commit: d31a1a68140c6e85b79cab6cbac54be963d1e5ed
      
https://github.com/paparazzi/paparazzi/commit/d31a1a68140c6e85b79cab6cbac54be963d1e5ed
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    A conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  M sw/airborne/arch/lpc21/subsystems/imu/imu_crista_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 3fba82df3a834642052ef1744a9a92177a2cd395
      
https://github.com/paparazzi/paparazzi/commit/3fba82df3a834642052ef1744a9a92177a2cd395
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile

  Log Message:
  -----------
  added the USE_HMC5843 flag to subsystem imu_crista_hmc4532.makefile


  Commit: 3733dcda59ec61dd6e923f72d1864ab20ca21368
      
https://github.com/paparazzi/paparazzi/commit/3733dcda59ec61dd6e923f72d1864ab20ca21368
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-06 (Mon, 06 Jun 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/conf.xml.corsica
  M conf/flight_plans/corsica.xml
  M conf/modules/generic_com.xml
  M sw/airborne/firmwares/non_ap/satcom/satcom.pde

  Log Message:
  -----------
  last conf before first try for corsica


  Commit: 5fa7c6abad93e65375ec81d0a965b204f202c599
      
https://github.com/paparazzi/paparazzi/commit/5fa7c6abad93e65375ec81d0a965b204f202c599
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-07 (Tue, 07 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  minor airframe update, readability


  Commit: 42aefed36553be3d0d0e3707261ce606f8257b0e
      
https://github.com/paparazzi/paparazzi/commit/42aefed36553be3d0d0e3707261ce606f8257b0e
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M conf/autopilot/fixedwing.xml
  A conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M sw/airborne/gps_nmea.c
  A sw/airborne/gps_nmea.h

  Log Message:
  -----------
  Merge pull request #54 from mantauav/gps_merge

merge gps nmea, still needs to be rewritten for new gps api


  Commit: c47090b1e7d978ddb86ef18d27e36627fa3a9456
      
https://github.com/paparazzi/paparazzi/commit/c47090b1e7d978ddb86ef18d27e36627fa3a9456
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M conf/autopilot/fixedwing.xml
  A conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M sw/airborne/gps_nmea.c
  A sw/airborne/gps_nmea.h

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 44e9af7b7a3a6f4d1d7eb0c8a82c987b27277bbd
      
https://github.com/paparazzi/paparazzi/commit/44e9af7b7a3a6f4d1d7eb0c8a82c987b27277bbd
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  R sw/airborne/gps_nmea.c
  R sw/airborne/gps_nmea.h
  A sw/airborne/subsystems/gps/gps_nmea.c
  A sw/airborne/subsystems/gps/gps_nmea.h

  Log Message:
  -----------
  started getting nmea parser into shape, not usable yet


  Commit: 36b9eeb2b4230d2620c1df168f16f2d282d49935
      
https://github.com/paparazzi/paparazzi/commit/36b9eeb2b4230d2620c1df168f16f2d282d49935
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/esden/jt_lisam.xml
  A conf/airframes/flixr_discovery.xml
  M conf/autopilot/fixedwing.xml
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  A conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  A conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  M conf/messages.xml
  A conf/telemetry/telemetry_jtm.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_crista_arch.h
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.h
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.h
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/commands.h
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  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/gps_nmea.c
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/electrical.h
  A sw/airborne/subsystems/gps/gps_nmea.c
  A sw/airborne/subsystems/gps/gps_nmea.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/in_progress/python/attitude_viz.py

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


  Commit: 2609f47301b1dbb21bed6bfd64a18e19489b3728
      
https://github.com/paparazzi/paparazzi/commit/2609f47301b1dbb21bed6bfd64a18e19489b3728
  Author: akochevar <address@hidden>
  Date:   2011-06-08 (Wed, 08 Jun 2011)

  Changed paths:
    A conf/airframes/NoVa_L.xml

  Log Message:
  -----------
  Initial Commit of A.J's Lisa/L quad using NoVa XL frame and ZEF controllers


  Commit: 19bf33d4c0050847b94e56402034a7281bc6a073
      
https://github.com/paparazzi/paparazzi/commit/19bf33d4c0050847b94e56402034a7281bc6a073
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-09 (Thu, 09 Jun 2011)

  Changed paths:
    M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  A conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/yapa_xsens.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  A conf/airframes/flixr_discovery.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/autopilot/fixedwing.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/obsolete/booz_test_progs.makefile
  A conf/autopilot/obsolete/gps_ugear.makefile
  M conf/autopilot/obsolete/lisa_test_progs.makefile
  A conf/autopilot/obsolete/sitl.makefile
  A conf/autopilot/obsolete/sitl_jsbsim.makefile
  A conf/autopilot/obsolete/sitl_link_pprz.makefile
  A conf/autopilot/obsolete/sitl_link_xbee.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/rotorcraft.xml
  R conf/autopilot/sitl.makefile
  R conf/autopilot/sitl_jsbsim.makefile
  R conf/autopilot/sitl_link_pprz.makefile
  R conf/autopilot/sitl_link_xbee.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
  R conf/autopilot/subsystems/fixedwing/gps_ugear.makefile
  M conf/autopilot/subsystems/fixedwing/gps_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/navigation.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_ublox.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  A conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_euler.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile
  R conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/messages.xml
  A conf/modules/baro_ms5611_i2c.xml
  A conf/modules/charge_sens.xml
  A conf/modules/gps_ubx_uart.xml
  A conf/modules/humid_htm_b71.xml
  A conf/modules/ins_aspirin_via_i2c.xml
  M conf/modules/ins_xsens_MTiG_fixedwing.xml
  A conf/modules/mag_hmc5843.xml
  A conf/radios/R6107SP_7ch.xml
  M conf/settings/basic.xml
  M conf/settings/lisa.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_basic_ins.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_tp_auto.xml
  M conf/settings/ugv.xml
  M conf/telemetry/booz_minimal.xml
  M conf/telemetry/telemetry_booz2.xml
  A conf/telemetry/telemetry_jtm.xml
  M conf/xsens_MTi-G.xml
  M sw/airborne/ap_downlink.h
  R sw/airborne/arch/lpc21/gps_hw.h
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_crista_arch.h
  R sw/airborne/arch/sim/gps_hw.c
  R sw/airborne/arch/sim/gps_hw.h
  M sw/airborne/arch/sim/jsbsim_gps.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_transport.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.h
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_baro.c
  M sw/airborne/arch/sim/sim_gps.c
  R sw/airborne/arch/sim/sim_jsbsim.c
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.h
  R sw/airborne/arch/stm32/gps_hw.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.h
  R sw/airborne/booz/booz2_commands.c
  R sw/airborne/booz/booz2_commands.h
  R sw/airborne/booz/booz_gps.c
  R sw/airborne/booz/booz_gps.h
  R sw/airborne/booz/gps/booz_gps_skytraq.c
  R sw/airborne/booz/gps/booz_gps_skytraq.h
  R sw/airborne/booz/gps/booz_gps_ubx.c
  R sw/airborne/booz/gps/booz_gps_ubx.h
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/csc/mercury_ap.c
  M sw/airborne/estimator.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  A sw/airborne/firmwares/non_ap/charge_sens/charge_sens.pde
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_heli.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  A sw/airborne/firmwares/rotorcraft/commands.c
  A sw/airborne/firmwares/rotorcraft/commands.h
  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
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  R sw/airborne/gps.c
  R sw/airborne/gps.h
  R sw/airborne/gps_nmea.c
  R sw/airborne/gps_ubx.c
  R sw/airborne/gps_ubx.h
  R sw/airborne/gps_xsens.c
  R sw/airborne/gps_xsens.h
  R sw/airborne/latlong.c
  R sw/airborne/latlong.h
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/math/pprz_geodetic_double.c
  M sw/airborne/math/pprz_geodetic_double.h
  M sw/airborne/math/pprz_geodetic_float.c
  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/math/pprz_geodetic_utm.h
  A sw/airborne/math/pprz_geodetic_wgs84.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  A sw/airborne/modules/gps/gps_ubx_uart.h
  M sw/airborne/modules/gps_i2c/gps_i2c.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h
  M sw/airborne/modules/ins/ins_arduimu.c
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  R sw/airborne/modules/ins/ins_osam_ugear.c
  R sw/airborne/modules/ins/ins_osam_ugear.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/meteo/charge_sens.c
  A sw/airborne/modules/meteo/charge_sens.h
  A sw/airborne/modules/meteo/humid_htm_b71.c
  A sw/airborne/modules/meteo/humid_htm_b71.h
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/ir_mlx.h
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/multi/formation.c
  M sw/airborne/modules/multi/potential.c
  M sw/airborne/modules/multi/tcas.c
  M sw/airborne/modules/sensors/baro_ets.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.h
  A sw/airborne/modules/sensors/mag_hmc5843.c
  A sw/airborne/modules/sensors/mag_hmc5843.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/modules/vehicle_interface/vi.c
  M sw/airborne/modules/vehicle_interface/vi_overo_link.c
  A sw/airborne/obsolete/booz_gps.c
  A sw/airborne/obsolete/booz_gps.h
  A sw/airborne/obsolete/booz_gps_skytraq.c
  A sw/airborne/obsolete/booz_gps_skytraq.h
  A sw/airborne/obsolete/booz_gps_ubx.c
  A sw/airborne/obsolete/booz_gps_ubx.h
  A sw/airborne/obsolete/gps.c
  A sw/airborne/obsolete/gps.h
  A sw/airborne/obsolete/gps_ubx.c
  A sw/airborne/obsolete/gps_ubx.h
  A sw/airborne/obsolete/ins_osam_ugear.c
  A sw/airborne/obsolete/ins_osam_ugear.h
  A sw/airborne/obsolete/latlong.c
  A sw/airborne/obsolete/latlong.h
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/peripherals/hmc5843.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/electrical.h
  A sw/airborne/subsystems/gps.c
  A sw/airborne/subsystems/gps.h
  A sw/airborne/subsystems/gps/gps_nmea.c
  A sw/airborne/subsystems/gps/gps_nmea.h
  A sw/airborne/subsystems/gps/gps_sim.c
  A sw/airborne/subsystems/gps/gps_sim.h
  A sw/airborne/subsystems/gps/gps_sim_nps.c
  A sw/airborne/subsystems/gps/gps_sim_nps.h
  A sw/airborne/subsystems/gps/gps_skytraq.c
  A sw/airborne/subsystems/gps/gps_skytraq.h
  A sw/airborne/subsystems/gps/gps_ubx.c
  A sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins/hf_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/OSAMNav.h
  A sw/airborne/subsystems/navigation/common_flight_plan.c
  A sw/airborne/subsystems/navigation/common_flight_plan.h
  M sw/airborne/subsystems/navigation/common_nav.c
  M sw/airborne/subsystems/navigation/common_nav.h
  M sw/airborne/subsystems/navigation/discsurvey.c
  M sw/airborne/subsystems/navigation/nav_cube.c
  M sw/airborne/subsystems/navigation/nav_line.c
  M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
  M sw/airborne/subsystems/navigation/snav.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/test/test_actuators.c
  M sw/airborne/test/test_geodetic.c
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/in_progress/python/attitude_viz.py
  M sw/include/std.h
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/export.ml
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/tools/gen_flight_plan.ml

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


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

  Changed paths:
    M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/alt_filter.h

  Log Message:
  -----------
  change file format


  Commit: 6fc18d8e650dedaa0c8a643b810f14b3aeba88e8
      
https://github.com/paparazzi/paparazzi/commit/6fc18d8e650dedaa0c8a643b810f14b3aeba88e8
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-09 (Thu, 09 Jun 2011)

  Changed paths:
    R conf/conf.xml.corsica
  R conf/control_panel.xml.corsica

  Log Message:
  -----------
  remove corsica conf


  Commit: 539a5bdacf3bb2053453425608c247235077e997
      
https://github.com/paparazzi/paparazzi/commit/539a5bdacf3bb2053453425608c247235077e997
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-09 (Thu, 09 Jun 2011)

  Changed paths:
    M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c

  Log Message:
  -----------
  always disable interrupts before setting baudrate


  Commit: 3107ece8d8f2faed1a5b7c79fbe93669fa3e9908
      
https://github.com/paparazzi/paparazzi/commit/3107ece8d8f2faed1a5b7c79fbe93669fa3e9908
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-09 (Thu, 09 Jun 2011)

  Changed paths:
    A conf/airframes/NoVa_L.xml

  Log Message:
  -----------
  Merge pull request #55 from akochevar/master

Testing Git with my airframe


  Commit: 44e9c68ed1d26f785f188cf1e8a0051797bcd39a
      
https://github.com/paparazzi/paparazzi/commit/44e9c68ed1d26f785f188cf1e8a0051797bcd39a
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M sw/airborne/modules/com/generic_com.c
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/in_progress/satcom/tcp2ivy_generic.c

  Log Message:
  -----------
  update generic_com module to new gps interface


  Commit: 71d42c0698ec3977ea5b40c80f392b9b728aef6c
      
https://github.com/paparazzi/paparazzi/commit/71d42c0698ec3977ea5b40c80f392b9b728aef6c
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M sw/airborne/modules/ins/ins_arduimu_basic.c

  Log Message:
  -----------
  fix huge bug in high accel hack; set USE_HIGH_ACCEL_FLAG to enable this
feature


  Commit: 06dad5b201d2a5e758c9de71bf894a7cff064706
      
https://github.com/paparazzi/paparazzi/commit/06dad5b201d2a5e758c9de71bf894a7cff064706
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M sw/airborne/modules/ins/ins_arduimu_basic.c

  Log Message:
  -----------
  bug fix (forgot to save on previous commit)


  Commit: 9d3dc80e1cd6b9aa44d11fefe79074c6b0f0b2e9
      
https://github.com/paparazzi/paparazzi/commit/9d3dc80e1cd6b9aa44d11fefe79074c6b0f0b2e9
  Author: akochevar <address@hidden>
  Date:   2011-06-10 (Fri, 10 Jun 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile

  Log Message:
  -----------
  Commit to fix errors in the original release of this subsystem.


  Commit: 1a5ee01a8d4d62e34b26bfe456262461da94641c
      
https://github.com/paparazzi/paparazzi/commit/1a5ee01a8d4d62e34b26bfe456262461da94641c
  Author: akochevar <address@hidden>
  Date:   2011-06-11 (Sat, 11 Jun 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile

  Log Message:
  -----------
  Fixes based on comments from Felix.


  Commit: 83459c64884f37353b8eaa463d72404d477e3174
      
https://github.com/paparazzi/paparazzi/commit/83459c64884f37353b8eaa463d72404d477e3174
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-12 (Sun, 12 Jun 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile

  Log Message:
  -----------
  Merge pull request #56 from akochevar/master

crista_hmc5843


  Commit: d07f1e7b9477f63ee9e7093dceea30e0ddc15e77
      
https://github.com/paparazzi/paparazzi/commit/d07f1e7b9477f63ee9e7093dceea30e0ddc15e77
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

  Changed paths:
    M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h

  Log Message:
  -----------
  added imu_overrun to sim of imu_b2 to stop settings from complaining


  Commit: 99b8d0bf9bce85f4f5fc21db80226239d99453e9
      
https://github.com/paparazzi/paparazzi/commit/99b8d0bf9bce85f4f5fc21db80226239d99453e9
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

  Changed paths:
    R conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile

  Log Message:
  -----------
  just one shared imu subsystem for aspirin


  Commit: bb2f6f729392f4b7669b203c1952f8a9ecda2af9
      
https://github.com/paparazzi/paparazzi/commit/bb2f6f729392f4b7669b203c1952f8a9ecda2af9
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

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

  Log Message:
  -----------
  check arch correctly in imu_ppzuav.makefile


  Commit: 808205d346f9fe6f65e9b6516c23216217da1496
      
https://github.com/paparazzi/paparazzi/commit/808205d346f9fe6f65e9b6516c23216217da1496
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    R conf/settings/fw_ctl_n.xml

  Log Message:
  -----------
  cleanup: removed fw_ctl_n.xml settings file, please use tuning_ctl_new.xml 
instead


  Commit: 65b8f956cfa3891cec1adaf7c87266e42f459dcb
      
https://github.com/paparazzi/paparazzi/commit/65b8f956cfa3891cec1adaf7c87266e42f459dcb
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M conf/settings/basic.xml
  M conf/settings/flight_params.xml

  Log Message:
  -----------
  settings: fix module in basic.xml, update flight_params.xml


  Commit: f725e69c2de3477658d5c232fd272d09da29e7d4
      
https://github.com/paparazzi/paparazzi/commit/f725e69c2de3477658d5c232fd272d09da29e7d4
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  update discovery airframe file for new adaptive control and other small things


  Commit: f077eb14fc00cbb15c029f0a7cba1f873938c519
      
https://github.com/paparazzi/paparazzi/commit/f077eb14fc00cbb15c029f0a7cba1f873938c519
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-15 (Wed, 15 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  discovery airframe: use THROTTLE_SLEW_LIMITER instead of THROTTLE_SLEW 
directly


  Commit: 7556f5460844754e8f46124184cfced71ba51e29
      
https://github.com/paparazzi/paparazzi/commit/7556f5460844754e8f46124184cfced71ba51e29
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M sw/ground_segment/cockpit/gcs.ml

  Log Message:
  -----------
  fix -google_fill uncaught error


  Commit: b0565a9ac89ea7cc222297d73ef04ff20f547434
      
https://github.com/paparazzi/paparazzi/commit/b0565a9ac89ea7cc222297d73ef04ff20f547434
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

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

  Log Message:
  -----------
  Lights


  Commit: dbb28bc6106fdf7fd444de9109c2d65e13365f96
      
https://github.com/paparazzi/paparazzi/commit/dbb28bc6106fdf7fd444de9109c2d65e13365f96
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M sw/ground_segment/cockpit/gcs.ml

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 4a1f67d8fc0aac074f9f8a9683f518d388713c19
      
https://github.com/paparazzi/paparazzi/commit/4a1f67d8fc0aac074f9f8a9683f518d388713c19
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-16 (Thu, 16 Jun 2011)

  Changed paths:
    M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/fw_server.ml

  Log Message:
  -----------
  GCS issues a warning when FBW is in FAILSAFE mode


  Commit: 7e0a1a96c5fd19552e0696c8f6505c16ab16d064
      
https://github.com/paparazzi/paparazzi/commit/7e0a1a96c5fd19552e0696c8f6505c16ab16d064
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

  Changed paths:
    M conf/modules/light.xml
  M sw/airborne/modules/light/light.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/fw_server.ml

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 67cd383a5a310249d42b3e22767389a9f685eda1
      
https://github.com/paparazzi/paparazzi/commit/67cd383a5a310249d42b3e22767389a9f685eda1
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

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

  Log Message:
  -----------
  FailSafe actuator commands must update immediately


  Commit: 9f1b87f88d13e704bffb99e6c486681278e78d44
      
https://github.com/paparazzi/paparazzi/commit/9f1b87f88d13e704bffb99e6c486681278e78d44
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

  Changed paths:
    M conf/messages.xml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml

  Log Message:
  -----------
  Fixedwing: show FAIL when in FailSafe mode + issue speech warning | 
Fixedwing: GCS thrust FBW_STATUS better than PPRZ_MODE when FAIL mode is active 
| FW+RW: Collect state_filter status in GCS with new common STATE_FILTER_STATUS 
message to show IMU/AHRS failures


  Commit: def5b8cde32475f6e61f0d30c034fa820e81ad31
      
https://github.com/paparazzi/paparazzi/commit/def5b8cde32475f6e61f0d30c034fa820e81ad31
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

  Changed paths:
    M conf/messages.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/ap_downlink.h
  M sw/ground_segment/cockpit/live.ml

  Log Message:
  -----------
  Low Contrast Warning, AHRS Alinger Warning


  Commit: 21b4532f21e5b9e5baab3bd9027d68ae3e6b1048
      
https://github.com/paparazzi/paparazzi/commit/21b4532f21e5b9e5baab3bd9027d68ae3e6b1048
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

  Changed paths:
    A conf/airframes/TU_Delft/MicrojetBRimu.xml

  Log Message:
  -----------
  PPZIMU in Microjet


  Commit: d1c02eb87fdac6ff271b21723516eb5f5d4a42c8
      
https://github.com/paparazzi/paparazzi/commit/d1c02eb87fdac6ff271b21723516eb5f5d4a42c8
  Author: Christophe De Wagter <address@hidden>
  Date:   2011-06-17 (Fri, 17 Jun 2011)

  Changed paths:
    M sw/airborne/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/inter_mcu.h

  Log Message:
  -----------
  FBW->AP still working on FAILSAFE, IMU failure visible in GCS


  Commit: 0a93537c727992915c7072d2e300f3744e6d1861
      
https://github.com/paparazzi/paparazzi/commit/0a93537c727992915c7072d2e300f3744e6d1861
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    A conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/messages.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/inter_mcu.h
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml

  Log Message:
  -----------
  Merge branch 'master' of github.com:paparazzi/paparazzi


  Commit: 4a6eeae45625d1c9470a7083eff43528463efec6
      
https://github.com/paparazzi/paparazzi/commit/4a6eeae45625d1c9470a7083eff43528463efec6
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/airframes/flixr_discovery.xml

  Log Message:
  -----------
  discovery airframe: enable ets airspeeds sensor and use different vic slot 
for i2c0 as slot 9 is already in use by imu


  Commit: c87be8a41e8ab910c942a410e01fb588857a7c65
      
https://github.com/paparazzi/paparazzi/commit/c87be8a41e8ab910c942a410e01fb588857a7c65
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    A conf/settings/tuning_ctl_adaptive.xml

  Log Message:
  -----------
  added settings file to tune adaptive control (without airspeed)


  Commit: e7f4281da0838fb632ddac19257d667554bfe598
      
https://github.com/paparazzi/paparazzi/commit/e7f4281da0838fb632ddac19257d667554bfe598
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/telemetry/default_fixedwing_imu.xml

  Log Message:
  -----------
  default fw imu telemetry: send desired with higher rate, don't send raw 
values in default mode (use debug imu for that)


  Commit: d0cc41cc8e6e7b52bc66aff02a09c0bdaa98a118
      
https://github.com/paparazzi/paparazzi/commit/d0cc41cc8e6e7b52bc66aff02a09c0bdaa98a118
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/airframes/funjet_cam_example.xml
  M conf/messages.xml
  M conf/modules/digital_cam.xml
  M conf/settings/dc.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/cam_control/point.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c

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

resolved conflicts:
        conf/messages.xml
        sw/airborne/modules/digital_cam/dc.c


  Commit: 9cae0a30014208adc04e613aba27cbc20a02054f
      
https://github.com/paparazzi/paparazzi/commit/9cae0a30014208adc04e613aba27cbc20a02054f
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c

  Log Message:
  -----------
  some fixes for ins modules to use new gps interface


  Commit: ef0a3b8a25073a0d6e238c0b3ae38f81fea872f5
      
https://github.com/paparazzi/paparazzi/commit/ef0a3b8a25073a0d6e238c0b3ae38f81fea872f5
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/funjet3.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  A conf/airframes/NoVa_L.xml
  A conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
  R conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/flight_plans/corsica.xml
  A conf/flight_plans/corsica_sectors.xml
  A conf/gcs/wide.xml
  A conf/joystick/gp_interlink.xml
  M conf/messages.xml
  A conf/modules/alt_filter.xml
  A conf/modules/generic_com.xml
  M conf/modules/light.xml
  M conf/settings/basic.xml
  M conf/settings/flight_params.xml
  R conf/settings/fw_ctl_n.xml
  A conf/settings/tuning_ctl_adaptive.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  A sw/airborne/firmwares/non_ap/satcom/satcom.pde
  M sw/airborne/inter_mcu.h
  A sw/airborne/modules/com/generic_com.c
  A sw/airborne/modules/com/generic_com.h
  A sw/airborne/modules/ins/alt_filter.c
  A sw/airborne/modules/ins/alt_filter.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/light/light.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  A sw/in_progress/satcom/Makefile
  A sw/in_progress/satcom/email2udp.c
  A sw/in_progress/satcom/grlobke
  A sw/in_progress/satcom/tcp2ivy.c
  A sw/in_progress/satcom/tcp2ivy_generic.c
  A sw/in_progress/satcom/udp2tcp.c

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


  Commit: 07839bb0535809a4d80f66aca356837e7e9dd464
      
https://github.com/paparazzi/paparazzi/commit/07839bb0535809a4d80f66aca356837e7e9dd464
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h

  Log Message:
  -----------
  updated cam modules dc and point to use new gps interface


  Commit: 5e34be0ed2030932ec709b9807eee685edd4b175
      
https://github.com/paparazzi/paparazzi/commit/5e34be0ed2030932ec709b9807eee685edd4b175
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-18 (Sat, 18 Jun 2011)

  Changed paths:
    M sw/airborne/subsystems/navigation/spiral.c

  Log Message:
  -----------
  CamAngle in spiral if DIGITAL_CAM


  Commit: 350f91a4ef78d54582cfa6d2631ade8c061b3c12
      
https://github.com/paparazzi/paparazzi/commit/350f91a4ef78d54582cfa6d2631ade8c061b3c12
  Author: Bernard Davison <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

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

  Log Message:
  -----------
  Updated the Google tiles version


  Commit: 776383af8cbb5c8c46f151eed0b0d5eddc7eafa0
      
https://github.com/paparazzi/paparazzi/commit/776383af8cbb5c8c46f151eed0b0d5eddc7eafa0
  Author: Bernard Davison <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

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

  Log Message:
  -----------
  Updated the Google tiles version


  Commit: 161d758ec06d54fafae31654e42823586eb724fe
      
https://github.com/paparazzi/paparazzi/commit/161d758ec06d54fafae31654e42823586eb724fe
  Author: Bernard Davison <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

  Changed paths:
    M .gitignore
  M Makefile
  A data/maps/Makefile

  Log Message:
  -----------
  Getting google maps version dynamically and writing it to 
conf/maps_data/version


  Commit: 028ce2c7a029bc1ae4739404e906bf13dfd0cc7b
      
https://github.com/paparazzi/paparazzi/commit/028ce2c7a029bc1ae4739404e906bf13dfd0cc7b
  Author: Bernard Davison <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

  Changed paths:
    M Makefile
  M data/maps/Makefile

  Log Message:
  -----------
  Making the pulling of the google version part of the make process


  Commit: 8e327bfe965fd16280f4d17a764d93699fe76f52
      
https://github.com/paparazzi/paparazzi/commit/8e327bfe965fd16280f4d17a764d93699fe76f52
  Author: Bernard Davison <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

  Changed paths:
    M Makefile
  M data/maps/Makefile

  Log Message:
  -----------
  Now creating conf/maps_data/maps.conf which could be read with something like 
http://docs.camlcity.org/docs/godipkg/3.11/godi-missinglib/lib/ocaml/pkg-lib/missinglib/configParser.mli


  Commit: 7ae7b8165b3578469f3097395e378f1d984590e3
      
https://github.com/paparazzi/paparazzi/commit/7ae7b8165b3578469f3097395e378f1d984590e3
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

  Changed paths:
    M .gitignore
  M Makefile
  A data/maps/Makefile

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


  Commit: 1372590997f45cbc93535657c94cdbcafeb0405d
      
https://github.com/paparazzi/paparazzi/commit/1372590997f45cbc93535657c94cdbcafeb0405d
  Author: Felix Ruess <address@hidden>
  Date:   2011-06-19 (Sun, 19 Jun 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  A conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  A conf/airframes/NoVa_L.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  A conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/UofAdelaide/A1000_BOOZ.xml
  M conf/airframes/UofAdelaide/A1000_LISA.xml
  M conf/airframes/UofAdelaide/A1000_NOVA.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  A conf/airframes/esden/calib/aspirin_jtm.xml
  M conf/airframes/esden/jt_lisam.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_asctec_aspirin.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/esden/synerani_4B.xml
  A conf/airframes/flixr_discovery.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/fixedwing.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/rotorcraft.xml
  M conf/autopilot/setup.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_ic.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/gps_nmea.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/imu_booz.makefile
  M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_ic.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  R conf/autopilot/subsystems/rotorcraft/imu_aspirin.makefile
  A conf/autopilot/subsystems/rotorcraft/imu_crista_hmc5843.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_euler.makefile
  A conf/autopilot/subsystems/rotorcraft/stabilization_quaternion.makefile
  R conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/flight_plans/corsica.xml
  A conf/flight_plans/corsica_sectors.xml
  A conf/gcs/wide.xml
  A conf/joystick/gp_interlink.xml
  M conf/messages.xml
  A conf/modules/alt_filter.xml
  A conf/modules/baro_ms5611_i2c.xml
  A conf/modules/charge_sens.xml
  M conf/modules/digital_cam.xml
  A conf/modules/generic_com.xml
  A conf/modules/humid_htm_b71.xml
  M conf/modules/light.xml
  M conf/settings/basic.xml
  M conf/settings/dc.xml
  M conf/settings/flight_params.xml
  R conf/settings/fw_ctl_n.xml
  A conf/settings/settings_booz2_jtm.xml
  A conf/settings/tuning_ctl_adaptive.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  A conf/telemetry/telemetry_jtm.xml
  A data/maps/Makefile
  M sw/airborne/ap_downlink.h
  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/imu/imu_crista_arch.h
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.c
  A sw/airborne/arch/sim/peripherals/hmc5843_arch.h
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  A sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.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/imu/imu_crista_arch.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  A sw/airborne/firmwares/non_ap/charge_sens/charge_sens.pde
  A sw/airborne/firmwares/non_ap/satcom/satcom.pde
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.h
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/commands.h
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  A sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  R sw/airborne/gps_nmea.c
  M sw/airborne/inter_mcu.h
  M sw/airborne/lisa/lisa_overo_link.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/cam_control/point.h
  A sw/airborne/modules/com/generic_com.c
  A sw/airborne/modules/com/generic_com.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  A sw/airborne/modules/ins/alt_filter.c
  A sw/airborne/modules/ins/alt_filter.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_module.h
  M sw/airborne/modules/light/light.c
  A sw/airborne/modules/meteo/charge_sens.c
  A sw/airborne/modules/meteo/charge_sens.h
  A sw/airborne/modules/meteo/humid_htm_b71.c
  A sw/airborne/modules/meteo/humid_htm_b71.h
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/ir_mlx.h
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/baro_ets.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.c
  A sw/airborne/modules/sensors/baro_ms5611_i2c.h
  M sw/airborne/modules/vehicle_interface/vi.c
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/electrical.h
  A sw/airborne/subsystems/gps/gps_nmea.c
  A sw/airborne/subsystems/gps/gps_nmea.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_crista.c
  M sw/airborne/subsystems/imu/imu_crista.h
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/python/joystick/arduino_dangerboard.py
  M sw/ground_segment/python/joystick/ivydanger.py
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.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/in_progress/python/attitude_viz.py
  A sw/in_progress/satcom/Makefile
  A sw/in_progress/satcom/email2udp.c
  A sw/in_progress/satcom/grlobke
  A sw/in_progress/satcom/tcp2ivy.c
  A sw/in_progress/satcom/tcp2ivy_generic.c
  A sw/in_progress/satcom/udp2tcp.c
  M sw/lib/ocaml/gm.ml
  M sw/lib/python/settings_xml_parse.py

  Log Message:
  -----------
  Merge branch 'dev' into new-state-interface

resolved conflicts:
        conf/autopilot/rotorcraft.makefile
        sw/airborne/firmwares/rotorcraft/telemetry.h


Compare: https://github.com/paparazzi/paparazzi/compare/24fa6e0...1372590



reply via email to

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