[paparazzi-commits] [paparazzi/paparazzi] ea4776: Merge branch 'positive_control_gains' into rotorcr...

[GitHub]

  Branch: refs/heads/positive_control_gains
  Home:   https://github.com/paparazzi/paparazzi
  Commit: ea477661259461c7a54a659bbd21e5d21e0003cd
      
https://github.com/paparazzi/paparazzi/commit/ea477661259461c7a54a659bbd21e5d21e0003cd
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-02 (Thu, 02 Feb 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M README
  A conf/airframes/CDW/ChimuJTinyFwSpi.xml
  M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/fixed-wing/firestorm.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/drops.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/funjet1.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/malolo_sim.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/slayer2.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/solarstorm.xml
  M conf/airframes/ENAC/fixed-wing/obsolete/spocII.xml
  M conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  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/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/ENAC/fixed-wing/weasel.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/LAAS/mmlaas_N1.xml
  M conf/airframes/LAAS/mmlaas_N2.xml
  M conf/airframes/LAAS/mmlaas_N3.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  M conf/airframes/Poine/antenna.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.xml
  M conf/airframes/Poine/booz2_a8.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/test_libeknav.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/EasyStartPanTiltCHIMU_SPI.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/TU_Delft/skywalker.xml
  M conf/airframes/TU_Delft/skywalkerfiber.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/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.xml
  M conf/airframes/airframe.dtd
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/booz2_ppzuav.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.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/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  A conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/rctx.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/mm/rotor/qmk1.xml
  M conf/airframes/obsolete/autoplato.xml
  M conf/airframes/obsolete/booz2_Aron.xml
  M conf/airframes/obsolete/booz2_NoVa.xml
  M conf/airframes/obsolete/booz2_NoVa_001.xml
  M conf/airframes/obsolete/booz2_NoVa_002.xml
  M conf/airframes/obsolete/booz2_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  R conf/airframes/obsolete/csc.xml
  R conf/airframes/obsolete/csc_ap.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/easystar2.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/hitl_usb.xml
  M conf/airframes/obsolete/kalscott_easystar.xml
  M conf/airframes/obsolete/malolo_sim.xml
  M conf/airframes/obsolete/microjet5.xml
  M conf/airframes/obsolete/microjet5_tp_auto.xml
  M conf/airframes/obsolete/microjet6.xml
  M conf/airframes/obsolete/microjetI.xml
  M conf/airframes/obsolete/microjetII.xml
  M conf/airframes/obsolete/microjetIII.xml
  M conf/airframes/obsolete/microjet_raw_makefile.xml
  M conf/airframes/obsolete/minimag1.xml
  M conf/airframes/obsolete/minimag_fs.xml
  M conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
  M conf/airframes/obsolete/nova.xml
  M conf/airframes/obsolete/osam_xsens_twog.xml
  M conf/airframes/obsolete/slayer1.xml
  M conf/airframes/obsolete/slayer3.xml
  M conf/airframes/obsolete/slayerJH.xml
  M conf/airframes/obsolete/slicer1.xml
  M conf/airframes/obsolete/slicer2.xml
  M conf/airframes/obsolete/spirit.xml
  M conf/airframes/obsolete/spirit_proto.xml
  M conf/airframes/obsolete/storm1.xml
  M conf/airframes/obsolete/tiny2.xml
  M conf/airframes/obsolete/tiny_hitl.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/twisted.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/vor.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/test_i2c.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/airframes/wind_tunnel.xml
  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/logger.makefile
  R conf/autopilot/obsolete/booz_test_progs.makefile
  R conf/autopilot/obsolete/booz_test_progs.xml
  R conf/autopilot/obsolete/conf_dc_mc.h
  R conf/autopilot/obsolete/conf_motor_bench.h
  R conf/autopilot/obsolete/conf_wt.h
  R conf/autopilot/obsolete/csc.makefile
  R conf/autopilot/obsolete/csc_ap.makefile
  R conf/autopilot/obsolete/csc_baro.makefile
  R conf/autopilot/obsolete/csc_board_v1_0.h
  R conf/autopilot/obsolete/data_logger_1_0.h
  R conf/autopilot/obsolete/gps_ugear.makefile
  R conf/autopilot/obsolete/lisa_test_progs.makefile
  R conf/autopilot/obsolete/mercury.makefile
  R conf/autopilot/obsolete/mercury_csc.makefile
  R conf/autopilot/obsolete/pwm_input.makefile
  R conf/autopilot/obsolete/sitl.makefile
  R conf/autopilot/obsolete/sitl_jsbsim.makefile
  R conf/autopilot/obsolete/sitl_link_pprz.makefile
  R conf/autopilot/obsolete/sitl_link_xbee.makefile
  R conf/autopilot/obsolete/testing.makefile
  R conf/autopilot/obsolete/tiny.makefile
  R conf/autopilot/obsolete/tiny_2_1_1_usb.h
  R conf/autopilot/obsolete/twin_avr.h
  R conf/autopilot/obsolete/twin_avr.makefile
  R conf/autopilot/obsolete/twin_mcu.makefile
  R conf/autopilot/obsolete/twin_mcu_avr.makefile
  R conf/autopilot/obsolete/twog_booz.h
  R conf/autopilot/obsolete/v1_2.h
  R conf/autopilot/obsolete/v1_2.makefile
  R conf/autopilot/obsolete/v1_2_1.h
  R conf/autopilot/obsolete/v1_2_1.makefile
  R conf/autopilot/obsolete/vane_sensor.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/csc_gps.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_float_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  A conf/autopilot/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.0.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin_v1.5.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.0.makefile
  M conf/autopilot/subsystems/shared/imu_b2_v1.2.makefile
  M conf/autopilot/subsystems/shared/radio_control_ppm.makefile
  M conf/autopilot/subsystems/shared/radio_control_spektrum.makefile
  M conf/boards/booz_1.0.makefile
  M conf/boards/classix.makefile
  M conf/boards/hb_1.1.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/navgo_1.0.makefile
  M conf/boards/tiny_2.11.makefile
  M conf/boards/umarim_1.0.makefile
  M conf/flight_plans/basic.xml
  M conf/flight_plans/ccc_gl.xml
  M conf/flight_plans/creidlitz.xml
  M conf/flight_plans/fp_tp_auto.xml
  M conf/flight_plans/grosslobke_demo.xml
  M conf/flight_plans/hsif.xml
  M conf/flight_plans/ingolfsskali.xml
  M conf/flight_plans/joystick.xml
  M conf/flight_plans/kv_svalbard.xml
  M conf/flight_plans/nordlys.xml
  M conf/flight_plans/poles.xml
  M conf/flight_plans/snav.xml
  M conf/flight_plans/tcas.xml
  M conf/flight_plans/versatile.xml
  M conf/messages.xml
  M conf/modules/baro_board.xml
  A conf/modules/extra_dl.xml
  R conf/modules/twog_extra_dl.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/cam.xml
  M conf/settings/cam_pitch.xml
  M conf/settings/cam_roll.xml
  R conf/settings/csc_ap.xml
  M conf/settings/flight_params.xml
  M conf/settings/infrared.xml
  M conf/settings/ins_arduimu_basic.xml
  M conf/settings/ins_neutrals.xml
  M conf/settings/ir_i2c.xml
  M conf/settings/lisa.xml
  R conf/settings/mercury_csc.xml
  M conf/settings/photogrammetry_calculator.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_ctl_adaptive.xml
  M conf/settings/tuning_ctl_new.xml
  A conf/settings/tuning_ctl_new_airspeed.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  R conf/telemetry/booz.xml
  R conf/telemetry/csc.xml
  R conf/telemetry/csc_ap.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  R conf/telemetry/mercury_csc.xml
  M conf/telemetry/telemetry.dtd
  M conf/telemetry/telemetry_booz2.xml
  M conf/telemetry/telemetry_jtm.xml
  A conf/units.xml
  M data/pictures/penguin_logo.svg
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  M sw/airborne/alt_vfilter.h
  R sw/airborne/anemotaxis.c
  R sw/airborne/anemotaxis.h
  R sw/airborne/ap_downlink.h
  M sw/airborne/arch/avr/ant_v2x.c
  R sw/airborne/arch/avr/modem_hw.c
  R sw/airborne/arch/avr/modem_hw.h
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/avr/subsystems/datalink/audio_telemetry_hw.h
  R sw/airborne/arch/lpc21/modem_hw.c
  R sw/airborne/arch/lpc21/modem_hw.h
  R sw/airborne/arch/lpc21/servos_csc.c
  R sw/airborne/arch/lpc21/servos_csc.h
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.c
  A sw/airborne/arch/lpc21/subsystems/datalink/audio_telemetry_hw.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/sys_time_hw.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/baro_MS5534A.h
  M sw/airborne/arch/sim/ivy_transport.h
  M sw/airborne/arch/sim/jsbsim_hw.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/jsbsim_transport.c
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/sim_gps.c
  M sw/airborne/arch/sim/sim_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/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/led_hw.h
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  M sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/navgo/imu_navgo.c
  M sw/airborne/boards/navgo_1.0.h
  M sw/airborne/boards/tiny_0.99.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/boards/tiny_2.0.h
  M sw/airborne/boards/tiny_2.1.h
  M sw/airborne/boards/tiny_sim.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/boards/umarim/imu_umarim.c
  M sw/airborne/boards/umarim/imu_umarim.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_mc.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_modem.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz2_test_rc.c
  M sw/airborne/booz/test/booz2_test_usb.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  R sw/airborne/chemotaxis.c
  R sw/airborne/chemotaxis.h
  M sw/airborne/commands.c
  M sw/airborne/commands.h
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.c
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.h
  R sw/airborne/csc/arm7/props_csc.c
  R sw/airborne/csc/arm7/props_csc.h
  R sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_adc.h
  R sw/airborne/csc/csc_airspeed.c
  R sw/airborne/csc/csc_airspeed.h
  R sw/airborne/csc/csc_ap_link.c
  R sw/airborne/csc/csc_ap_link.h
  R sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_ap_main.h
  R sw/airborne/csc/csc_autopilot.c
  R sw/airborne/csc/csc_autopilot.h
  R sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_baro.h
  R sw/airborne/csc/csc_can.c
  R sw/airborne/csc/csc_can.h
  R sw/airborne/csc/csc_datalink.c
  R sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_main.h
  R sw/airborne/csc/csc_me4_link.c
  R sw/airborne/csc/csc_me4_link.h
  R sw/airborne/csc/csc_msg_def.h
  R sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_protocol.h
  R sw/airborne/csc/csc_rc_spektrum.c
  R sw/airborne/csc/csc_rc_spektrum.h
  R sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/csc_servos.h
  R sw/airborne/csc/csc_telemetry.c
  R sw/airborne/csc/csc_telemetry.h
  R sw/airborne/csc/csc_throttle.c
  R sw/airborne/csc/csc_throttle.h
  R sw/airborne/csc/csc_vane.c
  R sw/airborne/csc/csc_vane.h
  R sw/airborne/csc/csc_xsens.c
  R sw/airborne/csc/csc_xsens.h
  R sw/airborne/csc/mercury_ap.c
  R sw/airborne/csc/mercury_ap.h
  R sw/airborne/csc/mercury_csc_main.c
  R sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/mercury_supervision.h
  R sw/airborne/csc/mercury_xsens.c
  R sw/airborne/csc/mercury_xsens.h
  R sw/airborne/csc/ppm_bridge_main.c
  R sw/airborne/datalink.h
  R sw/airborne/downlink.c
  R sw/airborne/downlink.h
  R sw/airborne/downlink_transport.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  R sw/airborne/fbw_downlink.h
  M sw/airborne/firmwares/beth/gps_c.patch
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/beth/overo_test_uart.c
  M sw/airborne/firmwares/beth/overo_twist_controller.c
  M sw/airborne/firmwares/beth/rcv_telemetry.c
  A sw/airborne/firmwares/fixedwing/ap_downlink.c
  A sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/datalink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.c
  A sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  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
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.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/datalink.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/navigation.c
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/firmwares/tutorial/main_demo4.c
  M sw/airborne/firmwares/tutorial/main_demo5.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/fms/fms_test_datalink.c
  M sw/airborne/fms/overo_test_periodic.c
  M sw/airborne/fms/overo_test_telemetry.c
  M sw/airborne/fms/test_telemetry_2.c
  M sw/airborne/led.h
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  M sw/airborne/lisa/test/lisa_test_adxl345.c
  M sw/airborne/lisa/test/lisa_test_adxl345_dma.c
  M sw/airborne/lisa/test/lisa_test_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  R sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/math/pprz_algebra_float.h
  M sw/airborne/math/pprz_algebra_int.h
  M sw/airborne/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  R sw/airborne/modem.h
  M sw/airborne/modules/MPPT/MPPT.c
  M sw/airborne/modules/MPPT/sim_MPPT.c
  M sw/airborne/modules/adcs/adc_generic.c
  M sw/airborne/modules/adcs/max11040.c
  M sw/airborne/modules/benchmark/flight_benchmark.c
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  M sw/airborne/modules/cam_control/cam_roll.c
  A sw/airborne/modules/cam_control/cam_roll.h
  M sw/airborne/modules/cam_control/cam_track.c
  M sw/airborne/modules/cartography/cartography.c
  M sw/airborne/modules/cartography/cartography.h
  M sw/airborne/modules/cartography/photogrammetry_calculator.c
  R sw/airborne/modules/core/extra_pprz_dl.c
  R sw/airborne/modules/core/extra_pprz_dl.h
  M sw/airborne/modules/core/sys_mon.c
  A sw/airborne/modules/datalink/extra_pprz_dl.c
  A sw/airborne/modules/datalink/extra_pprz_dl.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  R sw/airborne/modules/deploy_sonar_buoy.h
  M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
  A sw/airborne/modules/enose/anemotaxis.c
  A sw/airborne/modules/enose/anemotaxis.h
  A sw/airborne/modules/enose/chemotaxis.c
  A sw/airborne/modules/enose/chemotaxis.h
  M sw/airborne/modules/enose/enose.c
  M sw/airborne/modules/gps/gps_ubx_ucenter.c
  M sw/airborne/modules/gsm/gsm.c
  M sw/airborne/modules/ins/alt_filter.c
  M sw/airborne/modules/ins/fw_ins_vn100.c
  M sw/airborne/modules/ins/ins_arduimu.c
  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_vn100.c
  M sw/airborne/modules/ins/ins_vn100.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/max3100/max3100_hw.c
  M sw/airborne/modules/meteo/charge_sens.c
  M sw/airborne/modules/meteo/dust_gp2y.c
  M sw/airborne/modules/meteo/geiger_counter.c
  M sw/airborne/modules/meteo/humid_dpicco.c
  M sw/airborne/modules/meteo/humid_hih.c
  M sw/airborne/modules/meteo/humid_htm_b71.c
  M sw/airborne/modules/meteo/humid_pcap01.c
  M sw/airborne/modules/meteo/humid_sht.c
  M sw/airborne/modules/meteo/humid_sht_i2c.c
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/light_solar.c
  M sw/airborne/modules/meteo/light_temt.c
  M sw/airborne/modules/meteo/temp_lm75.c
  M sw/airborne/modules/meteo/temp_tcouple_adc.c
  M sw/airborne/modules/meteo/temp_temod.c
  M sw/airborne/modules/meteo/temp_tmp102.c
  M sw/airborne/modules/meteo/wind_gfi.c
  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/AOA_adc.c
  M sw/airborne/modules/sensors/airspeed_amsys.c
  M sw/airborne/modules/sensors/airspeed_ets.c
  M sw/airborne/modules/sensors/alt_srf08.c
  M sw/airborne/modules/sensors/baro_MS5534A.c
  M sw/airborne/modules/sensors/baro_MS5534A.h
  M sw/airborne/modules/sensors/baro_amsys.c
  M sw/airborne/modules/sensors/baro_bmp.c
  M sw/airborne/modules/sensors/baro_ets.c
  M sw/airborne/modules/sensors/baro_ms5611_i2c.c
  M sw/airborne/modules/sensors/baro_scp.c
  M sw/airborne/modules/sensors/baro_scp_i2c.c
  M sw/airborne/modules/sensors/imu_ppzuav.c
  M sw/airborne/modules/sensors/mag_hmc5843.c
  M sw/airborne/modules/sensors/mag_hmc58xx.c
  M sw/airborne/modules/sensors/mag_micromag_fw.c
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.c
  M sw/airborne/modules/vehicle_interface/vi_datalink.h
  R sw/airborne/obsolete/3dmg.c
  R sw/airborne/obsolete/3dmg.h
  R sw/airborne/obsolete/booz_gps.c
  R sw/airborne/obsolete/booz_gps.h
  R sw/airborne/obsolete/booz_gps_skytraq.c
  R sw/airborne/obsolete/booz_gps_skytraq.h
  R sw/airborne/obsolete/booz_gps_ubx.c
  R sw/airborne/obsolete/booz_gps_ubx.h
  R sw/airborne/obsolete/gps.c
  R sw/airborne/obsolete/gps.h
  R sw/airborne/obsolete/gps_ubx.c
  R sw/airborne/obsolete/gps_ubx.h
  R sw/airborne/obsolete/ins_osam_ugear.c
  R sw/airborne/obsolete/ins_osam_ugear.h
  R sw/airborne/obsolete/latlong.c
  R sw/airborne/obsolete/latlong.h
  R sw/airborne/obsolete/max1167.c
  R sw/airborne/obsolete/max1167.h
  R sw/airborne/obsolete/max1167_hw.c
  R sw/airborne/obsolete/max1167_hw.h
  M sw/airborne/peripherals/mcp355x.c
  M sw/airborne/pprz_debug.h
  R sw/airborne/pprz_transport.c
  R sw/airborne/pprz_transport.h
  M sw/airborne/sd_card/main.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/ahrs/ahrs_infrared.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
  M sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/datalink/audio_telemetry.h
  A sw/airborne/subsystems/datalink/datalink.h
  A sw/airborne/subsystems/datalink/downlink.c
  A sw/airborne/subsystems/datalink/downlink.h
  A sw/airborne/subsystems/datalink/downlink_transport.h
  A sw/airborne/subsystems/datalink/pprz_transport.c
  A sw/airborne/subsystems/datalink/pprz_transport.h
  A sw/airborne/subsystems/datalink/transport.h
  A sw/airborne/subsystems/datalink/xbee.c
  A sw/airborne/subsystems/datalink/xbee.h
  A sw/airborne/subsystems/datalink/xbee24.h
  A sw/airborne/subsystems/datalink/xbee868.h
  M sw/airborne/subsystems/gps.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/imu/imu_b2.c
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/ins/hf_float.c
  A sw/airborne/subsystems/navigation/border_line.c
  A sw/airborne/subsystems/navigation/border_line.h
  A sw/airborne/subsystems/navigation/gls.c
  A sw/airborne/subsystems/navigation/gls.h
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/subsystems/sensors/infrared.c
  M sw/airborne/subsystems/sensors/infrared_i2c.h
  M sw/airborne/subsystems/settings.c
  M sw/airborne/sys_time.h
  M sw/airborne/test/ahrs/ahrs_on_synth.c
  M sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_adcs.c
  M sw/airborne/test/test_telemetry.c
  R sw/airborne/xbee.c
  R sw/airborne/xbee.h
  R sw/airborne/xbee24.h
  R sw/airborne/xbee868.h
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/page_settings.ml
  M sw/ground_segment/cockpit/saveSettings.ml
  M sw/ground_segment/lpc21iap/Makefile
  M sw/ground_segment/misc/Makefile
  M sw/ground_segment/tmtc/messages.ml
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/settings.ml
  M sw/in_progress/log_parser/09_05_13__14_38_13.log
  M sw/in_progress/python/attitude_viz.py
  R sw/lib/ocaml/ivy/Makefile
  R sw/lib/ocaml/ivy/README
  R sw/lib/ocaml/ivy/cglibivy.c
  R sw/lib/ocaml/ivy/civy.c
  R sw/lib/ocaml/ivy/civyloop.c
  R sw/lib/ocaml/ivy/ctkivy.c
  R sw/lib/ocaml/ivy/debian/changelog.3.10.2
  R sw/lib/ocaml/ivy/debian/changelog.3.11.2
  R sw/lib/ocaml/ivy/debian/compat
  R sw/lib/ocaml/ivy/debian/control
  R sw/lib/ocaml/ivy/debian/rules
  R sw/lib/ocaml/ivy/debian/shlibs.local
  R sw/lib/ocaml/ivy/examples/Makefile
  R sw/lib/ocaml/ivy/examples/glibivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyprobe.ml
  R sw/lib/ocaml/ivy/examples/tkivyprobe.ml
  R sw/lib/ocaml/ivy/glibIvy.ml
  R sw/lib/ocaml/ivy/glibIvy.mli
  R sw/lib/ocaml/ivy/ivy.ml
  R sw/lib/ocaml/ivy/ivy.mli
  R sw/lib/ocaml/ivy/ivyLoop.ml
  R sw/lib/ocaml/ivy/ivyLoop.mli
  R sw/lib/ocaml/ivy/tkIvy.ml
  R sw/lib/ocaml/ivy/tkIvy.mli
  M sw/lib/ocaml/pprz.ml
  M sw/lib/ocaml/pprz.mli
  M sw/logalizer/matlab_log/messages.xml
  M sw/simulator/flightModel.ml
  M sw/simulator/flight_gear.h
  M sw/simulator/sim.ml
  M sw/tools/gen_airframe.ml
  M sw/tools/gen_messages.ml
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge branch 'positive_control_gains' into rotorcraft_positive_control_gains

Conflicts:
        sw/airborne/math/pprz_algebra.h


  Commit: fe3062931bd85664c92c4fff670af5ced54fc3ed
      
https://github.com/paparazzi/paparazzi/commit/fe3062931bd85664c92c4fff670af5ced54fc3ed
  Author: Felix Ruess <address@hidden>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M conf/airframes/CDW/debug_i2c.xml
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/ENAC/quadrotor/g1_vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1-vision.xml
  M conf/airframes/ENAC/quadrotor/mkk1.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/ENAC/quadrotor/nova1.xml
  M conf/airframes/NoVa_L.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
  M conf/airframes/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
  M conf/airframes/Poine/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.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/UofAdelaide/booz2_NoVa_001_1000.xml
  M conf/airframes/UofAdelaide/booz2_a1000.xml
  M conf/airframes/UofAdelaide/lisa_a1000.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/airframes/obsolete/booz2_Aron.xml
  M conf/airframes/obsolete/booz2_NoVa.xml
  M conf/airframes/obsolete/booz2_NoVa_001.xml
  M conf/airframes/obsolete/booz2_NoVa_002.xml
  M conf/airframes/obsolete/booz2_a2.xml
  M conf/airframes/obsolete/booz2_a3.xml
  M conf/airframes/obsolete/booz2_a4.xml
  M conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/obsolete/booz2_s1.xml
  M conf/airframes/obsolete/booz2_x1.xml
  M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/math/pprz_algebra.h

  Log Message:
  -----------
  Merge pull request #134 from paparazzi/rotorcraft_positive_control_gains

Rotorcraft positive control gains


Compare: https://github.com/paparazzi/paparazzi/compare/dd15598...fe30629