[paparazzi-commits] [paparazzi/paparazzi] 23573c: Merge branch 'master' of github.com:paparazzi/papa...

[noreply]

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

Commit: 23573cd2fa0f40c2db8c0b8f6930690bc6a3e007
    
https://github.com/paparazzi/paparazzi/commit/23573cd2fa0f40c2db8c0b8f6930690bc6a3e007
Author: Christophe De Wagter <address@hidden>
Date:   2011-04-01 (Fri, 01 Apr 2011)

Changed paths:
  R TODO
  M conf/Makefile.stm32
  M conf/airframes/ENAC/quadrotor/blender.xml
  M conf/airframes/ENAC/quadrotor/booz2_g1.xml
  M conf/airframes/Poine/booz2_a7.xml
  A conf/airframes/Poine/test_settings.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/twinjet_example.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/fixedwing.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  M conf/autopilot/subsystems/fixedwing/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/lisa_passthrough/ahrs_cmpl.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_asctec.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
  A conf/autopilot/subsystems/rotorcraft/actuators_dummy.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_cmpl.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_b2_v1.0.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_b2_v1.2.makefile
  M conf/autopilot/subsystems/rotorcraft/imu_crista.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_transparent.makefile
  A conf/autopilot/subsystems/rotorcraft/telemetry_transparent_usb.makefile
  M conf/autopilot/subsystems/rotorcraft/telemetry_xbee_api.makefile
  A conf/autopilot/subsystems/shared/ahrs_ic.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/flight_plans/EMAV2008.xml
  M conf/flight_plans/IS.xml
  M conf/flight_plans/basic.xml
  M conf/flight_plans/ccc_gl.xml
  M conf/flight_plans/fp_tp_auto.xml
  M conf/flight_plans/grosslobke_demo.xml
  M conf/flight_plans/joystick.xml
  M conf/flight_plans/landing.xml
  M conf/flight_plans/mav07.xml
  M conf/flight_plans/mav08.xml
  M conf/flight_plans/nordlys.xml
  M conf/flight_plans/poles.xml
  M conf/flight_plans/slayer_training.xml
  M conf/flight_plans/snav.xml
  M conf/flight_plans/standard.xml
  M conf/flight_plans/tcas.xml
  M conf/flight_plans/versatile.xml
  M conf/flight_plans/xsens_cachejunction.xml
  A conf/gps/rotorcraft_ublox6.txt
  M conf/messages.xml
  A conf/modules/ins_arduimu_basic.xml
  M conf/modules/servo_switch.xml
  M conf/modules/sonar_maxbotix_booz.xml
  A conf/settings/flight_params.xml
  M conf/settings/fw_ctl_n.xml
  A conf/settings/infrared.xml
  A conf/settings/ins_basic.xml
  M conf/settings/ir_i2c.xml
  A conf/settings/pbn.xml
  M conf/settings/settings.dtd
  A conf/settings/settings_test.xml
  M conf/telemetry/fw_h_ctl_a.xml
  M conf/telemetry/telemetry_booz2.xml
  R conf/telemetry/telemetry_booz2_flixr.xml
  M doc/pprz_algebra/quaternion.tex
  M sw/airborne/arch/lpc21/mcu_periph/adc_arch.h
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  A sw/airborne/arch/lpc21/subsystems/settings_arch.c
  R sw/airborne/arch/lpc21/vic_slots.txt
  A sw/airborne/arch/lpc21/vic_slots_fw.txt
  A sw/airborne/arch/lpc21/vic_slots_rotorcrafts.txt
  A sw/airborne/arch/sim/subsystems/settings_arch.c
  M sw/airborne/arch/stm32/mcu_arch.c
  M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  A sw/airborne/arch/stm32/pprz_baudrate.h
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  A sw/airborne/arch/stm32/subsystems/settings_arch.c
  A sw/airborne/arch/stm32/subsystems/settings_arch.h
  M sw/airborne/boards/booz/baro_board.c
  M sw/airborne/boards/booz/baro_board.h
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m/baro_board.c
  M sw/airborne/boards/lisa_m/baro_board.h
  A sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.c
  R sw/airborne/booz/arch/lpc21/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_analog_hw.c
  R sw/airborne/booz/arch/sim/booz2_analog_hw.h
  R sw/airborne/booz/arch/sim/booz2_unsimulated_peripherals.c
  R sw/airborne/booz/arch/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/csc/mercury_xsens.h
  M sw/airborne/downlink.c
  M sw/airborne/downlink.h
  M sw/airborne/firmwares/beth/main_overo.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.h
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
  A sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/ADC.pde
  A sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_pprz.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Output.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Vector.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/arduimu_basic.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/matrix.pde
  A 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/timing.pde
  A sw/airborne/firmwares/rotorcraft/actuators/actuators_dummy.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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
  R sw/airborne/firmwares/rotorcraft/battery.c
  R sw/airborne/firmwares/rotorcraft/battery.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
  M 
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_spi_autopilot_msg.c
  R sw/airborne/lisa/lisa_analog_plug.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_uart_lisam.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.c
  A sw/airborne/mcu_periph/dac.h
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/mcu_periph/uart.h
  A sw/airborne/modules/ins/ins_arduimu_basic.c
  A sw/airborne/modules/ins/ins_arduimu_basic.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  A sw/airborne/modules/sonar/sonar_maxbotix.c
  A sw/airborne/modules/sonar/sonar_maxbotix.h
  R sw/airborne/modules/sonar/sonar_maxbotix_booz.c
  R sw/airborne/modules/sonar/sonar_maxbotix_booz.h
  M sw/airborne/peripherals/ami601.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/subsystems/ahrs/ahrs_aligner.c
  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_lkf.c
  M sw/airborne/subsystems/ahrs/ahrs_float_utils.h
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  A sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  A sw/airborne/subsystems/ahrs/ahrs_int_utils.h
  M sw/airborne/subsystems/imu.c
  A sw/airborne/subsystems/imu/imu_dummy.c
  M sw/airborne/subsystems/ins.c
  M sw/airborne/subsystems/ins.h
  M sw/airborne/subsystems/navigation/spiral.c
  A sw/airborne/subsystems/settings.c
  A sw/airborne/subsystems/settings.h
  M sw/airborne/test/ahrs/Makefile
  A sw/airborne/test/ahrs/ahrs_on_synth.c
  A sw/airborne/test/ahrs/ahrs_on_synth.h
  A sw/airborne/test/ahrs/ahrs_utils.py
  A sw/airborne/test/ahrs/compare_ahrs.py
  A sw/airborne/test/ahrs/run_ahrs_on_synth.c
  A sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
  M sw/airborne/test/pprz_algebra_print.h
  A sw/airborne/test/subsystems/test_ahrs.c
  A sw/airborne/test/subsystems/test_imu.c
  A sw/airborne/test/subsystems/test_settings.c
  A sw/airborne/test/subsystems/test_settings.h
  M sw/airborne/test/test_algebra.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/ground_segment/joystick/input2ivy.ml
  M sw/lib/ocaml/expr_lexer.mll
  M sw/lib/ocaml/expr_parser.mly
  M sw/lib/ocaml/expr_syntax.ml
  M sw/lib/ocaml/expr_syntax.mli
  M sw/lib/ocaml/papget.ml
  M sw/simulator/nps/nps_autopilot_booz.c
  M sw/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h
  M sw/tools/fp_proc.ml
  M sw/tools/gen_settings.ml

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