[paparazzi-commits] [paparazzi/paparazzi] 0e6233: Merge branch 'dev' into spi_rewrite

[GitHub]

  Branch: refs/heads/spi_rewrite
  Home:   https://github.com/paparazzi/paparazzi
  Commit: 0e62330e38db5bb00bb41717f42b863edc728545
      
https://github.com/paparazzi/paparazzi/commit/0e62330e38db5bb00bb41717f42b863edc728545
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M .gitignore
  M Makefile
  M conf/Makefile.stm32
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_overo_rc.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_fw.xml
  M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
  M conf/autopilot/subsystems/rotorcraft/stabilization_int_quat.makefile
  M 
conf/autopilot/subsystems/rotorcraft/stabilization_int_quat_transition.makefile
  M conf/conf.xml.example
  M conf/mtk.dtd
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  M sw/airborne/firmwares/rotorcraft/actuators/supervision.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/airborne/modules/ins/ins_xsens.h
  M sw/simulator/flightModel.ml
  A tests/LisaL/01_upload.t
  A tests/Makefile
  A tests/examples/01_compile_all_example_targets.t
  A tests/lib/Ivy.pm
  A tests/lib/Proc/Background.pm
  A tests/lib/Proc/Background/Unix.pm
  A tests/lib/Proc/Background/Win32.pm
  A tests/lib/Program.pm
  A tests/lib/XML/NamespaceSupport.pm
  A tests/lib/XML/SAX.pm
  A tests/lib/XML/SAX/Base.pm
  A tests/lib/XML/SAX/BuildSAXBase.pl
  A tests/lib/XML/SAX/DocumentLocator.pm
  A tests/lib/XML/SAX/Exception.pm
  A tests/lib/XML/SAX/Intro.pod
  A tests/lib/XML/SAX/ParserFactory.pm
  A tests/lib/XML/SAX/PurePerl.pm
  A tests/lib/XML/SAX/PurePerl/DTDDecls.pm
  A tests/lib/XML/SAX/PurePerl/DebugHandler.pm
  A tests/lib/XML/SAX/PurePerl/DocType.pm
  A tests/lib/XML/SAX/PurePerl/EncodingDetect.pm
  A tests/lib/XML/SAX/PurePerl/Exception.pm
  A tests/lib/XML/SAX/PurePerl/NoUnicodeExt.pm
  A tests/lib/XML/SAX/PurePerl/Productions.pm
  A tests/lib/XML/SAX/PurePerl/Reader.pm
  A tests/lib/XML/SAX/PurePerl/Reader/NoUnicodeExt.pm
  A tests/lib/XML/SAX/PurePerl/Reader/Stream.pm
  A tests/lib/XML/SAX/PurePerl/Reader/String.pm
  A tests/lib/XML/SAX/PurePerl/Reader/URI.pm
  A tests/lib/XML/SAX/PurePerl/Reader/UnicodeExt.pm
  A tests/lib/XML/SAX/PurePerl/UnicodeExt.pm
  A tests/lib/XML/SAX/PurePerl/XMLDecl.pm
  A tests/lib/XML/Simple.pm
  A tests/lib/XML/Simple/FAQ.pod

  Log Message:
  -----------
  Merge branch 'dev' into spi_rewrite


  Commit: 66c104b13601f76cf6935eebb33dfd465768ee24
      
https://github.com/paparazzi/paparazzi/commit/66c104b13601f76cf6935eebb33dfd465768ee24
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    A .gitmodules
  M Makefile
  M conf/Makefile.stm32
  M conf/airframes/CDW/debug_i2c.xml
  A conf/airframes/CDW/debug_i2c_lpc.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/esden/lisa_asctec.xml
  M conf/airframes/esden/lisa_m_2_asp_2_pwm.xml
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/lisa_test_progs.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/shared/i2c_select.makefile
  M conf/boards/lisa_l_1.0.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/lisa_m_2.0.makefile
  M conf/modules/i2c_abuse_test.xml
  M conf/telemetry/telemetry_booz2.xml
  M sw/airborne/arch/avr/mcu_periph/i2c_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
  M sw/airborne/arch/sim/mcu_periph/i2c_arch.c
  M sw/airborne/arch/stm32/led_hw.h
  A sw/airborne/arch/stm32/lisa-l.ld
  A sw/airborne/arch/stm32/lisa-m.ld
  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/i2c_arch.c
  M sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
  R sw/airborne/arch/stm32/mcu_periph/i2c_arch.old.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_arch.old.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_arch.very_old.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt1.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt2_nolib.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt3_subtra.c
  A sw/airborne/arch/stm32/mcu_periph/obsolete/i2c_attempt4_nodouble_isr.c
  M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
  M sw/airborne/arch/stm32/mcu_periph/spi_arch.h
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
  M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/arch/stm32/my_debug_servo.h
  M sw/airborne/arch/stm32/peripherals/hmc5843_arch.c
  M sw/airborne/arch/stm32/peripherals/hmc5843_arch.h
  M sw/airborne/arch/stm32/peripherals/max1168_arch.c
  M sw/airborne/arch/stm32/peripherals/max1168_arch.h
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.c
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
  R sw/airborne/arch/stm32/pprz_baudrate.h
  R sw/airborne/arch/stm32/stm32_exceptions.c
  R sw/airborne/arch/stm32/stm32_exceptions.h
  R sw/airborne/arch/stm32/stm32_vector_table.c
  R sw/airborne/arch/stm32/stm32_vector_table.h
  A sw/airborne/arch/stm32/stm32default.ld
  R sw/airborne/arch/stm32/stm32f103rb_flash.ld
  R sw/airborne/arch/stm32/stm32f103re_flash.ld
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.c
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin2_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
  M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.c
  M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
  M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
  M sw/airborne/arch/stm32/subsystems/settings_arch.c
  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/baro_board.c
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/olimex_stm32-h103.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  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_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_led.c
  M sw/airborne/lisa/test_uart_lisal.c
  M sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/mcu_periph/i2c.h
  M sw/airborne/modules/benchmark/i2c_abuse_test.c
  M sw/airborne/modules/benchmark/i2c_abuse_test.h
  M sw/airborne/subsystems/electrical.c
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/test/subsystems/test_imu.c
  A sw/ext/Makefile
  A sw/ext/README
  A sw/ext/libopencm3

  Log Message:
  -----------
  Merge branch 'locm3' into spi_rewrite


Compare: https://github.com/paparazzi/paparazzi/compare/0e62330^...66c104b