[paparazzi-commits] [paparazzi/paparazzi] 6aa676: Merge https://github.com/paparazzi/paparazzi into ...

[noreply]

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

  Commit: 6aa676daa1d0c6045882fce10f8af8418928598b
      
https://github.com/paparazzi/paparazzi/commit/6aa676daa1d0c6045882fce10f8af8418928598b
  Author: Bruzzlee <address@hidden>
  Date:   2011-08-16 (Tue, 16 Aug 2011)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Merge https://github.com/paparazzi/paparazzi into dev


  Commit: 38613d1e4ae66807393e92821c23aba7e0777d6d
      
https://github.com/paparazzi/paparazzi/commit/38613d1e4ae66807393e92821c23aba7e0777d6d
  Author: Felix Ruess <address@hidden>
  Date:   2011-08-16 (Tue, 16 Aug 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c

  Log Message:
  -----------
  initialize h_ctl_pitch_mode to zero, thx Bruzzlee


  Commit: cc5109ee84fdef778f574404a18d4e58d803426f
      
https://github.com/paparazzi/paparazzi/commit/cc5109ee84fdef778f574404a18d4e58d803426f
  Author: Felix Ruess <address@hidden>
  Date:   2011-08-16 (Tue, 16 Aug 2011)

  Changed paths:
    M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h

  Log Message:
  -----------
  Merge pull request #67
makes sense so you can't accidentally switch to AOA pitch mode while you don't 
even have an AOA sensor


  Commit: 89b552eccf5bb27bfaefbe528324ca1f41fdd061
      
https://github.com/paparazzi/paparazzi/commit/89b552eccf5bb27bfaefbe528324ca1f41fdd061
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M conf/Makefile.lpc21
  A conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/microjet_example.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  A conf/maps.dtd
  A conf/maps.xml.example
  M conf/messages.xml
  A conf/modules/AOA_adc.xml
  A conf/modules/airspeed_amsys.xml
  A conf/modules/baro_amsys.xml
  A conf/modules/cam_segment.xml
  M conf/modules/digital_cam.xml
  A conf/modules/flight_benchmark.xml
  M conf/mtk.dtd
  A conf/settings/AOA_adc.xml
  A conf/settings/airspeed_amsys.xml
  A conf/settings/baro_amsys.xml
  M conf/settings/basic.xml
  A conf/settings/basic_infrared.xml
  A conf/settings/benchmark.xml
  M conf/settings/cam.xml
  M conf/settings/dc.xml
  M conf/settings/flight_params.xml
  R conf/settings/ins_basic.xml
  A conf/settings/ins_neutrals.xml
  M conf/settings/tuning.xml
  A conf/settings/tuning_infrared.xml
  M data/maps/Makefile
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_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/booz/test/booz2_tunnel.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  A sw/airborne/modules/benchmark/flight_benchmark.c
  A sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  A sw/airborne/modules/cam_control/cam_segment.c
  A sw/airborne/modules/cam_control/cam_segment.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/cam_control/point.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/ins/ins_module.h
  A sw/airborne/modules/sensors/AOA_adc.c
  A sw/airborne/modules/sensors/AOA_adc.h
  A sw/airborne/modules/sensors/airspeed_amsys.c
  A sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.c
  A sw/airborne/modules/sensors/baro_amsys.h
  M sw/airborne/obsolete/3dmg.c
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c
  M sw/airborne/print.h
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/ground_segment/cockpit/speech.ml
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/gm.ml
  A sw/lib/ocaml/maps_support.ml
  A sw/lib/ocaml/maps_support.mli
  M sw/lib/ocaml/os_calls.ml
  M sw/supervision/pc_common.ml
  M sw/tools/gen_flight_plan.ml

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


  Commit: 2c5b29e86319fdb20707d90a2cbcb85c780c1860
      
https://github.com/paparazzi/paparazzi/commit/2c5b29e86319fdb20707d90a2cbcb85c780c1860
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M Makefile.install
  M conf/Makefile.lpc21
  M conf/airframes/CDW/ChimuLisaFw.xml
  M conf/airframes/CDW/ChimuTinyFw.xml
  M conf/airframes/CDW/ChimuTinyFwSpi.xml
  M conf/airframes/CDW/LisaFw.xml
  M conf/airframes/CDW/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/funjet2.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
  M conf/airframes/ENAC/fixed-wing/funjet2_new.xml
  M conf/airframes/ENAC/fixed-wing/funjet3.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.xml
  A conf/airframes/ENAC/fixed-wing/overview.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-1.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-2.xml
  M conf/airframes/ENAC/fixed-wing/spocIII-3.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/LAAS/mmlaas_N1.xml
  M conf/airframes/LAAS/mmlaas_N2.xml
  M conf/airframes/LAAS/mmlaas_N3.xml
  M conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/TU_Delft/MicrojetBR.xml
  M conf/airframes/TU_Delft/MicrojetBRimu.xml
  M conf/airframes/TU_Delft/MicrojetCDW.xml
  M conf/airframes/delta_wing_minimal_example.xml
  M conf/airframes/easy_glider_example.xml
  M conf/airframes/easystar_ets_example.xml
  M conf/airframes/easystar_example.xml
  M conf/airframes/example_twog_analogimu.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/funjet_cam_example.xml
  M conf/airframes/funjet_example.xml
  M conf/airframes/jsbsim.xml
  M conf/airframes/mentor_tum.xml
  M conf/airframes/microjet_example.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjet43.xml
  M conf/airframes/mm/fixed-wing/funjetdca.xml
  M conf/airframes/mm/fixed-wing/funjetdcb.xml
  M conf/airframes/mm/fixed-wing/funjetdcc.xml
  M conf/airframes/mm/fixed-wing/funjetgfi8.xml
  M conf/airframes/mm/fixed-wing/funjetlisa.xml
  M conf/airframes/mm/fixed-wing/funjetlisam.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/mm/fixed-wing/merlin.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/test_hb.xml
  M conf/airframes/twinjet_example.xml
  M conf/airframes/twinjet_overo.xml
  M conf/airframes/twinstar_example.xml
  M conf/airframes/usb_test.xml
  M conf/autopilot/booz2_test_progs.makefile
  M conf/autopilot/fixedwing.xml
  M conf/autopilot/lisa_l_test_progs.makefile
  M conf/autopilot/lisa_m_test_progs.makefile
  M conf/autopilot/lisa_passthrough.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_dcm.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/gps_mediatek_diy.makefile
  A conf/autopilot/subsystems/fixedwing/gps_ublox.makefile
  A conf/autopilot/subsystems/fixedwing/gps_ublox_hitl.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
  M conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
  R conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
  A conf/autopilot/subsystems/fixedwing/gps_ublox_utm.makefile
  M conf/autopilot/subsystems/fixedwing/imu_ppzuav.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  M conf/control_panel.xml.example
  R conf/flight_plans/standard.xml
  A conf/maps.dtd
  A conf/maps.xml.example
  M conf/messages.xml
  A conf/modules/AOA_adc.xml
  A conf/modules/airspeed_amsys.xml
  A conf/modules/baro_amsys.xml
  A conf/modules/cam_segment.xml
  M conf/modules/digital_cam.xml
  A conf/modules/flight_benchmark.xml
  A conf/modules/geiger_counter.xml
  A conf/modules/humid_pcap01.xml
  M conf/modules/humid_sht_i2c.xml
  A conf/modules/imu_aspirin_i2c.xml
  A conf/modules/imu_ppzuav.xml
  M conf/modules/ins_arduimu_basic.xml
  M conf/modules/ins_aspirin_via_i2c.xml
  M conf/modules/ins_chimu_spi.xml
  M conf/modules/ins_chimu_uart.xml
  M conf/modules/ins_ppzuavimu.xml
  A conf/modules/light_solar.xml
  A conf/modules/photogrammetry_calculator.xml
  A conf/modules/temp_tcouple_adc.xml
  A conf/mtk.dtd
  A conf/mtk.xml
  A conf/settings/AOA_adc.xml
  A conf/settings/airspeed_amsys.xml
  A conf/settings/baro_amsys.xml
  M conf/settings/basic.xml
  A conf/settings/basic_infrared.xml
  A conf/settings/basic_ins.xml
  A conf/settings/benchmark.xml
  M conf/settings/cam.xml
  M conf/settings/dc.xml
  M conf/settings/flight_params.xml
  A conf/settings/ins_arduimu_basic.xml
  R conf/settings/ins_basic.xml
  A conf/settings/ins_neutrals.xml
  A conf/settings/photogrammetry_calculator.xml
  M conf/settings/tuning.xml
  R conf/settings/tuning_basic_ins.xml
  A conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  A conf/settings/tuning_ins_dcm.xml
  R conf/system/udev/rules/10-paparazzi.rules
  A conf/system/udev/rules/50-paparazzi.rules
  M conf/telemetry/default_fixedwing_imu.xml
  R conf/wavecard.xml
  R conf/waypoints.xml
  M data/maps/Makefile
  M sw/airborne/ap_downlink.h
  A sw/airborne/arch/lpc21/mcu_periph/gpio_arch.h
  M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  M sw/airborne/arch/lpc21/subsystems/settings_arch.c
  M sw/airborne/arch/lpc21/usb_tunnel.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.c
  A sw/airborne/arch/omap/mcu_periph/uart_arch.h
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_b2_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  M sw/airborne/arch/stm32/mcu_arch.c
  A sw/airborne/arch/stm32/mcu_periph/gpio_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/peripherals/hmc5843_arch.c
  M sw/airborne/arch/stm32/servos_direct_hw.h
  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/settings_arch.c
  M sw/airborne/boards/lisa_l/baro_board.h
  M sw/airborne/booz/test/booz2_tunnel.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
  M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/GPS_pprz.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/Output.pde
  M 
sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/arduimu_basic.pde
  A sw/airborne/firmwares/non_ap/geiger_counter/geiger_counter.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  A sw/airborne/mcu_periph/uart.c
  M sw/airborne/mcu_periph/uart.h
  A sw/airborne/modules/benchmark/flight_benchmark.c
  A sw/airborne/modules/benchmark/flight_benchmark.h
  M sw/airborne/modules/cam_control/cam.c
  M sw/airborne/modules/cam_control/cam.h
  A sw/airborne/modules/cam_control/cam_segment.c
  A sw/airborne/modules/cam_control/cam_segment.h
  M sw/airborne/modules/cam_control/cam_track.h
  M sw/airborne/modules/cam_control/point.c
  M sw/airborne/modules/cam_control/point.h
  A sw/airborne/modules/cartography/photogrammetry_calculator.c
  A sw/airborne/modules/cartography/photogrammetry_calculator.h
  M sw/airborne/modules/digital_cam/dc.c
  M sw/airborne/modules/digital_cam/dc.h
  M sw/airborne/modules/ins/imu_chimu.c
  M sw/airborne/modules/ins/imu_chimu.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/modules/ins/ins_arduimu_basic.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_module.h
  R sw/airborne/modules/ins/ins_ppzuavimu.c
  R sw/airborne/modules/ins/ins_ppzuavimu.h
  A sw/airborne/modules/meteo/geiger_counter.c
  A sw/airborne/modules/meteo/geiger_counter.h
  M sw/airborne/modules/meteo/humid_dpicco.h
  M sw/airborne/modules/meteo/humid_hih.c
  A sw/airborne/modules/meteo/humid_pcap01.c
  A sw/airborne/modules/meteo/humid_pcap01.h
  M sw/airborne/modules/meteo/humid_sht.h
  M sw/airborne/modules/meteo/humid_sht_i2c.c
  M sw/airborne/modules/meteo/humid_sht_i2c.h
  A sw/airborne/modules/meteo/light_solar.c
  A sw/airborne/modules/meteo/light_solar.h
  A sw/airborne/modules/meteo/temp_tcouple_adc.c
  A sw/airborne/modules/meteo/temp_tcouple_adc.h
  A sw/airborne/modules/sensors/AOA_adc.c
  A sw/airborne/modules/sensors/AOA_adc.h
  A sw/airborne/modules/sensors/airspeed_amsys.c
  A sw/airborne/modules/sensors/airspeed_amsys.h
  A sw/airborne/modules/sensors/baro_amsys.c
  A sw/airborne/modules/sensors/baro_amsys.h
  M sw/airborne/modules/sensors/baro_bmp.c
  A sw/airborne/modules/sensors/imu_ppzuav.c
  A sw/airborne/modules/sensors/imu_ppzuav.h
  M sw/airborne/obsolete/3dmg.c
  M sw/airborne/obsolete/gps.h
  M sw/airborne/obsolete/gps_ubx.c
  M sw/airborne/peripherals/hmc5843.c
  M sw/airborne/peripherals/hmc5843.h
  M sw/airborne/print.h
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  M sw/airborne/subsystems/gps.h
  A sw/airborne/subsystems/gps/gps_mtk.c
  A sw/airborne/subsystems/gps/gps_mtk.h
  M sw/airborne/subsystems/gps/gps_nmea.h
  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_aspirin.h
  M sw/airborne/subsystems/imu/imu_b2.h
  M sw/airborne/subsystems/navigation/poly_survey_adv.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/subsystems/settings.c
  M sw/ground_segment/cockpit/horizon.ml
  M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/cockpit/speech.ml
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/defivybus.ml
  M sw/lib/ocaml/gm.ml
  A sw/lib/ocaml/maps_support.ml
  A sw/lib/ocaml/maps_support.mli
  A sw/lib/ocaml/os_calls.ml
  A sw/lib/ocaml/os_calls.mli
  M sw/logalizer/Makefile
  A sw/logalizer/plotprofile.c
  M sw/simulator/sim_ac_jsbsim.c
  M sw/supervision/pc_aircraft.ml
  M sw/supervision/pc_common.ml
  M sw/tools/Makefile
  M sw/tools/calibration/calibrate.py
  M sw/tools/gen_flight_plan.ml
  M sw/tools/gen_modules.ml
  A sw/tools/gen_mtk.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/master' into umarim


  Commit: bf5a867b2912972d15e095ebaeb7e64dc3a42459
      
https://github.com/paparazzi/paparazzi/commit/bf5a867b2912972d15e095ebaeb7e64dc3a42459
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M conf/airframes/ENAC/fixed-wing/weasel.xml
  M sw/airborne/boards/navgo/baro_board.c
  M sw/airborne/boards/navgo/baro_board.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/peripherals/ads1114.c
  M sw/airborne/peripherals/ads1114.h

  Log Message:
  -----------
  cleanup whitespaces


  Commit: b9648610ba7b0a66565412992df315e23c414d43
      
https://github.com/paparazzi/paparazzi/commit/b9648610ba7b0a66565412992df315e23c414d43
  Author: Felix Ruess <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M data/maps/Makefile

  Log Message:
  -----------
  fix echo for systems where -e is not default, e.g. debian


  Commit: 735b38072b42aaf77d336ddf7d6affedff84b494
      
https://github.com/paparazzi/paparazzi/commit/735b38072b42aaf77d336ddf7d6affedff84b494
  Author: Felix Ruess <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile

  Log Message:
  -----------
  fix define, is USE_NPS not NPS, got lost somewhere....


  Commit: 5c9fccd3d1912cad9b1145e927073d71c913813c
      
https://github.com/paparazzi/paparazzi/commit/5c9fccd3d1912cad9b1145e927073d71c913813c
  Author: Felix Ruess <address@hidden>
  Date:   2011-08-17 (Wed, 17 Aug 2011)

  Changed paths:
    M data/maps/Makefile

  Log Message:
  -----------
  ahrg, really fix echo in maps makefile now


Compare: https://github.com/paparazzi/paparazzi/compare/7db5de6...5c9fccd