[paparazzi-commits] [paparazzi/paparazzi] f0dcd7: small fix to avoid warning when runing replay sess...

[noreply]

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

  Commit: f0dcd7eceb52bb0defe5746799e9bdbd62fb9475
      
https://github.com/paparazzi/paparazzi/commit/f0dcd7eceb52bb0defe5746799e9bdbd62fb9475
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M sw/ground_segment/cockpit/live.ml
  M sw/ground_segment/tmtc/server.ml

  Log Message:
  -----------
  small fix to avoid warning when runing replay session


  Commit: 1702412f7db403171c6bc25d1f9d2f0724cf8e04
      
https://github.com/paparazzi/paparazzi/commit/1702412f7db403171c6bc25d1f9d2f0724cf8e04
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    M .gitignore
  M Makefile
  M Makefile.ac
  M conf/Makefile.jsbsim
  M conf/Makefile.lpc21
  M conf/Makefile.omap
  M conf/Makefile.pentium-m
  M conf/Makefile.stm32
  M conf/airframes/CDW/LisaFw.xml
  M conf/airframes/CDW/TinyFw.xml
  M conf/airframes/ENAC/fixed-wing/merlin.xml
  M conf/airframes/ENAC/fixed-wing/minimag1.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
  R conf/airframes/Poine/autoplato.xml
  R conf/airframes/Poine/booz2_a2.xml
  R conf/airframes/Poine/booz2_a3.xml
  R conf/airframes/Poine/booz2_a4.xml
  R conf/airframes/Poine/booz2_a5.xml
  R conf/airframes/Poine/fuckyou.xml
  M conf/airframes/Poine/funjet42.xml
  M conf/airframes/Poine/swift_1.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/MicrojetBR.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/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
  A conf/airframes/obsolete/autoplato.xml
  A conf/airframes/obsolete/booz2_a2.xml
  A conf/airframes/obsolete/booz2_a3.xml
  A conf/airframes/obsolete/booz2_a4.xml
  A conf/airframes/obsolete/booz2_a5.xml
  M conf/airframes/osam_xsens_twog.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/subsystems/fixedwing/ahrs_float_dcm.makefile
  A conf/autopilot/subsystems/fixedwing/ahrs_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
  M conf/autopilot/subsystems/fixedwing/attitude_infrared_i2c.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  A conf/autopilot/subsystems/fixedwing/settings_rc.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
  M conf/autopilot/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  M conf/conf.xml.example
  A conf/modules/gps_ubx_ucenter.xml
  M conf/modules/infrared_adc.xml
  M conf/modules/infrared_i2c.xml
  M conf/modules/servo_switch.xml
  A conf/settings/gps_ubx_ucenter.xml
  A conf/settings/tuning_ins_rc.xml
  M conf/telemetry/default.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  M conf/telemetry/xbee868.xml
  M conf/ubx.xml
  A githelper.sh
  M sw/airborne/ap_downlink.h
  M sw/airborne/arch/lpc21/lpcusb/Makefile
  M sw/airborne/arch/lpc21/mcu_periph/uart_arch.h
  A sw/airborne/arch/sim/jsbsim_ahrs.c
  M sw/airborne/arch/sim/jsbsim_hw.h
  M sw/airborne/arch/sim/jsbsim_ir.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu.c
  M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
  A sw/airborne/arch/sim/sim_ahrs.c
  R sw/airborne/arch/sim/sim_imu.c
  M sw/airborne/arch/sim/sim_ir.c
  M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_tacho.c
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
  M sw/airborne/modules/airborne_ant_track/airborne_ant_track.h
  A sw/airborne/modules/gps/gps_ubx_ucenter.c
  A sw/airborne/modules/gps/gps_ubx_ucenter.h
  R sw/airborne/modules/gps_i2c/runtime_configure.h
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/subsystems/ahrs.c
  M sw/airborne/subsystems/ahrs.h
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.c
  A sw/airborne/subsystems/ahrs/ahrs_infrared.h
  A sw/airborne/subsystems/ahrs/ahrs_sim.c
  A sw/airborne/subsystems/ahrs/ahrs_sim.h
  M sw/airborne/subsystems/gps/gps_ubx.c
  M sw/airborne/subsystems/gps/gps_ubx.h
  M sw/airborne/subsystems/sensors/infrared.h
  M sw/airborne/subsystems/sensors/infrared_adc.c
  M sw/airborne/test/ahrs/Makefile
  M sw/ground_segment/cockpit/Makefile
  M sw/ground_segment/joystick/Makefile
  M sw/ground_segment/tmtc/GSM/Makefile
  M sw/ground_segment/tmtc/Makefile
  M sw/ground_segment/tmtc/aircraft.ml
  M sw/ground_segment/tmtc/aircraft.mli
  M sw/ground_segment/tmtc/fw_server.ml
  A sw/ground_segment/tmtc/ivy_serial_bridge.c
  M sw/ground_segment/tmtc/server.ml
  M sw/ground_segment/tmtc/server_globals.ml
  R sw/ground_segment/visu3d/Makefile
  R sw/ground_segment/visu3d/TODO
  R sw/ground_segment/visu3d/mapGL.ml
  M sw/in_progress/button/Makefile
  M sw/in_progress/fdm/Makefile
  M sw/in_progress/ir_calibration/Makefile
  M sw/in_progress/motor_bench/Makefile
  M sw/lib/ocaml/Makefile
  M sw/lib/ocaml/ivy/Makefile
  M sw/logalizer/Makefile
  M sw/logalizer/sliding_plot.c
  M sw/simulator/flightModel.ml
  M sw/simulator/flightModel.mli
  M sw/simulator/hitl.ml
  M sw/simulator/old_booz/tests/Makefile
  M sw/simulator/sim.ml
  M sw/simulator/sim.mli
  M sw/simulator/sim_ac_flightgear.c
  M sw/simulator/sim_ac_fw.c
  M sw/simulator/sim_ac_jsbsim.c
  M sw/simulator/sitl.ml
  R sw/supervision/paparazzi.pl
  M sw/tools/gen_settings.ml

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


  Commit: f145da9437835eda78e7815f03e07859ef32171d
      
https://github.com/paparazzi/paparazzi/commit/f145da9437835eda78e7815f03e07859ef32171d
  Author: Gautier Hattenberger <address@hidden>
  Date:   2011-11-02 (Wed, 02 Nov 2011)

  Changed paths:
    A conf/modules/mcp355x.xml
  A sw/airborne/modules/adcs/mcp355x.h
  A sw/airborne/peripherals/mcp355x.c
  A sw/airborne/peripherals/mcp355x.h

  Log Message:
  -----------
  driver for mcp355x (22-bit spi adc)


Compare: https://github.com/paparazzi/paparazzi/compare/f1e30ba...f145da9