[paparazzi-commits] [paparazzi/paparazzi] 79e184: Merge remote branch 'paparazzi/master' into joysti...

[noreply]

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

Commit: 79e18487c274863f592058473b311acc0f5a1b97
    
https://github.com/paparazzi/paparazzi/commit/79e18487c274863f592058473b311acc0f5a1b97
Author: Gautier Hattenberger <address@hidden>
Date:   2011-04-14 (Thu, 14 Apr 2011)

Changed paths:
  M .gitignore
  M Makefile
  M conf/Makefile.stm32
  R conf/airframes/Poine/booz2_a6.xml
  M conf/airframes/Poine/booz2_a7.xml
  A conf/airframes/Poine/h_hex.xml
  M conf/airframes/Poine/test_settings.xml
  M conf/airframes/booz2_flixr.xml
  A conf/airframes/esden/calib/aspirin_012.xml
  M conf/airframes/esden/lisa_m_pwm.xml
  M conf/airframes/esden/lisa_pwm_aspirin.xml
  M conf/airframes/mm/extra/probe_t.xml
  M conf/airframes/mm/extra/turbine_trigger.xml
  M conf/airframes/mm/fixed-wing/funjetmm.xml
  M conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
  M conf/airframes/twinjet_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/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.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
  M conf/autopilot/subsystems/shared/ahrs_ic.makefile
  M conf/boards/lisa_m_1.0.makefile
  M conf/control_panel.xml.example
  M conf/flight_plans/EMAV2008.xml
  M conf/flight_plans/IS.xml
  M conf/flight_plans/basic.xml
  R conf/flight_plans/basic_booz.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
  A conf/flight_plans/rotorcraft_basic.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
  M conf/modules/ins_arduimu_basic.xml
  M conf/modules/servo_switch.xml
  M conf/settings/settings_test.xml
  M conf/settings/tuning_ctl_new.xml
  A conf/settings/tuning_pers.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/LPC2148-ROM-bl.ld
  A sw/airborne/arch/lpc21/subsystems/settings_arch.c
  A sw/airborne/arch/lpc21/subsystems/settings_arch.h
  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
  A sw/airborne/arch/stm32/mcu_periph/i2c_arch.new.c
  M sw/airborne/arch/stm32/stm32f103rb_flash.ld
  M sw/airborne/arch/stm32/stm32f103re_flash.ld
  A sw/airborne/arch/stm32/subsystems/settings_arch.c
  A sw/airborne/arch/stm32/subsystems/settings_arch.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/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/main_ap.c
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/ADC.pde
  M sw/airborne/firmwares/non_ap/arduimu_Firmware_WithGps/arduimu_basic/DCM.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/rotorcraft/actuators/actuators_dummy.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_pwm_supervision.c
  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/math/pprz_algebra_float.h
  M sw/airborne/modules/ins/ins_arduimu_basic.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/navigation/spiral.c
  M sw/airborne/subsystems/settings.c
  M sw/airborne/subsystems/settings.h
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_algebra.c
  M sw/ground_segment/joystick/input2ivy.ml
  M sw/ground_segment/lpc21iap/lpc21iap.c
  A sw/ground_segment/misc/Makefile
  A sw/ground_segment/misc/davis2ivy.c
  A sw/ground_segment/misc/readme.txt
  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/tools/fp_proc.ml
  M sw/tools/gen_settings.ml

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

Conflicts:
        .gitignore


Commit: 629ed9d9ce5e872c189ec8dc7a79d0d36aad748c
    
https://github.com/paparazzi/paparazzi/commit/629ed9d9ce5e872c189ec8dc7a79d0d36aad748c
Author: Gautier Hattenberger <address@hidden>
Date:   2011-04-18 (Mon, 18 Apr 2011)

Changed paths:
  M conf/joystick/attack3_booz_nav.xml
  A conf/joystick/cockpit_sx.xml
  A conf/joystick/ikarus_usb.xml
  M sw/ground_segment/joystick/input2ivy.ml

Log Message:
-----------
improve input to ivy with variables


Commit: 5bb3d894c28b847a012452c96a5cd82534f83fd3
    
https://github.com/paparazzi/paparazzi/commit/5bb3d894c28b847a012452c96a5cd82534f83fd3
Author: Gautier Hattenberger <address@hidden>
Date:   2011-04-18 (Mon, 18 Apr 2011)

Changed paths:
  M conf/autopilot/subsystems/fixedwing/radio_control_datalink.makefile
  M conf/joystick/cockpit_sx.xml
  M conf/joystick/ikarus_usb.xml
  M conf/messages.xml
  M sw/airborne/firmwares/fixedwing/datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.c
  M sw/airborne/subsystems/radio_control/rc_datalink.h
  M sw/ground_segment/joystick/input2ivy.ml

Log Message:
-----------
rc_datalink working with RC_4CH message


Compare: https://github.com/paparazzi/paparazzi/compare/7ef265b...5bb3d89