[paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of

paparazzi-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of

From:	GitHub
Subject:	[paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of github.com:paparazzi/paparaz...
Date:	Mon, 19 Mar 2012 13:05:41 -0700

  Branch: refs/heads/locm3
  Home:   https://github.com/paparazzi/paparazzi
  Commit: f6e510d63a3f265de79403dfe78ac75900b7bb22
      
https://github.com/paparazzi/paparazzi/commit/f6e510d63a3f265de79403dfe78ac75900b7bb22
  Author: Bernard Davison <address@hidden>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M Doxyfile
  M conf/airframes/CDW/LisaAspirin2.xml
  M conf/airframes/ENAC/quadrotor/navgo.xml
  M conf/airframes/booz2_flixr.xml
  M conf/airframes/example_heli_lisam.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  A conf/airframes/logomatic.xml
  A conf/airframes/mm/extra/logger_sd_twog.xml
  M conf/autopilot/logger.makefile
  A conf/autopilot/subsystems/fixedwing/gps_skytraq.makefile
  M conf/autopilot/subsystems/fixedwing/ins_xsens.makefile
  M conf/autopilot/subsystems/fixedwing/spi_slave_hs.makefile
  M conf/autopilot/subsystems/rotorcraft/gps_skytraq.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/boards/lisa_m_2.0.makefile
  A conf/boards/logom_2.6.makefile
  M conf/messages.xml
  M conf/modules/demo_module.xml
  M conf/modules/ins_chimu_spi.xml
  M conf/modules/ins_chimu_uart.xml
  A conf/modules/nav_catapult.xml
  M conf/modules/sonar_maxbotix_booz.xml
  A conf/radios/TGY9x_jeti.xml
  M conf/settings/tuning_ctl_new.xml
  M conf/settings/tuning_ins.xml
  M sw/airborne/arch/lpc21/peripherals/ms2100_arch.c
  M sw/airborne/arch/lpc21/peripherals/ms2100_arch.h
  M sw/airborne/arch/lpc21/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/lpc21/test/bootloader/Makefile
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.c
  M sw/airborne/arch/stm32/peripherals/ms2100_arch.h
  M sw/airborne/arch/stm32/subsystems/imu/imu_b2_arch.c
  A sw/airborne/boards/logom_2.6.h
  M sw/airborne/booz/test/booz2_test_micromag.c
  A sw/airborne/firmwares/beth/rcv_telemetry.c
  R sw/airborne/firmwares/beth/rcv_telemetry.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.c
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v.h
  M sw/airborne/firmwares/fixedwing/guidance/guidance_v_n.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/rotorcraft/autopilot.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
  M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
  M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/tutorial/main_demo3.c
  M sw/airborne/firmwares/tutorial/main_demo4.c
  M sw/airborne/firmwares/tutorial/main_demo5.c
  M sw/airborne/firmwares/tutorial/main_demo6.c
  A sw/airborne/firmwares/vor/lo.h
  R sw/airborne/firmwares/vor/lo.h
  R sw/airborne/firmwares/vor/vor_int_demod_decim.c
  A sw/airborne/firmwares/vor/vor_int_demod_decim.c
  A sw/airborne/firmwares/vor/vor_int_demod_decim.h
  R sw/airborne/firmwares/vor/vor_int_demod_decim.h
  A sw/airborne/firmwares/vor/vor_int_filters_decim.h
  R sw/airborne/firmwares/vor/vor_int_filters_decim.h
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  R sw/airborne/modules/ins/ins_chimu.h
  M sw/airborne/modules/ins/ins_chimu_spi.c
  M sw/airborne/modules/ins/ins_chimu_uart.c
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/ins/ins_xsens.h
  A sw/airborne/modules/nav/nav_catapult.c
  A sw/airborne/modules/nav/nav_catapult.h
  A sw/airborne/modules/openlog/openlog.c
  R sw/airborne/modules/openlog/openlog.c
  R sw/airborne/modules/openlog/openlog.h
  A sw/airborne/modules/openlog/openlog.h
  R sw/airborne/modules/sensors/airspeed_amsys.c
  A sw/airborne/modules/sensors/airspeed_amsys.c
  R sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.c
  R sw/airborne/modules/sensors/baro_amsys.c
  R sw/airborne/modules/sensors/baro_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.h
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/gps/gps_mtk.h
  M sw/airborne/subsystems/gps/gps_nmea.c
  M sw/airborne/subsystems/gps/gps_nmea.h
  M sw/airborne/subsystems/gps/gps_sim.h
  M sw/airborne/subsystems/gps/gps_sim_nps.h
  M sw/airborne/subsystems/gps/gps_skytraq.c
  M sw/airborne/subsystems/gps/gps_skytraq.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/imu/imu_aspirin2.c
  M sw/airborne/subsystems/imu/imu_aspirin2.h
  M sw/airborne/subsystems/ins.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/discsurvey.c
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/ground_segment/cockpit/gcs.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/live.mli
  A sw/logalizer/openlog2tlm.c
  R sw/logalizer/openlog2tlm.c

  Log Message:
  -----------
  Merge branch 'dev' of github.com:paparazzi/paparazzi into hardware_test


  Commit: cc050c4781dfc1aa3b10932ceb0abcef9b228d9e
      
https://github.com/paparazzi/paparazzi/commit/cc050c4781dfc1aa3b10932ceb0abcef9b228d9e
  Author: Bernard Davison <address@hidden>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M tests/examples/01_compile_all_example_targets.t

  Log Message:
  -----------
  Commenting out tests that are known to fail on Mac due to JSBSim.


  Commit: 90bdc9344c98b706528eac14fd6d66e2400c291b
      
https://github.com/paparazzi/paparazzi/commit/90bdc9344c98b706528eac14fd6d66e2400c291b
  Author: Felix Ruess <address@hidden>
  Date:   2012-03-19 (Mon, 19 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/conf.xml.example
  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 'hardware_test' into dev


  Commit: 4c45cd2a17a6b67ea3b5989bfe87af90df7fedf9
      
https://github.com/paparazzi/paparazzi/commit/4c45cd2a17a6b67ea3b5989bfe87af90df7fedf9
  Author: Piotr Esden-Tempski <address@hidden>
  Date:   2012-03-19 (Mon, 19 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/conf.xml.example
  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 locm3


Compare: https://github.com/paparazzi/paparazzi/compare/d09a2cd...4c45cd2

[Prev in Thread]

Current Thread

[Next in Thread]

[paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of github.com:paparazzi/paparaz..., GitHub, 2012/03/19
- [paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of github.com:paparazzi/paparaz..., GitHub <=

Prev by Date: [paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of github.com:paparazzi/paparaz...
Next by Date: [paparazzi-commits] [paparazzi/paparazzi] c2bc03: rotorcraft guidance_h: also compute quaternion set...
Previous by thread: [paparazzi-commits] [paparazzi/paparazzi] f6e510: Merge branch 'dev' of github.com:paparazzi/paparaz...
Next by thread: [paparazzi-commits] [paparazzi/paparazzi] c2bc03: rotorcraft guidance_h: also compute quaternion set...
Index(es):
- Date
- Thread