[paparazzi-commits] [paparazzi/paparazzi] c30b72: the telemetry settings are automatically generated...

[GitHub]

  Branch: refs/heads/telemetry_settings
  Home:   https://github.com/paparazzi/paparazzi
  Commit: c30b7248dc9342de9ff61d5218f5f5d5e1ecd578
      
https://github.com/paparazzi/paparazzi/commit/c30b7248dc9342de9ff61d5218f5f5d5e1ecd578
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M Makefile.ac
  M conf/settings/basic.xml
  M conf/settings/basic_infrared.xml
  M conf/settings/basic_ins.xml
  M conf/settings/flight_params.xml
  M conf/settings/lisa.xml
  M conf/settings/settings_UofAdelaide.xml
  M conf/settings/settings_booz2.xml
  M conf/settings/settings_booz2_jtm.xml
  M conf/settings/settings_test_passthrough.xml
  R conf/settings/tl.xml
  M conf/settings/tuning.xml
  M conf/settings/tuningJH.xml
  M conf/settings/tuning_infrared.xml
  M conf/settings/tuning_ins.xml
  M conf/settings/tuning_ins_dcm.xml
  M conf/settings/tuning_loiter.xml
  M conf/settings/tuning_pers.xml
  M conf/settings/tuning_tp_auto.xml
  M conf/telemetry/telemetry.dtd
  M conf/telemetry/telemetry_booz2.xml
  M sw/airborne/firmwares/fixedwing/ap_downlink.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/fbw_downlink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/rotorcraft/telemetry.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml
  M sw/tools/gen_tuning.ml

  Log Message:
  -----------
  the telemetry settings are automatically generated and included to the
settings list and the GCS (working with fixedwing and rotorcraft
firmwares)


  Commit: c5589915f307a7741596407b073183c9bd0a1694
      
https://github.com/paparazzi/paparazzi/commit/c5589915f307a7741596407b073183c9bd0a1694
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    M sw/tools/gen_periodic.ml

  Log Message:
  -----------
  replace avr_h by a more explicit name


  Commit: b4857aab35cf2a96f4c83a3d481b86bd5aad6fe5
      
https://github.com/paparazzi/paparazzi/commit/b4857aab35cf2a96f4c83a3d481b86bd5aad6fe5
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-01-25 (Wed, 25 Jan 2012)

  Changed paths:
    R conf/telemetry/booz_minimal.xml
  A conf/telemetry/default_rotorcraft.xml
  A conf/telemetry/dummy.xml
  A conf/telemetry/fixedwing_control_new.xml
  A conf/telemetry/fixedwing_minimal.xml
  R conf/telemetry/fw_h_ctl_a.xml
  R conf/telemetry/minimal.xml
  A conf/telemetry/rotorcraft_minimal.xml
  R conf/telemetry/telemetry_booz2.xml
  R conf/telemetry/telemetry_wt.xml
  R conf/telemetry/tl.xml
  A conf/telemetry/xbee868.xml
  R conf/telemetry/xbee868.xml

  Log Message:
  -----------
  renaming some telemetry files with more explicit names


  Commit: bb192c033a411f4c3b3b65c9a0feae728f4c122e
      
https://github.com/paparazzi/paparazzi/commit/bb192c033a411f4c3b3b65c9a0feae728f4c122e
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M Makefile.ac
  M conf/telemetry/telemetry.dtd
  M sw/airborne/csc/csc_ap_main.c
  M sw/airborne/csc/csc_main.c
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/csc/mercury_main.c
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/fbw_downlink.c
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/rotorcraft/telemetry.c
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/fms/fms_gs_com.c
  M sw/tools/gen_periodic.ml
  M sw/tools/gen_settings.ml

  Log Message:
  -----------
  rename periodic.h to periodic_telemetry.h; remove channel/device at code 
generation (unused)


  Commit: 23be3e7bcf9374c4df26177c02e11af47fd7c8d9
      
https://github.com/paparazzi/paparazzi/commit/23be3e7bcf9374c4df26177c02e11af47fd7c8d9
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M .gitignore
  M Doxyfile
  M conf/Makefile.sim
  M conf/Makefile.stm32
  M conf/airframes/ENAC/fixed-wing/soarzi.xml
  M conf/airframes/ENAC/fixed-wing/twinjet2.xml
  M conf/airframes/Poine/beth.xml
  M conf/airframes/Poine/bl_mc.xml
  M conf/airframes/Poine/easy_glider1.xml
  M conf/airframes/Poine/motor_bench.xml
  M conf/airframes/Poine/pt_ant.xml
  M conf/airframes/Poine/turntable.xml
  M conf/airframes/TU_Delft/Trip50A.xml
  M conf/airframes/demo.xml
  M conf/airframes/demo_module.xml
  M conf/airframes/flixr_discovery.xml
  M conf/airframes/fraser_lisa_m_rotorcraft.xml
  M conf/airframes/mm/extra/press_t.xml
  M conf/airframes/mm/fixed-wing/drops.xml
  M conf/airframes/mm/fixed-wing/funjeteth1.xml
  M conf/airframes/mm/fixed-wing/funjeteth2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi1.xml
  M conf/airframes/mm/fixed-wing/funjetfmi2.xml
  M conf/airframes/mm/fixed-wing/funjetfmi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi1.xml
  M conf/airframes/mm/fixed-wing/funjetgfi3.xml
  M conf/airframes/mm/fixed-wing/funjetgfi4.xml
  M conf/airframes/mm/fixed-wing/funjetgfi5.xml
  M conf/airframes/mm/fixed-wing/funjetgfi6.xml
  M conf/airframes/mm/fixed-wing/funjetgfi7.xml
  M conf/airframes/mm/fixed-wing/funjetgfi9.xml
  M conf/airframes/mm/fixed-wing/funjetmm2.xml
  M conf/airframes/mm/fixed-wing/miniwing.xml
  M conf/airframes/mm/fixed-wing/slowfast.xml
  M conf/airframes/mm/fixed-wing/slowfast2.xml
  M conf/airframes/mm/fixed-wing/twinstarmm.xml
  M conf/airframes/mm/hangar/black_one.xml
  M conf/airframes/mm/hangar/glass_one1.xml
  M conf/airframes/mm/hangar/glass_one2.xml
  M conf/airframes/mm/hangar/glass_one3.xml
  M conf/airframes/mm/hangar/lila.xml
  M conf/airframes/mm/hangar/mac06a.xml
  M conf/airframes/mm/hangar/red_one.xml
  M conf/airframes/obsolete/autoplato.xml
  R conf/airframes/obsolete/csc.xml
  R conf/airframes/obsolete/csc_ap.xml
  M conf/airframes/obsolete/dc_mc.xml
  M conf/airframes/obsolete/example.xml
  M conf/airframes/obsolete/nova.xml
  A conf/airframes/obsolete/test_i2c.xml
  M conf/airframes/obsolete/tl.xml
  M conf/airframes/obsolete/vor.xml
  R conf/airframes/test_i2c.xml
  M conf/airframes/wind_tunnel.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/logger.makefile
  M conf/autopilot/rotorcraft.makefile
  M conf/autopilot/setup.makefile
  R conf/autopilot/subsystems/csc_gps.makefile
  M conf/autopilot/subsystems/fixedwing/autopilot.makefile
  R conf/autopilot/subsystems/fixedwing/imu_analog.makefile
  M conf/autopilot/subsystems/rotorcraft/actuators_mkk.makefile
  M conf/autopilot/subsystems/rotorcraft/fdm_nps.makefile
  A conf/autopilot/subsystems/shared/imu_analog.makefile
  M conf/autopilot/subsystems/shared/imu_aspirin_common.makefile
  M conf/messages.xml
  M conf/modules/baro_board.xml
  M conf/modules/pwm_meas.xml
  R conf/settings/csc_ap.xml
  R conf/settings/mercury_csc.xml
  A conf/simulator/nps/nps_sensors_params_aspirin.h
  M conf/simulator/nps/nps_sensors_params_booz2_a1.h
  M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
  R conf/telemetry/csc.xml
  R conf/telemetry/csc_ap.xml
  M conf/telemetry/default_fixedwing_imu.xml
  M conf/telemetry/default_fixedwing_imu_9k6.xml
  R conf/telemetry/mercury_csc.xml
  R doc/mainpage.dox
  A doc/manual/mainpage.dox
  A doc/manual/style.dox
  M sw/airborne/arch/avr/mcu_periph/uart_arch.c
  M sw/airborne/arch/avr/ppm_hw.c
  M sw/airborne/arch/avr/servos_4017.c
  M sw/airborne/arch/avr/servos_4017.h
  M sw/airborne/arch/avr/sys_time_hw.h
  A sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
  A sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.c
  M sw/airborne/arch/lpc21/modules/core/booz_pwm_arch.h
  M sw/airborne/arch/lpc21/modules/core/trigger_ext_hw.c
  M sw/airborne/arch/lpc21/modules/sensors/trig_ext_hw.c
  M sw/airborne/arch/lpc21/servos_4015_MAT_hw.h
  M sw/airborne/arch/lpc21/servos_4015_hw.c
  M sw/airborne/arch/lpc21/servos_4015_hw.h
  M sw/airborne/arch/lpc21/servos_4015_hw_new.c
  M sw/airborne/arch/lpc21/servos_4017_hw.h
  R sw/airborne/arch/lpc21/servos_csc.c
  M sw/airborne/arch/lpc21/servos_csc.h
  M sw/airborne/arch/lpc21/servos_direct_hw.h
  M sw/airborne/arch/lpc21/servos_ppm_hw.h
  M sw/airborne/arch/lpc21/subsystems/radio_control/ppm_arch.h
  R sw/airborne/arch/lpc21/sys_time_hw.c
  R sw/airborne/arch/lpc21/sys_time_hw.h
  M sw/airborne/arch/lpc21/usb_tunnel.c
  M sw/airborne/arch/sim/led_hw.h
  M sw/airborne/arch/sim/mcu_arch.h
  M sw/airborne/arch/sim/mcu_periph/i2c_arch.h
  A sw/airborne/arch/sim/mcu_periph/sys_time_arch.c
  A sw/airborne/arch/sim/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/sim/servos_nil.h
  M sw/airborne/arch/sim/sim_ap.c
  M sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.c
  M sw/airborne/arch/sim/subsystems/imu/imu_aspirin_arch.h
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.h
  R sw/airborne/arch/sim/sys_time_hw.h
  A sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
  A sw/airborne/arch/stm32/mcu_periph/sys_time_arch.h
  M sw/airborne/arch/stm32/stm32_vector_table.c
  M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
  M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
  R sw/airborne/arch/stm32/sys_time_hw.c
  R sw/airborne/arch/stm32/sys_time_hw.h
  M sw/airborne/boards/booz/test_baro.c
  M sw/airborne/boards/booz_1.0.h
  M sw/airborne/boards/hb_1.1.h
  M sw/airborne/boards/lisa_l/baro_board.c
  M sw/airborne/boards/lisa_l/baro_board.h
  M sw/airborne/boards/lisa_l/test_baro.c
  M sw/airborne/boards/lisa_l_1.0.h
  M sw/airborne/boards/lisa_m/test_baro.c
  M sw/airborne/boards/lisa_m_1.0.h
  M sw/airborne/boards/navgo_1.0.h
  M sw/airborne/boards/tiny_0.99.h
  M sw/airborne/boards/tiny_1.1.h
  M sw/airborne/boards/tiny_2.0.h
  M sw/airborne/boards/tiny_2.1.h
  M sw/airborne/boards/tiny_sim.h
  M sw/airborne/boards/umarim/baro_board.c
  M sw/airborne/boards/umarim/baro_board.h
  M sw/airborne/boards/umarim/imu_umarim.h
  M sw/airborne/boards/umarim_1.0.h
  M sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
  M sw/airborne/booz/test/booz2_test_crista.c
  M sw/airborne/booz/test/booz2_test_gps.c
  M sw/airborne/booz/test/booz2_test_led.c
  M sw/airborne/booz/test/booz2_test_max1168.c
  M sw/airborne/booz/test/booz2_test_mc.c
  M sw/airborne/booz/test/booz2_test_micromag.c
  M sw/airborne/booz/test/booz2_test_modem.c
  M sw/airborne/booz/test/booz2_test_radio_control.c
  M sw/airborne/booz/test/booz2_test_rc.c
  M sw/airborne/booz/test/booz2_test_usb.c
  M sw/airborne/booz/test/booz2_tunnel.c
  M sw/airborne/booz/test/booz_test_imu.c
  M sw/airborne/booz/test/booz_test_telemetry.c
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.c
  R sw/airborne/csc/arm7/buss_twi_blmc_hw.h
  R sw/airborne/csc/arm7/props_csc.c
  M sw/airborne/csc/arm7/props_csc.h
  M sw/airborne/csc/csc_adc.c
  R sw/airborne/csc/csc_adc.h
  R sw/airborne/csc/csc_airspeed.c
  R sw/airborne/csc/csc_airspeed.h
  R sw/airborne/csc/csc_ap_link.c
  R sw/airborne/csc/csc_ap_link.h
  M sw/airborne/csc/csc_ap_main.c
  R sw/airborne/csc/csc_ap_main.h
  R sw/airborne/csc/csc_autopilot.c
  R sw/airborne/csc/csc_autopilot.h
  M sw/airborne/csc/csc_baro.c
  R sw/airborne/csc/csc_baro.h
  R sw/airborne/csc/csc_can.c
  R sw/airborne/csc/csc_can.h
  R sw/airborne/csc/csc_datalink.c
  M sw/airborne/csc/csc_main.c
  R sw/airborne/csc/csc_main.h
  R sw/airborne/csc/csc_me4_link.c
  R sw/airborne/csc/csc_me4_link.h
  R sw/airborne/csc/csc_msg_def.h
  M sw/airborne/csc/csc_protocol.c
  R sw/airborne/csc/csc_protocol.h
  R sw/airborne/csc/csc_rc_spektrum.c
  R sw/airborne/csc/csc_rc_spektrum.h
  M sw/airborne/csc/csc_servos.c
  R sw/airborne/csc/csc_servos.h
  R sw/airborne/csc/csc_telemetry.c
  R sw/airborne/csc/csc_telemetry.h
  R sw/airborne/csc/csc_throttle.c
  R sw/airborne/csc/csc_throttle.h
  R sw/airborne/csc/csc_vane.c
  R sw/airborne/csc/csc_vane.h
  R sw/airborne/csc/csc_xsens.c
  R sw/airborne/csc/csc_xsens.h
  R sw/airborne/csc/mercury_ap.c
  R sw/airborne/csc/mercury_ap.h
  M sw/airborne/csc/mercury_csc_main.c
  M sw/airborne/csc/mercury_main.c
  R sw/airborne/csc/mercury_supervision.h
  R sw/airborne/csc/mercury_xsens.c
  R sw/airborne/csc/mercury_xsens.h
  M sw/airborne/csc/ppm_bridge_main.c
  M sw/airborne/estimator.c
  M sw/airborne/estimator.h
  M sw/airborne/firmwares/beth/main_beth.c
  M sw/airborne/firmwares/beth/main_coders.c
  M sw/airborne/firmwares/beth/main_stm32.c
  M sw/airborne/firmwares/fixedwing/ap_downlink.h
  M sw/airborne/firmwares/fixedwing/autopilot.h
  M sw/airborne/firmwares/fixedwing/fbw_downlink.h
  M sw/airborne/firmwares/fixedwing/main.c
  M sw/airborne/firmwares/fixedwing/main_ap.c
  M sw/airborne/firmwares/fixedwing/main_ap.h
  M sw/airborne/firmwares/fixedwing/main_fbw.c
  M sw/airborne/firmwares/fixedwing/main_fbw.h
  M sw/airborne/firmwares/logger/main_logger.c
  M sw/airborne/firmwares/motor_bench/main_motor_bench.c
  M sw/airborne/firmwares/motor_bench/main_turntable.c
  M sw/airborne/firmwares/motor_bench/mb_modes.c
  M sw/airborne/firmwares/motor_bench/mb_servo.c
  M sw/airborne/firmwares/motor_bench/turntable_systime.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_asctec.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_mkk.c
  M sw/airborne/firmwares/rotorcraft/actuators/actuators_skiron.c
  M sw/airborne/firmwares/rotorcraft/main.c
  M sw/airborne/firmwares/rotorcraft/main.h
  M sw/airborne/firmwares/rotorcraft/telemetry.h
  M sw/airborne/firmwares/setup/setup_actuators.c
  M sw/airborne/firmwares/tutorial/main_demo2.c
  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
  M sw/airborne/firmwares/vor/lpc_vor_convertions.c
  M sw/airborne/firmwares/vor/lpc_vor_main.c
  M sw/airborne/firmwares/wind_tunnel/main.c
  M sw/airborne/firmwares/wind_tunnel/main_mb.c
  M sw/airborne/firmwares/wind_tunnel/wt_servo.c
  M sw/airborne/fms/lpc_test_spi.c
  M sw/airborne/led.h
  M sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
  M sw/airborne/lisa/lisa_stm_passthrough_main.c
  M sw/airborne/lisa/stm_test_spi_link.c
  M sw/airborne/lisa/test/hs_gyro.c
  M sw/airborne/lisa/test/lisa_test_actuators_mkk.c
  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_aspirin.c
  M sw/airborne/lisa/test/lisa_test_hmc5843.c
  M sw/airborne/lisa/test/lisa_test_itg3200.c
  M sw/airborne/lisa/test/lisa_test_max1168.c
  M sw/airborne/lisa/test/lisa_test_ms2100.c
  M sw/airborne/lisa/test/lisa_test_sc18is600.c
  M sw/airborne/lisa/test/lisa_tunnel.c
  M sw/airborne/lisa/test/test_board.c
  M sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
  M sw/airborne/lisa/test_adc.c
  M sw/airborne/lisa/test_csc_servo.c
  M sw/airborne/lisa/test_datalink.c
  M sw/airborne/lisa/test_float.c
  M sw/airborne/lisa/test_mc.c
  M sw/airborne/lisa/test_periodic.c
  M sw/airborne/lisa/test_servos.c
  M sw/airborne/lisa/test_spi_slave.c
  M sw/airborne/lisa/test_spi_slave2.c
  M sw/airborne/lisa/test_uart.c
  M sw/airborne/lisa/test_uart_lisam.c
  M sw/airborne/lisa/tunnel_hw.c
  M sw/airborne/math/pprz_trig_int.h
  M sw/airborne/mcu.c
  M sw/airborne/mcu.h
  M sw/airborne/mcu_periph/adc.h
  M sw/airborne/mcu_periph/spi.h
  A sw/airborne/mcu_periph/sys_time.c
  A sw/airborne/mcu_periph/sys_time.h
  M sw/airborne/mcu_periph/uart.h
  M sw/airborne/mcu_periph/usb_serial.h
  M sw/airborne/modules/core/pwm_meas.c
  M sw/airborne/modules/core/sys_mon.c
  M sw/airborne/modules/core/sys_mon.h
  M sw/airborne/modules/datalink/xtend_rssi.c
  M sw/airborne/modules/digital_cam/servo_cam_ctrl.h
  M sw/airborne/modules/ins/ins_xsens.c
  M sw/airborne/modules/meteo/dust_gp2y.c
  M sw/airborne/modules/meteo/humid_htm_b71.c
  M sw/airborne/modules/meteo/humid_pcap01.c
  M sw/airborne/modules/meteo/ir_mlx.c
  M sw/airborne/modules/meteo/windturbine.c
  M sw/airborne/modules/sensors/baro_bmp.c
  M sw/airborne/modules/sensors/baro_ms5611_i2c.c
  M sw/airborne/modules/sensors/baro_scp.c
  M sw/airborne/modules/sensors/baro_scp_i2c.c
  M sw/airborne/modules/sensors/trigger_ext.c
  M sw/airborne/rc_settings.c
  M sw/airborne/rc_settings.h
  M sw/airborne/sd_card/main.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.c
  M sw/airborne/subsystems/ahrs/ahrs_float_cmpl_rmat.h
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.c
  M sw/airborne/subsystems/ahrs/ahrs_int_cmpl.h
  M sw/airborne/subsystems/datalink/xbee.c
  M sw/airborne/subsystems/gps.h
  M sw/airborne/subsystems/gps/gps_mtk.c
  M sw/airborne/subsystems/imu.c
  M sw/airborne/subsystems/imu.h
  M sw/airborne/subsystems/imu/imu_aspirin.c
  M sw/airborne/subsystems/imu/imu_aspirin.h
  M sw/airborne/subsystems/radio_control/ppm.h
  R sw/airborne/sys_time.c
  R sw/airborne/sys_time.h
  M sw/airborne/test/ahrs/Makefile
  M sw/airborne/test/ahrs/ahrs_on_synth.c
  M sw/airborne/test/ahrs/ahrs_utils.py
  M sw/airborne/test/ahrs/compare_ahrs.py
  A sw/airborne/test/mcu_periph/test_sys_time.c
  M sw/airborne/test/nova_test_imu.c
  M sw/airborne/test/peripherals/test_ami601.c
  M sw/airborne/test/subsystems/test_ahrs.c
  M sw/airborne/test/subsystems/test_imu.c
  M sw/airborne/test/subsystems/test_radio_control.c
  M sw/airborne/test/subsystems/test_settings.c
  M sw/airborne/test/test_actuators.c
  M sw/airborne/test/test_adcs.c
  M sw/airborne/test/test_esc_asctecv1_simple.c
  M sw/airborne/test/test_esc_mkk_simple.c
  M sw/airborne/test/test_telemetry.c
  M sw/ground_segment/tmtc/rotorcraft_server.ml
  M sw/in_progress/log_parser/09_05_13__14_38_13.log
  M sw/in_progress/rctx/main_rctx.c
  R sw/lib/ocaml/ivy/Makefile
  R sw/lib/ocaml/ivy/README
  R sw/lib/ocaml/ivy/cglibivy.c
  R sw/lib/ocaml/ivy/civy.c
  R sw/lib/ocaml/ivy/civyloop.c
  R sw/lib/ocaml/ivy/ctkivy.c
  R sw/lib/ocaml/ivy/debian/changelog.3.10.2
  R sw/lib/ocaml/ivy/debian/changelog.3.11.2
  R sw/lib/ocaml/ivy/debian/compat
  R sw/lib/ocaml/ivy/debian/control
  R sw/lib/ocaml/ivy/debian/rules
  R sw/lib/ocaml/ivy/debian/shlibs.local
  R sw/lib/ocaml/ivy/examples/Makefile
  R sw/lib/ocaml/ivy/examples/glibivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyivyprobe.ml
  R sw/lib/ocaml/ivy/examples/ivyprobe.ml
  R sw/lib/ocaml/ivy/examples/tkivyprobe.ml
  R sw/lib/ocaml/ivy/glibIvy.ml
  R sw/lib/ocaml/ivy/glibIvy.mli
  R sw/lib/ocaml/ivy/ivy.ml
  R sw/lib/ocaml/ivy/ivy.mli
  R sw/lib/ocaml/ivy/ivyLoop.ml
  R sw/lib/ocaml/ivy/ivyLoop.mli
  R sw/lib/ocaml/ivy/tkIvy.ml
  R sw/lib/ocaml/ivy/tkIvy.mli
  M sw/simulator/flightModel.ml
  M sw/simulator/nps/nps_ivy.c
  M sw/simulator/nps/nps_sensor_accel.c
  M sw/simulator/nps/nps_sensor_accel.h
  M sw/simulator/nps/nps_sensor_gyro.c
  M sw/simulator/nps/nps_sensor_gyro.h
  M sw/simulator/nps/nps_sensor_mag.c
  M sw/simulator/nps/nps_sensor_mag.h
  M sw/simulator/old_booz/booz2_sim_main.c
  M sw/simulator/sitl.ml
  M sw/tools/gen_radio.ml

  Log Message:
  -----------
  Merge remote-tracking branch 'paparazzi/dev' into telemetry_settings

Conflicts:
        sw/airborne/firmwares/rotorcraft/telemetry.h


  Commit: 9b6703c78cb66bfa7ada37a04906f1d318eac0e4
      
https://github.com/paparazzi/paparazzi/commit/9b6703c78cb66bfa7ada37a04906f1d318eac0e4
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    R conf/telemetry/aerocomm.xml
  R conf/telemetry/default.xml
  A conf/telemetry/default_fixedwing.xml
  M conf/telemetry/dummy.xml
  R conf/telemetry/fixedwing_minimal.xml
  R conf/telemetry/hitl.xml
  A conf/telemetry/hitl_fixedwing.xml
  R conf/telemetry/nova_telemetry.xml
  R conf/telemetry/osam_imu.xml
  R conf/telemetry/telemetry_jtm.xml
  R conf/telemetry/telemetry_whirly.xml
  R conf/telemetry/ugv.xml

  Log Message:
  -----------
  more cleaning in telemetry files


  Commit: f48147efbb71a66fcc13c6042715acef53e90516
      
https://github.com/paparazzi/paparazzi/commit/f48147efbb71a66fcc13c6042715acef53e90516
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    R conf/telemetry/rotorcraft_minimal.xml

  Log Message:
  -----------
  one more file removed


  Commit: 9ea9257c919fa879c300f6acab6f8ce223561caa
      
https://github.com/paparazzi/paparazzi/commit/9ea9257c919fa879c300f6acab6f8ce223561caa
  Author: Gautier Hattenberger <address@hidden>
  Date:   2012-02-20 (Mon, 20 Feb 2012)

  Changed paths:
    M conf/conf.xml.example

  Log Message:
  -----------
  update telemetry files in default conf


Compare: https://github.com/paparazzi/paparazzi/compare/c30b724^...9ea9257