[paparazzi-commits] [paparazzi/paparazzi] 94ed2a: Merge branch 'master' into arduimu

[noreply]

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

Commit: 94ed2a831d526fcd6df7ecfb12b6f59d4fc13433
    
https://github.com/paparazzi/paparazzi/commit/94ed2a831d526fcd6df7ecfb12b6f59d4fc13433
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  R TODO
  M conf/airframes/ENAC/quadrotor/blender.xml
  A conf/airframes/Poine/test_settings.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  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/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/fixedwing/control_new.makefile
  A conf/autopilot/subsystems/shared/ahrs_ic.makefile
  A conf/autopilot/subsystems/shared/imu_aspirin.makefile
  M conf/boards/lisa_m_1.0.makefile
  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
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/dac_arch.h
  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
  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_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/stm32/booz2_analog_hw.h
  R sw/airborne/booz/booz2_analog.c
  R sw/airborne/booz/booz2_analog.h
  M sw/airborne/booz/test/booz_test_imu.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
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm.h
  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/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  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/uart.h
  M sw/airborne/modules/sensors/pressure_board_navarro.c
  M sw/airborne/modules/sensors/pressure_board_navarro.h
  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_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
  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/simulator/nps/nps_random.c
  M sw/simulator/nps/nps_random.h

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


Commit: d61179852146db5ad94555aac1d8b568bfc780f2
    
https://github.com/paparazzi/paparazzi/commit/d61179852146db5ad94555aac1d8b568bfc780f2
Author: Gautier Hattenberger <address@hidden>
Date:   2011-03-22 (Tue, 22 Mar 2011)

Changed paths:
  M conf/modules/ins_arduimu.xml
  A conf/modules/ins_arduimu_basic.xml
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_EM406.pde
  R 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_NMEA.pde

Log Message:
-----------
remove unused GPS files and add module conf file for arduimu basic
version


Compare: https://github.com/paparazzi/paparazzi/compare/49a6a0e...d611798