[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 1bff48: [telemetry] new period
|
From: |
GitHub |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 1bff48: [telemetry] new periodic telemetry system |
|
Date: |
Wed, 06 Nov 2013 04:42:22 -0800 |
Branch: refs/heads/master
Home: https://github.com/paparazzi/paparazzi
Commit: 1bff48ec2d96d0eaab65da46db30acb1e64b3855
https://github.com/paparazzi/paparazzi/commit/1bff48ec2d96d0eaab65da46db30acb1e64b3855
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/telemetry/default_fixedwing.xml
M conf/telemetry/default_fixedwing_imu.xml
M conf/telemetry/default_fixedwing_imu_9k6.xml
M sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/firmwares/fixedwing/datalink.c
M sw/airborne/firmwares/fixedwing/fbw_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
M sw/airborne/link_mcu_spi.c
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/cam_control/cam.h
M sw/airborne/modules/sensors/baro_MS5534A.c
M sw/airborne/subsystems/ahrs/ahrs_infrared.c
A sw/airborne/subsystems/datalink/telemetry.c
A sw/airborne/subsystems/datalink/telemetry_common.h
M sw/airborne/subsystems/gps.c
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/nav.c
M sw/airborne/subsystems/nav.h
M sw/airborne/subsystems/radio_control/ppm.c
M sw/include/std.h
M sw/tools/gen_periodic.ml
Log Message:
-----------
[telemetry] new periodic telemetry system
- only FW currently, rotorcraft coming soon
- compared to before:
- no macros (easier to debug)
- the default channel/device cannot be set for all the messages at the
same time (it will be possible when we finally replace messages
macros and define proper C struct for that)
- the register function only register for a single process (not
possible to reuse the function for an other process unless you
explicitely register for it)
Commit: 8377d601845c7bbc54229120b47963678fe743bc
https://github.com/paparazzi/paparazzi/commit/8377d601845c7bbc54229120b47963678fe743bc
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
M sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/uart.c
M sw/airborne/modules/cam_control/cam_track.c
M sw/airborne/modules/cam_control/rotorcraft_cam.c
M sw/airborne/subsystems/ahrs/ahrs_aligner.c
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/datalink/downlink.h
M sw/airborne/subsystems/gps.c
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/ins/hf_float.c
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/vf_extended_float.c
M sw/airborne/subsystems/ins/vf_float.c
Log Message:
-----------
[telemetry] adapt rotorcraft to new telemetry system
Commit: 813660036a16c7853f4de4c1a9b10c0d96079fff
https://github.com/paparazzi/paparazzi/commit/813660036a16c7853f4de4c1a9b10c0d96079fff
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
M sw/airborne/subsystems/datalink/downlink.h
Log Message:
-----------
increase first start interrupt and default device in downlink.h
Commit: 6ec20fd83463824e7f6844cf1a42cd4361fd937a
https://github.com/paparazzi/paparazzi/commit/6ec20fd83463824e7f6844cf1a42cd4361fd937a
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-14 (Fri, 14 Jun 2013)
Changed paths:
M sw/airborne/subsystems/nav.c
M sw/airborne/subsystems/nav.h
Log Message:
-----------
[nav] change GRAVITY to NAV_GRAVITY to avoid collision
Commit: 116faaeda68c3d722524b6adaebf23549755ea9f
https://github.com/paparazzi/paparazzi/commit/116faaeda68c3d722524b6adaebf23549755ea9f
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-16 (Sun, 16 Jun 2013)
Changed paths:
M conf/firmwares/setup.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
M sw/airborne/link_mcu_spi.c
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/uart.c
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/cam_control/cam_track.c
M sw/airborne/modules/cam_control/rotorcraft_cam.c
M sw/airborne/subsystems/ahrs/ahrs_aligner.c
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
M sw/airborne/subsystems/ahrs/ahrs_infrared.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/gps.c
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/ins/hf_float.c
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/vf_extended_float.c
M sw/airborne/subsystems/ins/vf_float.c
M sw/airborne/subsystems/nav.c
M sw/airborne/subsystems/radio_control/ppm.c
Log Message:
-----------
[telemetry] protect telemetry code with #if DOWNLINK
- also get rid of AP_DOWNLINK and FBW_DOWNLINK
- still needs to make it work again (for the only remaining classix in
the world...)
Commit: 09680b07e97a749560548ee276d0e44fb198c620
https://github.com/paparazzi/paparazzi/commit/09680b07e97a749560548ee276d0e44fb198c620
Author: Gautier Hattenberger <address@hidden>
Date: 2013-06-19 (Wed, 19 Jun 2013)
Changed paths:
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
M sw/airborne/arch/sim/sim_ap.c
R sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/fixedwing/datalink.c
R sw/airborne/firmwares/fixedwing/fbw_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
A sw/airborne/firmwares/rotorcraft/rotorcraft_telemetry.c
R sw/airborne/firmwares/rotorcraft/telemetry.c
R sw/airborne/firmwares/rotorcraft/telemetry.h
A sw/airborne/subsystems/datalink/telemetry.h
Log Message:
-----------
[telemetry] fix some include and remove unnecessary files
Commit: 0d25d2d8e10881c9c459f3344beb2cff686dd9d4
https://github.com/paparazzi/paparazzi/commit/0d25d2d8e10881c9c459f3344beb2cff686dd9d4
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M sw/airborne/boards/apogee/imu_apogee.c
M sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
M sw/airborne/boards/lisa_m/baro_ms5611_spi.c
M sw/airborne/boards/navgo/imu_navgo.c
M sw/airborne/boards/umarim/imu_umarim.c
M sw/airborne/firmwares/beth/rcv_telemetry.c
M sw/airborne/firmwares/setup/setup_actuators.c
M sw/airborne/modules/MPPT/MPPT.c
M sw/airborne/modules/MPPT/sim_MPPT.c
M sw/airborne/modules/adcs/adc_generic.c
M sw/airborne/modules/benchmark/flight_benchmark.c
M sw/airborne/modules/cartography/cartography.c
M sw/airborne/modules/config/config_mkk_v2.c
M sw/airborne/modules/core/sys_mon.c
M sw/airborne/modules/datalink/xtend_rssi.c
M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
M sw/airborne/modules/digital_cam/dc.c
M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
M sw/airborne/modules/enose/enose.c
M sw/airborne/modules/gps/gps_ubx_ucenter.c
M sw/airborne/modules/gsm/gsm.c
M sw/airborne/modules/ins/ahrs_chimu_spi.c
M sw/airborne/modules/ins/ahrs_chimu_uart.c
M sw/airborne/modules/ins/alt_filter.c
M sw/airborne/modules/ins/ins_arduimu.c
M sw/airborne/modules/ins/ins_arduimu_basic.c
M sw/airborne/modules/ins/ins_vn100.c
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens700.c
M sw/airborne/modules/meteo/charge_sens.c
M sw/airborne/modules/meteo/dust_gp2y.c
M sw/airborne/modules/meteo/geiger_counter.c
M sw/airborne/modules/meteo/humid_dpicco.c
M sw/airborne/modules/meteo/humid_hih.c
M sw/airborne/modules/meteo/humid_htm_b71.c
M sw/airborne/modules/meteo/humid_pcap01.c
M sw/airborne/modules/meteo/humid_sht.c
M sw/airborne/modules/meteo/humid_sht_i2c.c
M sw/airborne/modules/meteo/ir_mlx.c
M sw/airborne/modules/meteo/light_solar.c
M sw/airborne/modules/meteo/light_temt.c
M sw/airborne/modules/meteo/temp_lm75.c
M sw/airborne/modules/meteo/temp_tcouple_adc.c
M sw/airborne/modules/meteo/temp_temod.c
M sw/airborne/modules/meteo/temp_tmp102.c
M sw/airborne/modules/meteo/windturbine.c
M sw/airborne/modules/multi/formation.c
M sw/airborne/modules/multi/potential.c
M sw/airborne/modules/multi/tcas.c
M sw/airborne/modules/nav/nav_catapult.c
M sw/airborne/modules/openlog/openlog.c
M sw/airborne/modules/sensors/AOA_adc.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/airspeed_otf.c
M sw/airborne/modules/sensors/alt_srf08.c
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_bmp.c
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/baro_hca.c
M sw/airborne/modules/sensors/baro_mpl3115.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/imu_aspirin2.c
M sw/airborne/modules/sensors/mag_hmc5843.c
M sw/airborne/modules/sensors/mag_hmc58xx.c
M sw/airborne/modules/sensors/mag_micromag_fw.c
M sw/airborne/modules/sonar/sonar_adc.c
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
Log Message:
-----------
[telemetry] remove unnecessary DOWNLINK_DEVICE define
Commit: c7f1299c98ba411fd12c7cdc52834d646889b60c
https://github.com/paparazzi/paparazzi/commit/c7f1299c98ba411fd12c7cdc52834d646889b60c
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
Log Message:
-----------
[telemetry] support for fbw process (only transparent mode)
Commit: 427fe0c45b0b168e38c8aeaff84c209591574e68
https://github.com/paparazzi/paparazzi/commit/427fe0c45b0b168e38c8aeaff84c209591574e68
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M sw/airborne/arch/sim/jsbsim_hw.h
M sw/airborne/modules/enose/anemotaxis.c
M sw/airborne/modules/enose/chemotaxis.c
M sw/airborne/modules/max3100/max3100_hw.c
M sw/airborne/modules/nav/nav_catapult.c
M sw/airborne/modules/sensors/baro_MS5534A.c
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/navigation/discsurvey.c
Log Message:
-----------
[telemetry] replace ap_downlink. by new downlink header
Commit: 2b3a1da82e60ff081579e0c16d7b90052b876576
https://github.com/paparazzi/paparazzi/commit/2b3a1da82e60ff081579e0c16d7b90052b876576
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-10 (Wed, 10 Jul 2013)
Changed paths:
M CHANGELOG.md
M conf/airframes/ENAC/quadrotor/blender.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/ardrone2_sdk.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
A conf/airframes/examples/quadrotor_mlkf.xml
M conf/control_panel.xml.example
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
A conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_new.makefile
A conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
A conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
M conf/joystick/ms_sidewinder.xml
A conf/joystick/xbox_gamepad.xml
M conf/modules/airspeed_amsys.xml
A conf/settings/control/stabilization_att_float_quat.xml
A conf/system/preferences.d/paparazzi-uav-ppa
M paparazzi_version
M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_arch.c
M sw/airborne/arch/stm32/mcu_periph/can_arch.c
M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.h
M sw/airborne/arch/stm32/subsystems/settings_arch.c
M sw/airborne/boards/ardrone/at_com.h
M sw/airborne/boards/ardrone2_sdk.h
M sw/airborne/boards/krooz_sd.h
M sw/airborne/boards/lisa_l_1.0.h
M sw/airborne/firmwares/beth/overo_sfb_controller.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/modules/ins/ins_xsens700.c
M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
M sw/airborne/modules/meteo/humid_pcap01.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_otf.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_ets.h
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/peripherals/mpu60x0.c
M sw/airborne/peripherals/mpu60x0.h
M sw/airborne/peripherals/mpu60x0_i2c.c
M sw/airborne/peripherals/mpu60x0_i2c.h
M sw/airborne/peripherals/mpu60x0_regs.h
M sw/airborne/peripherals/mpu60x0_spi.c
M sw/airborne/peripherals/mpu60x0_spi.h
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/electrical.c
A sw/airborne/subsystems/gps/gps_ardrone2.c
A sw/airborne/subsystems/gps/gps_ardrone2.h
R sw/airborne/subsystems/imu/imu_aspirin_2.c
R sw/airborne/subsystems/imu/imu_aspirin_2.h
A sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
A sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
A sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
A sw/airborne/subsystems/imu/imu_mpu60x0_defaults.h
M sw/airborne/subsystems/imu/imu_um6.c
M sw/airborne/subsystems/ins/ins_ardrone2.c
M sw/airborne/subsystems/navigation/traffic_info.c
M sw/ext/libopencm3
M sw/ext/luftboot
M sw/ground_segment/joystick/input2ivy.ml
M sw/ground_segment/joystick/ml_sdl_stick.c
M sw/ground_segment/joystick/sdl_stick.c
M sw/ground_segment/joystick/sdl_stick.h
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_ivy.c
M sw/tools/dfu/stm32_mem.py
Log Message:
-----------
Merge remote-tracking branch 'paparazzi/master' into telemetry
Conflicts:
sw/airborne/firmwares/rotorcraft/autopilot.c
Commit: 871588eacc8083a487226637a281743cf4f76233
https://github.com/paparazzi/paparazzi/commit/871588eacc8083a487226637a281743cf4f76233
Author: Felix Ruess <address@hidden>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M conf/airframes/ENAC/fixed-wing/apogee.xml
M conf/airframes/examples/MentorEnergy.xml
M conf/airframes/examples/Twinstar_energyadaptive.xml
A conf/airframes/examples/krooz_sd/fixedwing/krooz_sd_fw.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
M conf/airframes/flixr_discovery.xml
M conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
M conf/firmwares/rotorcraft.makefile
R conf/firmwares/subsystems/shared/imu_aspirin_v2.1_old.makefile
A conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
M conf/modules/airspeed_ets.xml
M conf/modules/baro_amsys.xml
M conf/modules/baro_ets.xml
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
A sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.h
M sw/airborne/boards/apogee_0.99.h
M sw/airborne/boards/ardrone/at_com.h
A sw/airborne/boards/krooz/baro_board.c
A sw/airborne/boards/krooz/baro_board.h
A sw/airborne/boards/krooz/imu_krooz.c
A sw/airborne/boards/krooz/imu_krooz.h
M sw/airborne/boards/krooz_sd.h
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/modules/digital_cam/led_cam_ctrl.c
M sw/airborne/modules/digital_cam/led_cam_ctrl.h
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.h
M sw/airborne/subsystems/actuators/motor_mixing.c
M sw/airborne/subsystems/gps/gps_ardrone2.c
M sw/airborne/subsystems/gps/gps_ardrone2.h
R sw/airborne/subsystems/imu/imu_aspirin2.c
R sw/airborne/subsystems/imu/imu_aspirin2.h
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_alt_float.h
A sw/extras/chdk/pictuav.lua
Log Message:
-----------
Merge branch 'master' into telemetry
to resolve conflicts and test again before merging back to master
* master:
[extras] Add CHDK script to work with digital_cam module
[modules] digital_cam: add DC_POWER_OFF_LED
[imu] remove old aspirin2 driver
[modules] ets baro/airspeed: cleanup and default delay of 0.2s
[conf] add krooz_sd fixedwing example, thx Sergei
[conf] update krooz_sd examples, thx Sergei
[boards] update krooz_sd, thx Sergei
[stm32][pwm] add PWM_SERVO_9
[modules] baro_amsys: usable for ins_alt_float with USE_BARO_AMSYS
[rotorcraft] motor_mixing: only lower throttle when hitting both min/max
saturations
[ardrone2] Parrot GPS show sattelite information.
Added check if autopilot_motors_on do determine if you want to switch to
AP_MODE_FAILSAFE
[spi] update apogee and krooz board files for spi
[spi] spi for stm32f4
[rotorcraft] fix MODE_STARTUP
[krooz] add imu driver for KroozSD board from Sergei
[imu][aspirin_2_spi] clear naming for mag axes assignment
[modules] airspeed ets start delay
[modules] baro ets start delay
Conflicts:
sw/airborne/firmwares/rotorcraft/autopilot.c
sw/airborne/modules/sensors/baro_ets.c
Commit: 315c7a24e4124b8724bdcfa94025535c885ca362
https://github.com/paparazzi/paparazzi/commit/315c7a24e4124b8724bdcfa94025535c885ca362
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
M sw/airborne/subsystems/datalink/telemetry.c
M sw/airborne/subsystems/datalink/telemetry.h
M sw/airborne/subsystems/datalink/telemetry_common.h
Log Message:
-----------
[telemetry] add documentation to telemetry system
Commit: 2b0efb7f94d5cd703201f9c22bd1e4e0f25f52c3
https://github.com/paparazzi/paparazzi/commit/2b0efb7f94d5cd703201f9c22bd1e4e0f25f52c3
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M conf/airframes/ENAC/fixed-wing/apogee.xml
M conf/airframes/ENAC/fixed-wing/eternity1.xml
M conf/airframes/ENAC/fixed-wing/firestorm.xml
M conf/airframes/ENAC/fixed-wing/funjet2.xml
M conf/airframes/ENAC/fixed-wing/mythe.xml
M conf/airframes/ENAC/fixed-wing/weasel.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/ENAC/quadrotor/hen1.xml
A conf/boards/apogee_1.0.makefile
M conf/conf.xml.example
M conf/firmwares/subsystems/shared/imu_aspirin_v2.1.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
A conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
A conf/firmwares/subsystems/shared/radio_control_sbus.makefile
M conf/maps.xml.example
A conf/radios/T10CG_SBUS.xml
M data/maps/Makefile
A data/pictures/Penguin.gif
M sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
A sw/airborne/boards/apogee_1.0.h
M sw/airborne/boards/umarim/imu_umarim.c
M sw/airborne/firmwares/fixedwing/datalink.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/led.h
M sw/airborne/mcu_periph/uart.h
R sw/airborne/sd_card/main.c
R sw/airborne/sd_card/sd_card.c
R sw/airborne/sd_card/sd_card.h
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
A sw/airborne/subsystems/radio_control/sbus.c
A sw/airborne/subsystems/radio_control/sbus.h
A sw/tools/process_exif/README
A sw/tools/process_exif/process_exif.py
Log Message:
-----------
Merge remote-tracking branch 'paparazzi/master' into telemetry
Conflicts:
sw/airborne/firmwares/fixedwing/fbw_downlink.h
Commit: c6cf898b583f88017bddbb57ea1bf6cfd84ca3b5
https://github.com/paparazzi/paparazzi/commit/c6cf898b583f88017bddbb57ea1bf6cfd84ca3b5
Author: Gautier Hattenberger <address@hidden>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M sw/airborne/subsystems/radio_control/sbus.c
Log Message:
-----------
[sbus] use new telemetry system for sbus
Commit: e429db1dcf461052d2c3afb531e90f707f925804
https://github.com/paparazzi/paparazzi/commit/e429db1dcf461052d2c3afb531e90f707f925804
Author: Felix Ruess <address@hidden>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M sw/airborne/boards/krooz/imu_krooz.c
Log Message:
-----------
[telemetry] removed now unnecessary DOWNLINK_DEVICE define
Commit: 52e86ec5dcc5e318125638d3bb57d82080c6e7b0
https://github.com/paparazzi/paparazzi/commit/52e86ec5dcc5e318125638d3bb57d82080c6e7b0
Author: Felix Ruess <address@hidden>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/setup.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M sw/airborne/firmwares/rotorcraft/main.c
Log Message:
-----------
[telemetry] fix compilaton of some jsbsim/nps/test targets
Commit: 3e9231548846cb1b4d9fc8ab07e54221b5959f57
https://github.com/paparazzi/paparazzi/commit/3e9231548846cb1b4d9fc8ab07e54221b5959f57
Author: Gautier Hattenberger <address@hidden>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M .gitignore
M Makefile
M Makefile.ac
M README.md
M conf/Makefile.omap
A conf/airframes/CDW/asctec_cdw.xml
A conf/airframes/CDW/conf.xml
A conf/airframes/CDW/tricopter_cdw.xml
A conf/airframes/ENAC/fixed-wing/quark1.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/NoVa_L.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/182_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/184_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/186_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/188_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/189_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/190_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/191_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/192_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/193_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/194_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/195_calib.xml
A conf/airframes/TUDelft/IMAV2013/ARDrone/196_calib.xml
A conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
A conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/conf.xml
A conf/airframes/TUDelft/IMAV2013/mavrick_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
A conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
A conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/ardrone2_sdk.xml
M conf/airframes/booz2_flixr.xml
M conf/airframes/booz2_ppzuav.xml
A conf/airframes/esden/calib/ls01-default.xml
M conf/airframes/esden/cocto_lm2a2.xml
M conf/airframes/esden/gain_scheduling_example.xml
M conf/airframes/esden/hexy_ll11a2pwm.xml
M conf/airframes/esden/hexy_lm2a2pwm.xml
M conf/airframes/esden/lisa2_hex.xml
M conf/airframes/esden/qs_asp22.xml
M conf/airframes/esden/quady_ll11a2pwm.xml
M conf/airframes/esden/quady_lm1a1pwm.xml
M conf/airframes/esden/quady_lm2a2pwm.xml
M conf/airframes/esden/quady_lm2a2pwmppm.xml
A conf/airframes/esden/quady_ls01pwm.xml
M conf/airframes/examples/MentorEnergy.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/h_hex.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
A conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
A conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
A conf/airframes/examples/stm32f4_discovery_test.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
M conf/airframes/obsolete/ENAC/g1_vision.xml
M conf/airframes/obsolete/ENAC/mkk1.xml
M conf/airframes/obsolete/ENAC/nova1.xml
M conf/airframes/obsolete/Poine/booz2_a1.xml
M conf/airframes/obsolete/Poine/booz2_a7.xml
M conf/airframes/obsolete/Poine/h_hex.xml
M conf/airframes/obsolete/Poine/test_libeknav.xml
M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
M conf/airframes/obsolete/booz2_a1p.xml
M conf/airframes/obsolete/booz2_s1.xml
M conf/airframes/obsolete/example_heli_lisam.xml
M conf/airframes/obsolete/mm/rotor/qmk1.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
M conf/boards/ardrone2_raw.makefile
M conf/boards/ardrone2_sdk.makefile
A conf/boards/lisa_s_0.1.makefile
A conf/boards/px4fmu_1.7.makefile
A conf/boards/stm32f4_discovery.makefile
R conf/conf.xml.example
R conf/conf.xml.tri
A conf/conf_example.xml
A conf/conf_tests.xml
A conf/conf_tri.xml
R conf/control_panel.xml.example
A conf/control_panel_example.xml
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/rotorcraft.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_quat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_cmpl_rmat.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_float_dcm.makefile
A conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_quat.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
A conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
M conf/firmwares/subsystems/fixedwing/gps_mediatek_diy.makefile
M conf/firmwares/subsystems/fixedwing/gps_nmea.makefile
M conf/firmwares/subsystems/fixedwing/gps_skytraq.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox.makefile
M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
M conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile
M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
R conf/firmwares/subsystems/fixedwing/joystick.makefile
M conf/firmwares/subsystems/fixedwing/spi_slave_hs.makefile
A conf/firmwares/subsystems/fixedwing/telemetry_superbitrf.makefile
M conf/firmwares/subsystems/lisa_passthrough/booz_stabilization_int.makefile
M conf/firmwares/subsystems/lisa_passthrough/radio_control_spektrum.makefile
R conf/firmwares/subsystems/rotorcraft/ahrs_extern_quat.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_quat.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_float_cmpl_rmat.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_float_mlkf.makefile
A conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
R conf/firmwares/subsystems/rotorcraft/ahrs_lkf.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/gps_ardrone2.makefile
M conf/firmwares/subsystems/rotorcraft/gps_sirf.makefile
M conf/firmwares/subsystems/rotorcraft/gps_skytraq.makefile
M conf/firmwares/subsystems/rotorcraft/gps_ublox.makefile
M conf/firmwares/subsystems/rotorcraft/ins.makefile
M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_euler.makefile
A conf/firmwares/subsystems/rotorcraft/telemetry_superbitrf.makefile
M conf/firmwares/subsystems/shared/actuators_asctec.makefile
M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
M conf/firmwares/subsystems/shared/actuators_mkk.makefile
M conf/firmwares/subsystems/shared/actuators_mkk_v2.makefile
M conf/firmwares/subsystems/shared/actuators_skiron.makefile
R conf/firmwares/subsystems/shared/ahrs_gx3.makefile
M conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_i2c_common.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2.2.makefile
M conf/firmwares/subsystems/shared/imu_aspirin_v2_common.makefile
M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
A conf/firmwares/subsystems/shared/imu_gl1.makefile
M conf/firmwares/subsystems/shared/imu_krooz_sd.makefile
A conf/firmwares/subsystems/shared/imu_lisa_s_v0.1.makefile
M conf/firmwares/subsystems/shared/imu_nps.makefile
A conf/firmwares/subsystems/shared/imu_px4fmu_v1.7.makefile
M conf/firmwares/subsystems/shared/radio_control_datalink.makefile
M conf/firmwares/subsystems/shared/radio_control_ppm.makefile
M conf/firmwares/subsystems/shared/radio_control_sbus.makefile
M conf/firmwares/subsystems/shared/radio_control_spektrum.makefile
A conf/firmwares/subsystems/shared/radio_control_superbitrf_rc.makefile
M conf/flight_plans/rotorcraft_basic.xml
A conf/flight_plans/rotorcraft_basic_superbitrf.xml
M conf/flight_plans/versatile.xml
M conf/flight_plans/versatile_airspeed.xml
A conf/flight_plans/zamboni_survey_test.xml
R conf/maps.xml.example
A conf/maps_example.xml
M conf/messages.xml
M conf/modules/AOA_adc.xml
M conf/modules/baro_bmp.xml
M conf/modules/baro_ms5611_i2c.xml
A conf/modules/baro_ms5611_spi.xml
A conf/modules/flight_time.xml
A conf/modules/gumstix_qr_code_spi_link.xml
M conf/modules/light.xml
A conf/modules/osd_max7456.xml
M conf/modules/sys_mon.xml
A conf/modules/zamboni_survey.xml
M conf/settings/control/rotorcraft_guidance.xml
R conf/settings/estimation/booz2_ahrs_lkf.xml
A conf/settings/modules/flight_time.xml
M conf/settings/nps.xml
A conf/simulator/jsbsim/aircraft/Engines/18x8.xml
A conf/simulator/jsbsim/aircraft/Engines/Zenoah_G-26A.xml
A conf/simulator/jsbsim/aircraft/LisaAspirin2.xml
M conf/system/udev/rules/50-paparazzi.rules
M conf/telemetry/default_rotorcraft.xml
R conf/tests_conf.xml
M data/maps/Makefile
A make-release-tarball.sh
M paparazzi_version
A select_conf.py
M sw/airborne/arch/lpc21/mcu_periph/gpio_arch.h
M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_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/actuators/servos_ppm_hw.h
M sw/airborne/arch/omap/led_hw.h
A sw/airborne/arch/omap/mcu_periph/gpio_arch.h
M sw/airborne/arch/omap/mcu_periph/sys_time_arch.c
M sw/airborne/arch/omap/mcu_periph/uart_arch.c
M sw/airborne/arch/omap/mcu_periph/uart_arch.h
A sw/airborne/arch/omap/serial_port.c
A sw/airborne/arch/omap/serial_port.h
R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.c
R sw/airborne/arch/omap/subsystems/electrical/electrical_arch.h
A sw/airborne/arch/stm32/lisa-s.ld
M sw/airborne/arch/stm32/mcu_periph/gpio_arch.h
M sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.h
M sw/airborne/arch/stm32/subsystems/actuators/actuators_pwm_arch.c
M sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
M sw/airborne/boards/apogee_1.0.h
M sw/airborne/boards/ardrone/actuators_ardrone2_raw.c
M sw/airborne/boards/ardrone/actuators_ardrone2_raw.h
M sw/airborne/boards/ardrone/at_com.c
M sw/airborne/boards/ardrone/at_com.h
M sw/airborne/boards/ardrone/baro_board.c
M sw/airborne/boards/ardrone/baro_board.h
A sw/airborne/boards/ardrone/electrical_raw.c
A sw/airborne/boards/ardrone/electrical_raw.h
M sw/airborne/boards/ardrone/gpio_ardrone.c
R sw/airborne/boards/ardrone/gpio_ardrone.h
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/boards/ardrone/navdata.h
R sw/airborne/boards/krooz/baro_board.c
M sw/airborne/boards/krooz/baro_board.h
M sw/airborne/boards/krooz/imu_krooz.c
M sw/airborne/boards/krooz/imu_krooz.h
M sw/airborne/boards/krooz_sd.h
M sw/airborne/boards/lia/baro_board.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
R sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
R sw/airborne/boards/lisa_m/baro_ms5611_spi.c
A sw/airborne/boards/lisa_s/baro_board.h
A sw/airborne/boards/lisa_s_0.1.h
A sw/airborne/boards/px4fmu/baro_board.h
A sw/airborne/boards/px4fmu_1.7.h
A sw/airborne/boards/stm32f4_discovery.h
M sw/airborne/firmwares/beth/overo_test_uart.c
M sw/airborne/firmwares/beth/uart_hw.c
M sw/airborne/firmwares/fixedwing/guidance/energy_ctrl.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/autopilot.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.c
A sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adapt.h
R sw/airborne/firmwares/rotorcraft/guidance/guidance_v_adpt.h
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
M sw/airborne/firmwares/rotorcraft/navigation.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_passthrough.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
A
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
R
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
R sw/airborne/fms/fms_serial_port.c
R sw/airborne/fms/fms_serial_port.h
M sw/airborne/lisa/test/lisa_test_hmc5843.c
M sw/airborne/lisa/test/lisa_test_itg3200.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_baro_i2c.c
M sw/airborne/lisa/tunnel_hw.c
M sw/airborne/math/pprz_algebra.h
M sw/airborne/math/pprz_algebra_double.h
M sw/airborne/math/pprz_algebra_float.h
M sw/airborne/math/pprz_algebra_int.h
M sw/airborne/math/pprz_geodetic_double.h
M sw/airborne/math/pprz_geodetic_float.h
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/math/pprz_geodetic_int.h
M sw/airborne/math/pprz_simple_matrix.h
M sw/airborne/mcu.c
M sw/airborne/mcu_periph/gpio.h
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/i2c.h
M sw/airborne/mcu_periph/spi.h
M sw/airborne/mcu_periph/uart.h
M sw/airborne/modules/bat_checker/bat_checker.c
M sw/airborne/modules/bat_checker/bat_checker.h
M sw/airborne/modules/core/sys_mon.c
M sw/airborne/modules/core/sys_mon.h
M sw/airborne/modules/geo_mag/geo_mag.c
A sw/airborne/modules/gumstix_interface/qr_code_spi_link.c
A sw/airborne/modules/gumstix_interface/qr_code_spi_link.h
M sw/airborne/modules/ins/imu_chimu.c
A sw/airborne/modules/max7456/max7456.c
A sw/airborne/modules/max7456/max7456.h
A sw/airborne/modules/max7456/max7456_regs.h
A sw/airborne/modules/nav/zamboni_survey.c
A sw/airborne/modules/nav/zamboni_survey.h
R sw/airborne/modules/sensors/AOA_adc.c
R sw/airborne/modules/sensors/AOA_adc.h
M sw/airborne/modules/sensors/airspeed_adc.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
A sw/airborne/modules/sensors/aoa_adc.c
A sw/airborne/modules/sensors/aoa_adc.h
M sw/airborne/modules/sensors/baro_MS5534A.h
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_bmp.c
M sw/airborne/modules/sensors/baro_bmp.h
M sw/airborne/modules/sensors/baro_board_module.h
M sw/airborne/modules/sensors/baro_ets.h
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.h
A sw/airborne/modules/sensors/baro_ms5611_spi.c
A sw/airborne/modules/sensors/baro_ms5611_spi.h
M sw/airborne/modules/sensors/baro_scp.h
A sw/airborne/modules/time/flight_time.c
A sw/airborne/modules/time/flight_time.h
A sw/airborne/peripherals/bmp085.c
A sw/airborne/peripherals/bmp085.h
A sw/airborne/peripherals/bmp085_regs.h
A sw/airborne/peripherals/cyrf6936.c
A sw/airborne/peripherals/cyrf6936.h
A sw/airborne/peripherals/cyrf6936_regs.h
M sw/airborne/peripherals/l3g4200.c
M sw/airborne/peripherals/l3g4200.h
M sw/airborne/peripherals/l3g4200_regs.h
A sw/airborne/peripherals/ms5611.c
M sw/airborne/peripherals/ms5611.h
A sw/airborne/peripherals/ms5611_i2c.c
A sw/airborne/peripherals/ms5611_i2c.h
A sw/airborne/peripherals/ms5611_regs.h
A sw/airborne/peripherals/ms5611_spi.c
A sw/airborne/peripherals/ms5611_spi.h
M sw/airborne/state.h
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
R sw/airborne/subsystems/ahrs/ahrs_extern_quat.c
R sw/airborne/subsystems/ahrs/ahrs_extern_quat.h
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
R sw/airborne/subsystems/ahrs/ahrs_float_ekf.c
R sw/airborne/subsystems/ahrs/ahrs_float_ekf.h
R sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
R sw/airborne/subsystems/ahrs/ahrs_float_lkf.h
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.h
M sw/airborne/subsystems/datalink/datalink.h
M sw/airborne/subsystems/datalink/downlink.h
M sw/airborne/subsystems/datalink/pprz_transport.h
A sw/airborne/subsystems/datalink/superbitrf.c
A sw/airborne/subsystems/datalink/superbitrf.h
M sw/airborne/subsystems/datalink/udp.c
M sw/airborne/subsystems/electrical.c
M sw/airborne/subsystems/electrical.h
M sw/airborne/subsystems/gps/gps_ardrone2.c
M sw/airborne/subsystems/gps/gps_sim_nps.c
M sw/airborne/subsystems/gps/gps_sim_nps.h
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/imu.h
M sw/airborne/subsystems/imu/imu_ardrone2_raw.c
M sw/airborne/subsystems/imu/imu_ardrone2_raw.h
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
A sw/airborne/subsystems/imu/imu_gl1.c
A sw/airborne/subsystems/imu/imu_gl1.h
A sw/airborne/subsystems/imu/imu_gl1_defaults.h
M sw/airborne/subsystems/imu/imu_nps.h
A sw/airborne/subsystems/imu/imu_px4fmu.c
A sw/airborne/subsystems/imu/imu_px4fmu.h
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_alt_float.h
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/ins_int.h
M sw/airborne/subsystems/ins/ins_int_extended.c
A sw/airborne/subsystems/ins/ins_int_extended.h
M sw/airborne/subsystems/ins/vf_extended_float.c
M sw/airborne/subsystems/ins/vf_float.c
M sw/airborne/subsystems/navigation/common_nav.c
M sw/airborne/subsystems/navigation/common_nav.h
M sw/airborne/subsystems/radio_control/sbus.c
A sw/airborne/subsystems/radio_control/superbitrf_rc.c
A sw/airborne/subsystems/radio_control/superbitrf_rc.h
A sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
A sw/airborne/subsystems/sensors/baro_ms5611_spi.c
A sw/airborne/subsystems/sonar.h
M sw/airborne/test/subsystems/test_ahrs.c
M sw/airborne/test/subsystems/test_imu.c
M sw/ext/ardrone2_drivers/cdc-acm.ko
A sw/ext/ardrone2_drivers/check_update.sh
R sw/ext/ardrone2_drivers/cp210x.ko
R sw/ext/ardrone2_drivers/ftdi-sio.ko
R sw/ext/ardrone2_drivers/pl2303.ko
R sw/ext/ardrone2_drivers/usbserial.ko
A sw/ext/ardrone2_drivers/wifi_setup.sh
M sw/ground_segment/cockpit/editFP.ml
M sw/lib/ocaml/maps_support.ml
A sw/simulator/nps/nps_atmosphere.c
M sw/simulator/nps/nps_atmosphere.h
A sw/simulator/nps/nps_autopilot_fixedwing.c
A sw/simulator/nps/nps_autopilot_fixedwing.h
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_autopilot_rotorcraft.h
A sw/simulator/nps/nps_electrical.c
A sw/simulator/nps/nps_electrical.h
M sw/simulator/nps/nps_fdm.h
M sw/simulator/nps/nps_fdm_jsbsim.c
R sw/simulator/nps/nps_ivy.c
M sw/simulator/nps/nps_ivy.h
A sw/simulator/nps/nps_ivy_common.c
A sw/simulator/nps/nps_ivy_fixedwing.c
A sw/simulator/nps/nps_ivy_rotorcraft.c
M sw/simulator/nps/nps_main.c
M sw/simulator/nps/nps_radio_control_joystick.c
M sw/simulator/pprzsim-launch
M sw/supervision/paparazzicenter.glade
M sw/supervision/paparazzicenter.ml
M sw/supervision/pc_aircraft.ml
M sw/supervision/pc_control_panel.ml
M sw/tools/calibration/calibrate.py
M sw/tools/calibration/calibration_utils.py
M sw/tools/dfu/stm32_mem.py
M sw/tools/gen_aircraft.ml
M sw/tools/gen_airframe.ml
M sw/tools/gen_flight_plan.ml
M sw/tools/gen_modules.ml
M sw/tools/gen_periodic.ml
M sw/tools/gen_settings.ml
M tests/examples/01_compile_all_test_targets.t
Log Message:
-----------
Merge remote-tracking branch 'paparazzi/master' into telemetry
Conflicts:
conf/firmwares/subsystems/fixedwing/autopilot.makefile
sw/airborne/boards/ardrone/navdata.c
sw/airborne/boards/lisa_m/baro_ms5611_i2c.c
sw/airborne/boards/lisa_m/baro_ms5611_spi.c
sw/airborne/firmwares/fixedwing/ap_downlink.h
sw/airborne/firmwares/fixedwing/main_ap.c
sw/airborne/firmwares/rotorcraft/telemetry.h
sw/airborne/mcu_periph/i2c.c
sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
sw/airborne/subsystems/ahrs/ahrs_float_lkf.c
sw/airborne/subsystems/datalink/downlink.h
sw/tools/gen_periodic.ml
Commit: cce8b99e4bd513b698756fa3869ff217a1bb4655
https://github.com/paparazzi/paparazzi/commit/cce8b99e4bd513b698756fa3869ff217a1bb4655
Author: Gautier Hattenberger <address@hidden>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M conf/messages.xml
M sw/airborne/subsystems/datalink/telemetry.c
M sw/airborne/subsystems/datalink/telemetry_common.h
M sw/tools/gen_periodic.ml
Log Message:
-----------
[telemetry] add error report
Commit: 8de915bbf26cf0083b19ea56480534481cee58ea
https://github.com/paparazzi/paparazzi/commit/8de915bbf26cf0083b19ea56480534481cee58ea
Author: Gautier Hattenberger <address@hidden>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/setup.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M sw/airborne/boards/krooz/imu_krooz.c
M sw/airborne/firmwares/rotorcraft/main.c
Log Message:
-----------
Merge remote-tracking branch 'paparazzi/telemetry' into telemetry
Conflicts:
conf/firmwares/subsystems/fixedwing/autopilot.makefile
conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
Commit: 8ac5fd8d5bbe5416e68fe34e2f89afe5777a016e
https://github.com/paparazzi/paparazzi/commit/8ac5fd8d5bbe5416e68fe34e2f89afe5777a016e
Author: Felix Ruess <address@hidden>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M Makefile
M README.md
M conf/Makefile.omap
A conf/abi.xml
M conf/airframes/CDW/asctec_cdw.xml
M conf/airframes/CDW/tricopter_cdw.xml
M conf/airframes/ENAC/fixed-wing/firestorm.xml
M conf/airframes/ENAC/fixed-wing/funjet2.xml
M conf/airframes/ENAC/fixed-wing/mythe.xml
M conf/airframes/ENAC/fixed-wing/weasel.xml
M conf/airframes/ENAC/quadrotor/blender.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/ENAC/quadrotor/hen1.xml
R conf/airframes/NoVa_L.xml
M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
M conf/airframes/TUDelft/IMAV2013/chouchou_lisa_s.xml
M conf/airframes/TUDelft/IMAV2013/quadrotor_lisa_s.xml
M conf/airframes/TUDelft/IMAV2013/walkera_V120D02S.xml
M conf/airframes/TUDelft/IMAV2013/walkera_genius_v1.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/ardrone2_sdk.xml
R conf/airframes/booz2_flixr.xml
R conf/airframes/booz2_ppzuav.xml
M conf/airframes/esden/cocto_lm2a2.xml
M conf/airframes/esden/gain_scheduling_example.xml
M conf/airframes/esden/hexy_ll11a2pwm.xml
M conf/airframes/esden/hexy_lm2a2pwm.xml
M conf/airframes/esden/lisa2_hex.xml
M conf/airframes/esden/qs_asp22.xml
M conf/airframes/esden/quady_ll11a2pwm.xml
M conf/airframes/esden/quady_lm1a1pwm.xml
M conf/airframes/esden/quady_lm2a2pwm.xml
M conf/airframes/esden/quady_lm2a2pwmppm.xml
M conf/airframes/esden/quady_ls01pwm.xml
M conf/airframes/examples/Twinstar_energyadaptive.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/easystar_ets.xml
M conf/airframes/examples/h_hex.xml
M conf/airframes/examples/krooz_sd/krooz_sd_hexa_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_okto_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
M conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
M conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/examples/quadshot_asp21_spektrum.xml
M conf/airframes/examples/stm32f4_discovery_test.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
R conf/airframes/mentor_tum.xml
M conf/airframes/obsolete/ENAC/g1_vision.xml
M conf/airframes/obsolete/ENAC/mkk1-vision.xml
M conf/airframes/obsolete/ENAC/mkk1.xml
M conf/airframes/obsolete/ENAC/nova1.xml
A conf/airframes/obsolete/NoVa_L.xml
M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_asctec_example.xml
M conf/airframes/obsolete/PPZUAV/quadrotor/ppzuav_booz2_mkk_example.xml
M conf/airframes/obsolete/Poine/booz2_a1.xml
M conf/airframes/obsolete/Poine/booz2_a7.xml
M conf/airframes/obsolete/Poine/h_hex.xml
M conf/airframes/obsolete/UofAdelaide/A1000_BOOZ.xml
M conf/airframes/obsolete/UofAdelaide/A1000_LISA.xml
M conf/airframes/obsolete/UofAdelaide/A1000_NOVA.xml
M conf/airframes/obsolete/UofAdelaide/booz2_NoVa_001_1000.xml
M conf/airframes/obsolete/UofAdelaide/booz2_a1000.xml
M conf/airframes/obsolete/UofAdelaide/lisa_a1000.xml
M conf/airframes/obsolete/booz2_Aron.xml
M conf/airframes/obsolete/booz2_NoVa.xml
M conf/airframes/obsolete/booz2_NoVa_001.xml
M conf/airframes/obsolete/booz2_NoVa_002.xml
M conf/airframes/obsolete/booz2_a1p.xml
M conf/airframes/obsolete/booz2_a2.xml
M conf/airframes/obsolete/booz2_a3.xml
M conf/airframes/obsolete/booz2_a4.xml
M conf/airframes/obsolete/booz2_a5.xml
A conf/airframes/obsolete/booz2_flixr.xml
A conf/airframes/obsolete/booz2_ppzuav.xml
M conf/airframes/obsolete/booz2_s1.xml
M conf/airframes/obsolete/booz2_x1.xml
M conf/airframes/obsolete/example_heli_lisam.xml
A conf/airframes/obsolete/mentor_tum.xml
M conf/airframes/obsolete/mm/rotor/qmk1.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_l_mkk.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_1_pwm.xml
M conf/airframes/obsolete/mm/rotor/quadrotor_lisa_m_2_pwm.xml
M conf/boards/stm32f4_discovery.makefile
M conf/conf_example.xml
M conf/conf_tests.xml
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/rotorcraft.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens700.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/ins.makefile
M conf/firmwares/subsystems/rotorcraft/ins_extended.makefile
M conf/firmwares/subsystems/rotorcraft/ins_hff.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
M conf/firmwares/subsystems/shared/actuators_asctec_v2.makefile
A conf/firmwares/subsystems/shared/baro_board.makefile
M conf/flight_plans/flight_plan.dtd
A conf/flight_plans/mission_fw.xml
M conf/messages.xml
M conf/modules/baro_amsys.xml
R conf/modules/baro_board.xml
M conf/modules/baro_ets.xml
M conf/modules/baro_hca.xml
M conf/modules/baro_mpl3115.xml
M conf/modules/baro_ms5611_spi.xml
A conf/modules/baro_sim.xml
A conf/modules/mission_fw.xml
M conf/settings/control/rotorcraft_guidance.xml
A conf/settings/estimation/ahrs_float_cmpl.xml
M conf/settings/estimation/ahrs_int_cmpl_quat.xml
M conf/settings/nps.xml
M conf/simulator/nps/nps_sensors_params_aspirin_1.5.h
M conf/simulator/nps/nps_sensors_params_booz2_a1.h
M conf/simulator/nps/nps_sensors_params_booz2_a1p.h
M conf/simulator/nps/nps_sensors_params_default.h
R sw/airborne/arch/sim/sim_baro.c
M sw/airborne/boards/apogee/baro_board.c
M sw/airborne/boards/apogee/baro_board.h
M sw/airborne/boards/apogee/imu_apogee.c
M sw/airborne/boards/apogee_0.99.h
M sw/airborne/boards/apogee_1.0.h
M sw/airborne/boards/ardrone/baro_board.c
M sw/airborne/boards/ardrone/baro_board.h
R sw/airborne/boards/ardrone/baro_board_dummy.c
M sw/airborne/boards/ardrone2_raw.h
M sw/airborne/boards/ardrone2_sdk.h
A sw/airborne/boards/baro_board_ms5611_i2c.c
A sw/airborne/boards/baro_board_ms5611_spi.c
M sw/airborne/boards/booz/baro_board.c
M sw/airborne/boards/booz/baro_board.h
M sw/airborne/boards/booz_1.0.h
M sw/airborne/boards/krooz/baro_board.h
M sw/airborne/boards/krooz_sd.h
R sw/airborne/boards/lia/baro_board.h
M sw/airborne/boards/lia_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_1.0.h
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.h
M sw/airborne/boards/lisa_m_1.0.h
M sw/airborne/boards/lisa_m_2.0.h
M sw/airborne/boards/lisa_s/baro_board.h
M sw/airborne/boards/navgo/baro_board.c
M sw/airborne/boards/navgo/baro_board.h
M sw/airborne/boards/navgo_1.0.h
M sw/airborne/boards/pc/baro_board.c
M sw/airborne/boards/pc/baro_board.h
M sw/airborne/boards/pc_sim.h
M sw/airborne/boards/px4fmu/baro_board.h
M sw/airborne/boards/stm32f4_discovery.h
M sw/airborne/boards/umarim/baro_board.c
M sw/airborne/boards/umarim/baro_board.h
M sw/airborne/boards/umarim_1.0.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/rotorcraft/datalink.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_h_ref.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h_ref.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_ref.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v_ref.h
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
M sw/airborne/firmwares/rotorcraft/navigation.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
A
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.c
A
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_transformations.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
R
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
A
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_saturate.h
M sw/airborne/lisa/test_baro_i2c.c
M sw/airborne/math/pprz_algebra_int.h
M sw/airborne/math/pprz_geodetic_int.c
M sw/airborne/math/pprz_geodetic_int.h
A sw/airborne/math/pprz_isa.h
M sw/airborne/modules/cam_control/cam_track.c
A sw/airborne/modules/mission/mission.c
A sw/airborne/modules/mission/mission.h
A sw/airborne/modules/mission/mission_fw_nav.c
M sw/airborne/modules/sensors/baro_MS5534A.c
M sw/airborne/modules/sensors/baro_MS5534A.h
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_amsys.h
M sw/airborne/modules/sensors/baro_bmp.c
M sw/airborne/modules/sensors/baro_bmp.h
R sw/airborne/modules/sensors/baro_board_module.c
R sw/airborne/modules/sensors/baro_board_module.h
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/baro_ets.h
M sw/airborne/modules/sensors/baro_hca.c
M sw/airborne/modules/sensors/baro_mpl3115.c
M sw/airborne/modules/sensors/baro_mpl3115.h
M sw/airborne/modules/sensors/baro_ms5611_i2c.c
M sw/airborne/modules/sensors/baro_ms5611_i2c.h
M sw/airborne/modules/sensors/baro_ms5611_spi.c
M sw/airborne/modules/sensors/baro_ms5611_spi.h
M sw/airborne/modules/sensors/baro_scp.c
M sw/airborne/modules/sensors/baro_scp.h
M sw/airborne/modules/sensors/baro_scp_i2c.c
A sw/airborne/modules/sensors/baro_sim.c
A sw/airborne/modules/sensors/baro_sim.h
M sw/airborne/modules/sensors/pressure_board_navarro.c
M sw/airborne/modules/sensors/pressure_board_navarro.h
M sw/airborne/modules/vehicle_interface/vi_test_signal.c
M sw/airborne/peripherals/mpl3115.c
M sw/airborne/peripherals/mpl3115.h
M sw/airborne/state.c
M sw/airborne/subsystems/abi.h
M sw/airborne/subsystems/abi_common.h
A sw/airborne/subsystems/abi_sender_ids.h
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.h
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
A sw/airborne/subsystems/air_data.c
A sw/airborne/subsystems/air_data.h
M sw/airborne/subsystems/ins/hf_float.c
M sw/airborne/subsystems/ins/hf_float.h
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_alt_float.h
M sw/airborne/subsystems/ins/ins_ardrone2.c
M sw/airborne/subsystems/ins/ins_ardrone2.h
M sw/airborne/subsystems/ins/ins_gps_passthrough.c
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/ins_int.h
R sw/airborne/subsystems/ins/ins_int_extended.c
R sw/airborne/subsystems/ins/ins_int_extended.h
M sw/airborne/subsystems/navigation/common_nav.c
M sw/airborne/subsystems/sensors/baro.h
R sw/airborne/subsystems/sensors/baro_ms5611_i2c.c
R sw/airborne/subsystems/sensors/baro_ms5611_spi.c
M sw/airborne/test/Makefile
M sw/airborne/test/test_geodetic.c
M sw/in_progress/python/attitude_viz.py
M sw/lib/ocaml/expr_syntax.ml
M sw/lib/ocaml/expr_syntax.mli
M sw/lib/ocaml/latlong.ml
M sw/simulator/fg.c
M sw/simulator/nps/nps_autopilot.h
M sw/simulator/nps/nps_autopilot_fixedwing.c
R sw/simulator/nps/nps_autopilot_fixedwing.h
M sw/simulator/nps/nps_autopilot_rotorcraft.c
R sw/simulator/nps/nps_autopilot_rotorcraft.h
M sw/simulator/nps/nps_ivy_rotorcraft.c
M sw/simulator/nps/nps_sensor_baro.c
M sw/simulator/nps/nps_sensor_baro.h
M sw/tools/calibration/calibrate.py
M sw/tools/calibration/calibrate_gyro.py
M sw/tools/calibration/calibrate_mag_current.py
M sw/tools/calibration/calibration_utils.py
M sw/tools/gen_abi.ml
M sw/tools/gen_flight_plan.ml
M sw/tools/gen_settings.ml
Log Message:
-----------
Merge branch 'master' into telemetry
* master: (125 commits)
[abi] define ABI x_SENDER_IDs in abi_sender_ids.h
[sim] flight gear viz: daytime on all spots on the planet, not only France
[abi] split abi messages from telemetry messages
[fix] fix typo in actuators asctec v2
[baro] fix baro scaling for booz and navgo
[boards] sim pc: only USE_BARO_BOARD for nps
[conf] move some airframes to obsolete
[modules] add baro_sim
[sim] remove unused sim_baro
[apogee] fix baro mpl3115 init on apogee
Update README for recommended gcc-arm-embedded toolchain
[boards] stm32f4_discovery typo in description
[boards] roughly correct BOOZ_BARO_SENS
[modules] baro_ets: BARO_ETS_SCALE
[modules] baro modules for real sensors only for ap target, not sim
[conf] remove baro_board.xml module file
[boards] update stm32f4_discovery
[lib/ocaml] update leap_seconds
[mission] fix segmentation fault and add generic mission FP
[generator] generate arrays of the settings and fp blocks names
...
Conflicts:
sw/airborne/firmwares/fixedwing/ap_downlink.h
sw/airborne/firmwares/fixedwing/main_ap.c
sw/airborne/firmwares/rotorcraft/telemetry.h
sw/airborne/modules/sensors/baro_MS5534A.c
Commit: 72ea3b6aa623dea319946102ec7e50cec94e6058
https://github.com/paparazzi/paparazzi/commit/72ea3b6aa623dea319946102ec7e50cec94e6058
Author: Felix Ruess <address@hidden>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M conf/messages.xml
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
Log Message:
-----------
[telemetry] update HOVER_LOOP
remove unused cmd_body and nav_err
Commit: 61cb9a568ee2d80b14bf2eac891dfed4785b6cb7
https://github.com/paparazzi/paparazzi/commit/61cb9a568ee2d80b14bf2eac891dfed4785b6cb7
Author: Felix Ruess <address@hidden>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/air_data.c
M sw/airborne/subsystems/air_data.h
M sw/airborne/subsystems/ins/ins_int.c
Log Message:
-----------
[telemetry] some updates for baro, ins, etc..
after merging master
Commit: 7c8be3839cb993a6173b6268235c620023172c22
https://github.com/paparazzi/paparazzi/commit/7c8be3839cb993a6173b6268235c620023172c22
Author: Gautier Hattenberger <address@hidden>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M sw/airborne/mcu_periph/i2c.c
Log Message:
-----------
[fix] typo in i2c.c
Commit: 3614f53c0244744c8fc94c196f06e5191c71adff
https://github.com/paparazzi/paparazzi/commit/3614f53c0244744c8fc94c196f06e5191c71adff
Author: Gautier Hattenberger <address@hidden>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M conf/telemetry/default_fixedwing.xml
M conf/telemetry/default_fixedwing_imu.xml
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/modules/cam_control/cam.c
Log Message:
-----------
[telemetry] fix some messages downlink in main_ap and cam
Commit: c384bc158ffaecec383827e443351c352debbfd3
https://github.com/paparazzi/paparazzi/commit/c384bc158ffaecec383827e443351c352debbfd3
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M .gitignore
M conf/Makefile.stm32
A conf/Makefile.stm32-upload
M conf/airframes/CDW/asctec_cdw.xml
A conf/airframes/ENAC/fixed-wing/crrcsim.xml
M conf/airframes/ENAC/quadrotor/booz2_g1.xml
M conf/airframes/TUDelft/IMAV2013/ardrone2_raw.xml
M conf/airframes/TestHardware/LisaL_v1.1_aspirin_v1.5_rc.xml
M conf/airframes/TestHardware/LisaL_v1.1_b2_v1.2_rc.xml
M conf/airframes/ardrone2_raw.xml
M conf/airframes/examples/booz2.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_mkk.xml
M conf/airframes/examples/krooz_sd/krooz_sd_quad_pwm.xml
M conf/airframes/examples/lisa_asctec.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum.xml
M conf/airframes/examples/quadrotor_lisa_m_2_pwm_spektrum_geo_mag.xml
M conf/airframes/examples/quadrotor_lisa_m_mkk.xml
M conf/airframes/examples/quadrotor_lisa_s.xml
M conf/airframes/examples/quadrotor_mlkf.xml
M conf/airframes/examples/quadrotor_navgo.xml
M conf/airframes/examples/quadrotor_px4fmu.xml
M conf/airframes/fraser_lisa_m_rotorcraft.xml
A conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
M conf/firmwares/subsystems/shared/imu_drotek_10dof_v2.makefile
M conf/firmwares/subsystems/shared/imu_gl1.makefile
A conf/settings/control/stabilization_att_float_euler.xml
R conf/simulator/jsbsim/aircraft/BOOZ2_A1.xml
R conf/simulator/jsbsim/aircraft/BOOZ2_A1P.xml
R conf/simulator/jsbsim/aircraft/BOOZ2_F1.xml
R conf/simulator/jsbsim/aircraft/Quad_LisaM_2.xml
R conf/simulator/jsbsim/aircraft/fraser.xml
A conf/simulator/jsbsim/aircraft/simple_quad.xml
A conf/simulator/jsbsim/aircraft/simple_quad_ccw.xml
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
M sw/airborne/boards/apogee/baro_board.c
M sw/airborne/boards/baro_board_ms5611_i2c.c
M sw/airborne/boards/baro_board_ms5611_spi.c
M sw/airborne/boards/stm32f4_discovery.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_float.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_euler_float.c
M sw/airborne/peripherals/mpl3115.c
M sw/airborne/state.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/ground_segment/cockpit/live.ml
M sw/ground_segment/cockpit/page_settings.ml
M sw/ground_segment/python/settings_app/settingsapp.py
M sw/ground_segment/tmtc/settings.ml
M sw/simulator/nps/nps_autopilot.h
M sw/simulator/nps/nps_autopilot_fixedwing.c
M sw/simulator/nps/nps_autopilot_rotorcraft.c
M sw/simulator/nps/nps_fdm.h
A sw/simulator/nps/nps_fdm_crrcsim.c
M sw/simulator/nps/nps_fdm_jsbsim.c
M sw/simulator/nps/nps_main.c
M sw/tools/gen_periodic.ml
Log Message:
-----------
Merge branch 'master' into telemetry
fix ahrs_gx3 and stabilization_attitude_euler_float
Commit: dd718fb597296162cbe15a1c00ab98933d4632cf
https://github.com/paparazzi/paparazzi/commit/dd718fb597296162cbe15a1c00ab98933d4632cf
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
Log Message:
-----------
[telemetry] send STAB_ATTITUDE and STAB_ATTITUDE_REF in quat_float
and fix body_rate and att_euler sending for euler_float
Commit: fcb7949147e2153caf0fd01709b010e1d2f6a728
https://github.com/paparazzi/paparazzi/commit/fcb7949147e2153caf0fd01709b010e1d2f6a728
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M sw/airborne/boards/ardrone/navdata.c
Log Message:
-----------
[telemetry] fix ARDRONE_NAVDATA
Commit: 4310e5f743de26666b99b9bc7ead92f4e55d7a20
https://github.com/paparazzi/paparazzi/commit/4310e5f743de26666b99b9bc7ead92f4e55d7a20
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
Log Message:
-----------
[telemetry] fix TUNE_VERT
Commit: bc3848104e9f266334fd3502dbf5a206fdb43b82
https://github.com/paparazzi/paparazzi/commit/bc3848104e9f266334fd3502dbf5a206fdb43b82
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M conf/messages.xml
Log Message:
-----------
Merge branch 'master' into telemetry
get INS_Z fix from master
Commit: 3717ead582baf69dee522c1a609d8f6a1df0c0b2
https://github.com/paparazzi/paparazzi/commit/3717ead582baf69dee522c1a609d8f6a1df0c0b2
Author: Gautier Hattenberger <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M sw/airborne/subsystems/datalink/telemetry.c
M sw/airborne/subsystems/datalink/telemetry_common.h
M sw/include/std.h
Log Message:
-----------
[fix] fix compile warning with c++ (nps)
Commit: 0bcdaeaaa603aaa853cd263101cb7f78caf9006f
https://github.com/paparazzi/paparazzi/commit/0bcdaeaaa603aaa853cd263101cb7f78caf9006f
Author: Felix Ruess <address@hidden>
Date: 2013-10-23 (Wed, 23 Oct 2013)
Changed paths:
M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
M conf/modules/rotorcraft_cam.xml
Log Message:
-----------
[conf] remove some now obsolete flags
Commit: 4e86e7c89b785f28aa701cb8ff653b2e833cddb5
https://github.com/paparazzi/paparazzi/commit/4e86e7c89b785f28aa701cb8ff653b2e833cddb5
Author: Felix Ruess <address@hidden>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M conf/firmwares/rotorcraft.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/modules/gps_ubx_ucenter.xml
M sw/airborne/boards/umarim/baro_board.c
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/modules/gps/gps_ubx_ucenter.c
M sw/airborne/modules/sensors/baro_mpl3115.c
M sw/airborne/modules/sensors/baro_mpl3115.h
M sw/airborne/test/ahrs/Makefile
M sw/airborne/test/ahrs/ahrs_utils.py
M sw/airborne/test/ahrs/compare_ahrs.py
M sw/airborne/test/ahrs/run_ahrs_on_synth.c
Log Message:
-----------
Merge branch 'master' into telemetry
to resolve
Conflicts:
sw/airborne/firmwares/fixedwing/ap_downlink.h
Commit: 7d87b888a808deaaf15f0b86f12551797a78f9c0
https://github.com/paparazzi/paparazzi/commit/7d87b888a808deaaf15f0b86f12551797a78f9c0
Author: Felix Ruess <address@hidden>
Date: 2013-10-28 (Mon, 28 Oct 2013)
Changed paths:
M sw/airborne/subsystems/imu.c
Log Message:
-----------
[telemetry] allow sending of MAG message even if not USE_MAGNETOMETER
Commit: e3830578fb024a66a5a458ac25fc852489897979
https://github.com/paparazzi/paparazzi/commit/e3830578fb024a66a5a458ac25fc852489897979
Author: Gautier Hattenberger <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M conf/messages.xml
M conf/telemetry/default_rotorcraft.xml
M sw/airborne/firmwares/fixedwing/datalink.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_h.c
Log Message:
-----------
[telemetry] fix some remaining telemetry messages
Commit: 7ee4fd764c9791dddf409decc7694937d9b8ae77
https://github.com/paparazzi/paparazzi/commit/7ee4fd764c9791dddf409decc7694937d9b8ae77
Author: Gautier Hattenberger <address@hidden>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M conf/telemetry/default_fixedwing_imu.xml
Log Message:
-----------
[telemetry] slightly changing alive freq
it seems to work better, to many messages was sent on the same time slot
before, and ALIVE was often skiped
Commit: be993f6b64a214bd9665095a49a68fa770c5f33f
https://github.com/paparazzi/paparazzi/commit/be993f6b64a214bd9665095a49a68fa770c5f33f
Author: Gautier Hattenberger <address@hidden>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M sw/airborne/subsystems/air_data.c
M sw/airborne/subsystems/air_data.h
Log Message:
-----------
[air_data] use static function for telemetry
Commit: c37d31a39047fcb5583df8d8ade56c50fa38e350
https://github.com/paparazzi/paparazzi/commit/c37d31a39047fcb5583df8d8ade56c50fa38e350
Author: Gautier Hattenberger <address@hidden>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M .gitignore
A Vagrantfile
M conf/Makefile.geode
M conf/Makefile.jsbsim
M conf/Makefile.lpc21
M conf/Makefile.omap
M conf/Makefile.pentium-m
M conf/Makefile.sim
M conf/Makefile.stm32
M conf/airframes/examples/stm32f4_discovery_test.xml
R conf/firmwares/booz2_common.makefile
R conf/firmwares/booz2_test_progs.makefile
M conf/firmwares/lisa_passthrough.makefile
M conf/firmwares/rotorcraft.makefile
R conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
A conf/firmwares/test_progs.makefile
M conf/modules/gps_ubx_ucenter.xml
A conf/settings/estimation/ahrs_float_mlkf.xml
M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
M sw/airborne/arch/stm32/subsystems/radio_control/ppm_arch.c
M sw/airborne/boards/stm32f4_discovery.h
R sw/airborne/booz/test/Makefile
R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
R sw/airborne/booz/test/booz2_test_buss_bldc_hexa.h
R sw/airborne/booz/test/booz2_test_crista.c
R sw/airborne/booz/test/booz2_test_gps.c
R sw/airborne/booz/test/booz2_test_max1168.c
R sw/airborne/booz/test/booz2_test_usb.c
R sw/airborne/booz/test/plot_scaling.sce
R sw/airborne/booz/test/plot_test_vg_adpt.sce
R sw/airborne/booz/test/plot_test_vg_ref.sce
R sw/airborne/booz/test/test_mlkf.c
R sw/airborne/booz/test/test_mlkf.sce
R sw/airborne/booz/test/test_scaling.c
R sw/airborne/booz/test/test_vg_adpt.c
R sw/airborne/booz/test/test_vg_ref.c
R sw/airborne/booz/test/vert_loop.dat.bz2
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_common_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_int.h
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_ref_quat_int.h
M sw/airborne/math/Makefile
M sw/airborne/math/README
M sw/airborne/math/pprz_algebra_int.h
M sw/airborne/modules/gps/gps_ubx_ucenter.c
M sw/airborne/modules/gps/gps_ubx_ucenter.h
A sw/airborne/peripherals/lis302dl.h
A sw/airborne/peripherals/lis302dl_regs.h
A sw/airborne/peripherals/lis302dl_spi.c
A sw/airborne/peripherals/lis302dl_spi.h
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/gps/gps_ubx.h
M sw/airborne/test/Makefile
M sw/airborne/test/ahrs/ahrs_utils.py
M sw/airborne/test/ahrs/compare_ahrs.py
R sw/airborne/test/nova_test_imu.c
A sw/airborne/test/peripherals/test_lis302dl_spi.c
A sw/airborne/test/stabilization/.gitignore
A sw/airborne/test/stabilization/README.md
A sw/airborne/test/stabilization/algebra_float.pxd
A sw/airborne/test/stabilization/algebra_float.pyx
A sw/airborne/test/stabilization/algebra_int.pxd
A sw/airborne/test/stabilization/algebra_int.pyx
A sw/airborne/test/stabilization/compare_ref_quat.py
A sw/airborne/test/stabilization/generated/airframe.h
A sw/airborne/test/stabilization/pprz_algebra_double_c.pxd
A sw/airborne/test/stabilization/pprz_algebra_float_c.pxd
A sw/airborne/test/stabilization/pprz_algebra_int_c.pxd
A sw/airborne/test/stabilization/ref_quat_float.pyx
A sw/airborne/test/stabilization/ref_quat_int.pyx
A sw/airborne/test/stabilization/setup.py
A sw/extras/bootstrap_vm.sh
A sw/extras/setup_git_aliases.sh
M sw/ground_segment/cockpit/Makefile
M sw/ground_segment/cockpit/live.ml
M sw/lib/ocaml/Makefile
A sw/lib/ocaml/acIcon.ml
A sw/lib/ocaml/acIcon.mli
A sw/lib/ocaml/contrastLabel.ml
A sw/lib/ocaml/contrastLabel.mli
M sw/lib/ocaml/mapTrack.ml
M sw/lib/ocaml/mapTrack.mli
M sw/lib/ocaml/mapWaypoints.ml
M sw/lib/ocaml/mapWaypoints.mli
R sw/simulator/old_booz/booz2_sim_main.c
R sw/simulator/old_booz/booz_flight_model.c
R sw/simulator/old_booz/booz_flight_model.h
R sw/simulator/old_booz/booz_flight_model_params.h
R sw/simulator/old_booz/booz_flight_model_utils.c
R sw/simulator/old_booz/booz_flight_model_utils.h
R sw/simulator/old_booz/booz_flightgear.c
R sw/simulator/old_booz/booz_flightgear.h
R sw/simulator/old_booz/booz_joystick.c
R sw/simulator/old_booz/booz_joystick.h
R sw/simulator/old_booz/booz_joystick_fake.h
R sw/simulator/old_booz/booz_r250.c
R sw/simulator/old_booz/booz_r250.h
R sw/simulator/old_booz/booz_randlcg.c
R sw/simulator/old_booz/booz_randlcg.h
R sw/simulator/old_booz/booz_rc_sim.h
R sw/simulator/old_booz/booz_sensors_model.c
R sw/simulator/old_booz/booz_sensors_model.h
R sw/simulator/old_booz/booz_sensors_model_accel.c
R sw/simulator/old_booz/booz_sensors_model_baro.c
R sw/simulator/old_booz/booz_sensors_model_gps.c
R sw/simulator/old_booz/booz_sensors_model_gyro.c
R sw/simulator/old_booz/booz_sensors_model_mag.c
R sw/simulator/old_booz/booz_sensors_model_params_booz2.h
R sw/simulator/old_booz/booz_sensors_model_params_booz2_a1.h
R sw/simulator/old_booz/booz_sensors_model_rangemeter.c
R sw/simulator/old_booz/booz_sensors_model_utils.c
R sw/simulator/old_booz/booz_sensors_model_utils.h
R sw/simulator/old_booz/booz_wind_model.c
R sw/simulator/old_booz/booz_wind_model.h
R sw/simulator/old_booz/tests/Makefile
R sw/simulator/old_booz/tests/test_fdm.c
R sw/simulator/old_booz/tests/test_sensors.c
R sw/simulator/sim_ac_booz.c
M sw/supervision/paparazzicenter.glade
M sw/supervision/paparazzicenter.ml
M sw/supervision/pc_aircraft.ml
M sw/tools/calibration/calibrate_gyro.py
M sw/tools/calibration/calibrate_mag_current.py
M sw/tools/calibration/calibration_utils.py
Log Message:
-----------
Merge remote-tracking branch 'paparazzi/master' into telemetry
Commit: cc9e08538cf32abefb710018579ddbbce125900a
https://github.com/paparazzi/paparazzi/commit/cc9e08538cf32abefb710018579ddbbce125900a
Author: Gautier Hattenberger <address@hidden>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
M conf/firmwares/lisa_test_progs.makefile
M conf/firmwares/setup.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
M conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/fixedwing/autopilot.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_transparent.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_transparent_usb.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_w5100.makefile
M conf/firmwares/subsystems/fixedwing/telemetry_xbee_api.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
M conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
M conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
M conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_transparent_usb.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_udp.makefile
M conf/firmwares/subsystems/rotorcraft/telemetry_xbee_api.makefile
M conf/messages.xml
M conf/modules/rotorcraft_cam.xml
M conf/telemetry/default_fixedwing.xml
M conf/telemetry/default_fixedwing_imu.xml
M conf/telemetry/default_fixedwing_imu_9k6.xml
M conf/telemetry/default_rotorcraft.xml
M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
M sw/airborne/arch/sim/jsbsim_hw.h
M sw/airborne/arch/sim/sim_ap.c
M sw/airborne/boards/apogee/imu_apogee.c
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/boards/krooz/imu_krooz.c
M sw/airborne/boards/navgo/imu_navgo.c
M sw/airborne/boards/umarim/imu_umarim.c
M sw/airborne/firmwares/beth/rcv_telemetry.c
R sw/airborne/firmwares/fixedwing/ap_downlink.h
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/firmwares/fixedwing/datalink.c
R sw/airborne/firmwares/fixedwing/fbw_downlink.h
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.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/main.c
M sw/airborne/firmwares/rotorcraft/navigation.c
A sw/airborne/firmwares/rotorcraft/rotorcraft_telemetry.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_euler_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_float.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
R sw/airborne/firmwares/rotorcraft/telemetry.c
R sw/airborne/firmwares/rotorcraft/telemetry.h
M sw/airborne/firmwares/setup/setup_actuators.c
M sw/airborne/link_mcu_spi.c
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/uart.c
M sw/airborne/modules/MPPT/MPPT.c
M sw/airborne/modules/MPPT/sim_MPPT.c
M sw/airborne/modules/adcs/adc_generic.c
M sw/airborne/modules/benchmark/flight_benchmark.c
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/cam_control/cam.h
M sw/airborne/modules/cam_control/cam_track.c
M sw/airborne/modules/cam_control/rotorcraft_cam.c
M sw/airborne/modules/cartography/cartography.c
M sw/airborne/modules/config/config_mkk_v2.c
M sw/airborne/modules/core/sys_mon.c
M sw/airborne/modules/datalink/xtend_rssi.c
M sw/airborne/modules/digital_cam/atmega_i2c_cam_ctrl.c
M sw/airborne/modules/digital_cam/dc.c
M sw/airborne/modules/digital_cam/sim_i2c_cam_ctrl.c
M sw/airborne/modules/enose/anemotaxis.c
M sw/airborne/modules/enose/chemotaxis.c
M sw/airborne/modules/enose/enose.c
M sw/airborne/modules/gps/gps_ubx_ucenter.c
M sw/airborne/modules/gsm/gsm.c
M sw/airborne/modules/ins/ahrs_chimu_spi.c
M sw/airborne/modules/ins/ahrs_chimu_uart.c
M sw/airborne/modules/ins/alt_filter.c
M sw/airborne/modules/ins/ins_arduimu.c
M sw/airborne/modules/ins/ins_arduimu_basic.c
M sw/airborne/modules/ins/ins_vn100.c
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens700.c
M sw/airborne/modules/max3100/max3100_hw.c
M sw/airborne/modules/meteo/charge_sens.c
M sw/airborne/modules/meteo/dust_gp2y.c
M sw/airborne/modules/meteo/geiger_counter.c
M sw/airborne/modules/meteo/humid_dpicco.c
M sw/airborne/modules/meteo/humid_hih.c
M sw/airborne/modules/meteo/humid_htm_b71.c
M sw/airborne/modules/meteo/humid_pcap01.c
M sw/airborne/modules/meteo/humid_sht.c
M sw/airborne/modules/meteo/humid_sht_i2c.c
M sw/airborne/modules/meteo/ir_mlx.c
M sw/airborne/modules/meteo/light_solar.c
M sw/airborne/modules/meteo/light_temt.c
M sw/airborne/modules/meteo/temp_lm75.c
M sw/airborne/modules/meteo/temp_tcouple_adc.c
M sw/airborne/modules/meteo/temp_temod.c
M sw/airborne/modules/meteo/temp_tmp102.c
M sw/airborne/modules/meteo/windturbine.c
M sw/airborne/modules/multi/formation.c
M sw/airborne/modules/multi/potential.c
M sw/airborne/modules/multi/tcas.c
M sw/airborne/modules/nav/nav_catapult.c
M sw/airborne/modules/openlog/openlog.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/airspeed_otf.c
M sw/airborne/modules/sensors/alt_srf08.c
M sw/airborne/modules/sensors/aoa_adc.c
M sw/airborne/modules/sensors/baro_MS5534A.c
M sw/airborne/modules/sensors/baro_amsys.c
M sw/airborne/modules/sensors/baro_bmp.c
M sw/airborne/modules/sensors/baro_ets.c
M sw/airborne/modules/sensors/baro_hca.c
M sw/airborne/modules/sensors/baro_mpl3115.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/imu_aspirin2.c
M sw/airborne/modules/sensors/mag_hmc5843.c
M sw/airborne/modules/sensors/mag_hmc58xx.c
M sw/airborne/modules/sensors/mag_micromag_fw.c
M sw/airborne/modules/sonar/sonar_adc.c
M sw/airborne/subsystems/ahrs/ahrs_aligner.c
M sw/airborne/subsystems/ahrs/ahrs_ardrone2.c
M sw/airborne/subsystems/ahrs/ahrs_float_cmpl.c
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/ahrs/ahrs_infrared.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/air_data.c
M sw/airborne/subsystems/datalink/downlink.h
M sw/airborne/subsystems/datalink/superbitrf.c
A sw/airborne/subsystems/datalink/telemetry.c
A sw/airborne/subsystems/datalink/telemetry.h
A sw/airborne/subsystems/datalink/telemetry_common.h
M sw/airborne/subsystems/gps.c
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/ins/hf_float.c
M sw/airborne/subsystems/ins/ins_alt_float.c
M sw/airborne/subsystems/ins/ins_int.c
M sw/airborne/subsystems/ins/vf_extended_float.c
M sw/airborne/subsystems/ins/vf_float.c
M sw/airborne/subsystems/nav.c
M sw/airborne/subsystems/nav.h
M sw/airborne/subsystems/navigation/discsurvey.c
M sw/airborne/subsystems/radio_control/ppm.c
M sw/airborne/subsystems/radio_control/sbus.c
M sw/include/std.h
M sw/tools/gen_periodic.ml
Log Message:
-----------
Merge pull request #472 from paparazzi/telemetry
Telemetry
Compare:
https://github.com/paparazzi/paparazzi/compare/8191fe45be31...cc9e08538cf3
- [paparazzi-commits] [paparazzi/paparazzi] 1bff48: [telemetry] new periodic telemetry system,
GitHub <=