[paparazzi-commits] [paparazzi/paparazzi] 19bf33: Merge remote-tracking branch 'paparazzi/master' in...

[noreply]

Branch: refs/heads/master
Home:   https://github.com/paparazzi/paparazzi

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


Compare: https://github.com/paparazzi/paparazzi/compare/44e9af7...6fc18d8