[paparazzi-commits] [paparazzi/paparazzi] a24ae2: Merge branch '4.0_beta' into dev

[GitHub]

  Branch: refs/heads/dev
  Home:   https://github.com/paparazzi/paparazzi
  Commit: a24ae2d31c55438e46e94e366ea1caa3a3a6fcdc
      
https://github.com/paparazzi/paparazzi/commit/a24ae2d31c55438e46e94e366ea1caa3a3a6fcdc
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M Makefile.ac
  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/booz2_a1.xml
  M conf/airframes/Poine/booz2_a1p.xml
  M conf/airframes/Poine/booz2_a7.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/swift_1.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/delta_wing_minimal_example.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
  M 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/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/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/airframes/obsolete/easystar2.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/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/twinjet1.xml
  M conf/airframes/obsolete/twinstar1.xml
  M conf/airframes/obsolete/twinstar6.xml
  M conf/airframes/obsolete/tyto1.xml
  M conf/airframes/obsolete/xxx1.xml
  M conf/airframes/test_hb.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
  A conf/boards/sdlog_1.0.makefile
  M conf/conf.xml.example
  M conf/radios/R6107SP_7ch.xml
  M conf/radios/TGY9x_jeti.xml
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/flight_params.xml
  M conf/settings/fw_h_ctl_a_settings.xml
  M conf/settings/lisa.xml
  M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M conf/settings/settings_test_passthrough.xml
  R conf/settings/tl.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
  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/aerocomm.xml
  R conf/telemetry/booz_minimal.xml
  R conf/telemetry/default.xml
  A conf/telemetry/default_fixedwing.xml
  A conf/telemetry/default_rotorcraft.xml
  A conf/telemetry/dummy.xml
  A conf/telemetry/fixedwing_control_new.xml
  R conf/telemetry/fw_h_ctl_a.xml
  R conf/telemetry/hitl.xml
  A conf/telemetry/hitl_fixedwing.xml
  R conf/telemetry/minimal.xml
  R conf/telemetry/nova_telemetry.xml
  R conf/telemetry/osam_imu.xml
  M conf/telemetry/telemetry.dtd
  R conf/telemetry/telemetry_booz2.xml
  R conf/telemetry/telemetry_jtm.xml
  R conf/telemetry/telemetry_whirly.xml
  R conf/telemetry/telemetry_wt.xml
  R conf/telemetry/tl.xml
  R conf/telemetry/ugv.xml
  R conf/telemetry/xbee868.xml
  A conf/telemetry/xbee868.xml
  M sw/airborne/arch/lpc21/test/bootloader/crt.S
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
  M sw/airborne/boards/lisa_l/baro_board.c
  A sw/airborne/boards/sdlog_1.0.h
  M sw/airborne/firmwares/fixedwing/ap_downlink.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/fbw_downlink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/rotorcraft/autopilot.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_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_attitude_ref_euler_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
  M sw/airborne/firmwares/rotorcraft/telemetry.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_gs_com.c
  M sw/airborne/math/pprz_algebra.h
  M sw/airborne/modules/cam_control/booz_cam.c
  M sw/airborne/modules/nav/nav_catapult.c
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  M sw/airborne/subsystems/nav.c
  M sw/ground_segment/cockpit/live.ml
  M sw/include/std.h
  M sw/simulator/flightModel.ml
  M sw/simulator/nps/nps_ivy.c
  M sw/simulator/nps/nps_radio_control_joystick.c
  M sw/simulator/nps/nps_radio_control_spektrum.c
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml
  M sw/tools/gen_tuning.ml

  Log Message:
  -----------
  Merge branch '4.0_beta' into dev


  Commit: 896c84ebecb9106abde34a1558c55995175a5283
      
https://github.com/paparazzi/paparazzi/commit/896c84ebecb9106abde34a1558c55995175a5283
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    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_h.h
  M sw/airborne/firmwares/rotorcraft/stabilization/quat_setpoint_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
  A 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h

  Log Message:
  -----------
  Merge branch 'attitude_ref_frac' into dev
* cleaned up rotorcraft stabilization and guidance
* removed not properly functioning nav tracking algorithm
* same guidance loop for hover and nav (except that nav uses a reference)
* guidance should now be running properly for quaternion stabilization as well


Compare: https://github.com/paparazzi/paparazzi/compare/e4d52d3...896c84e