[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [paparazzi/paparazzi] 3aaefb: Merged with master
|
From: |
GitHub |
|
Subject: |
[paparazzi-commits] [paparazzi/paparazzi] 3aaefb: Merged with master |
|
Date: |
Thu, 31 Mar 2016 10:52:46 -0700 |
Branch: refs/heads/master
Home: https://github.com/paparazzi/paparazzi
Commit: 3aaefbc4de7c70cb7f9a6e018d25348bdae20ff9
https://github.com/paparazzi/paparazzi/commit/3aaefbc4de7c70cb7f9a6e018d25348bdae20ff9
Author: hrvoje <address@hidden>
Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths:
M sw/airborne/modules/computer_vision/lib/vision/image.c
M sw/airborne/modules/computer_vision/lib/vision/image.h
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.h
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
Log Message:
-----------
Merged with master
Commit: dcfd0d9c019fe9af5969ed339a0e1973d8d0d6d6
https://github.com/paparazzi/paparazzi/commit/dcfd0d9c019fe9af5969ed339a0e1973d8d0d6d6
Author: hrvoje <address@hidden>
Date: 2016-03-29 (Tue, 29 Mar 2016)
Changed paths:
A conf/HB/hb_conf_speedy_opticflow.xml
A conf/HB/hb_control_panel_speedy_opticflow.xml
A conf/airframes/HB/hb_ardrone2_opticflowtest.xml
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
Log Message:
-----------
Added conf files.
Commit: dc96a8bdb7e13c1cc7b6e1a46d5be3ef1cecb91a
https://github.com/paparazzi/paparazzi/commit/dc96a8bdb7e13c1cc7b6e1a46d5be3ef1cecb91a
Author: hrvoje <address@hidden>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M sw/airborne/modules/computer_vision/lib/vision/image.c
M sw/airborne/modules/computer_vision/lib/vision/image.h
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.h
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
Log Message:
-----------
Added comments to the code, added pyramid_lvl parameter to opticflow struct
in opticflow_calculator.h
Commit: c4892ad0f5118936fb91cbf8dce5bcb3753c149a
https://github.com/paparazzi/paparazzi/commit/c4892ad0f5118936fb91cbf8dce5bcb3753c149a
Author: hrvoje <address@hidden>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M conf/HB/hb_conf_speedy_opticflow.xml
M conf/Makefile.ardrone2
M conf/airframes/HB/hb_ardrone2_opticflowtest.xml
A conf/flight_plans/HB/hb_cyberzoo.xml
Log Message:
-----------
Real test flight with live optic flow improved.
Commit: c33e454fdfa249f7d7aa3159a859f89e99e3d341
https://github.com/paparazzi/paparazzi/commit/c33e454fdfa249f7d7aa3159a859f89e99e3d341
Author: hrvoje <address@hidden>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M conf/Makefile.ardrone2
M sw/airborne/modules/computer_vision/lib/vision/image.c
M sw/airborne/modules/computer_vision/lib/vision/image.h
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.h
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
Log Message:
-----------
Reverted to original ardrone2 makefile. Used astyle formating.
Commit: 047586eca513f3c2518bb6ac3f442dc374c92d93
https://github.com/paparazzi/paparazzi/commit/047586eca513f3c2518bb6ac3f442dc374c92d93
Author: hrvoje <address@hidden>
Date: 2016-03-30 (Wed, 30 Mar 2016)
Changed paths:
M conf/modules/cv_opticflow.xml
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.h
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
Log Message:
-----------
Added pyramid level slider to settings.
Commit: bbfea9b991da5e1baa7d06d9c6deb4e8821d034b
https://github.com/paparazzi/paparazzi/commit/bbfea9b991da5e1baa7d06d9c6deb4e8821d034b
Author: hrvoje <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
R conf/HB/hb_conf_speedy_opticflow.xml
R conf/HB/hb_control_panel_speedy_opticflow.xml
M conf/airframes/CDW/cdw_classix.xml
M conf/airframes/CDW/cdw_twoseastwenty.xml
M conf/airframes/CDW/cdw_yapa_xsens.xml
M conf/airframes/FLIXR/flixr_lisa_mx.xml
R conf/airframes/HB/hb_ardrone2_opticflowtest.xml
M conf/airframes/TUDELFT/tudelft_heli450.xml
M conf/airframes/examples/microjet.xml
M conf/airframes/examples/microjet_imu_xsens.xml
M conf/airframes/examples/microjet_lisa_m_xsens.xml
M conf/firmwares/subsystems/fixedwing/gps_ublox_utm.makefile
M conf/firmwares/subsystems/fixedwing/imu_xsens.makefile
M conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
M conf/firmwares/subsystems/shared/ins_xsens700.makefile
R conf/flight_plans/HB/hb_cyberzoo.xml
M conf/flight_plans/rotorcraft_basic.xml
M conf/flight_plans/rotorcraft_optitrack.xml
R conf/modules/gps_i2c.xml
A conf/modules/gps_ubx_i2c.xml
A conf/modules/imu_xsens.xml
M conf/modules/ins_xsens.xml
A conf/modules/ins_xsens700.xml
R conf/modules/ins_xsens_MTiG_Uart0.xml
R conf/modules/ins_xsens_MTi_Uart0.xml
M conf/modules/usb_serial_stm32_example1.xml
M conf/modules/usb_serial_stm32_example2.xml
M sw/airborne/arch/linux/mcu_periph/i2c_arch.c
M sw/airborne/arch/linux/mcu_periph/spi_arch.c
M sw/airborne/arch/linux/mcu_periph/sys_time_arch.c
M sw/airborne/arch/linux/mcu_periph/udp_arch.c
M sw/airborne/arch/linux/udp_socket.c
M sw/airborne/arch/linux/udp_socket.h
M sw/airborne/arch/lpc21/ADS8344.c
M sw/airborne/arch/lpc21/ADS8344.h
M sw/airborne/arch/lpc21/mcu_periph/i2c_arch.c
M sw/airborne/arch/lpc21/mcu_periph/pwm_input_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_arch.c
M sw/airborne/arch/lpc21/mcu_periph/spi_slave_hs_arch.c
M sw/airborne/arch/lpc21/mcu_periph/sys_time_arch.c
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/modules/sensors/trig_ext_hw.h
M sw/airborne/arch/lpc21/subsystems/imu/imu_aspirin_arch.c
M sw/airborne/arch/lpc21/subsystems/imu/imu_crista_arch.c
M sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.c
M sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
M sw/airborne/arch/lpc21/usb_ser_hw.c
M sw/airborne/arch/sim/baro_MS5534A.h
M sw/airborne/arch/sim/mcu_periph/i2c_arch.c
M sw/airborne/arch/sim/mcu_periph/spi_arch.c
M sw/airborne/arch/sim/mcu_periph/sys_time_arch.c
M sw/airborne/arch/sim/modules/core/trigger_ext_hw.c
M sw/airborne/arch/sim/modules/ins/ins_arduimu_basic.c
M sw/airborne/arch/sim/sim_ap.c
M sw/airborne/arch/sim/subsystems/radio_control/ppm_arch.c
M sw/airborne/arch/sim/subsystems/radio_control/spektrum_arch.c
M sw/airborne/arch/stm32/led_hw.h
M sw/airborne/arch/stm32/mcu_periph/adc_arch.c
M sw/airborne/arch/stm32/mcu_periph/gpio_arch.c
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/pwm_input_arch.c
M sw/airborne/arch/stm32/mcu_periph/spi_arch.c
M sw/airborne/arch/stm32/mcu_periph/sys_time_arch.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
M sw/airborne/arch/stm32/subsystems/imu/imu_aspirin_arch.c
M sw/airborne/arch/stm32/subsystems/imu/imu_crista_arch.c
M sw/airborne/arch/stm32/subsystems/imu/imu_krooz_sd_arch.c
M sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
M sw/airborne/arch/stm32/usb_ser_hw.c
M sw/airborne/boards/apogee/baro_board.c
M sw/airborne/boards/apogee/chibios-libopencm3/board.c
M sw/airborne/boards/apogee/chibios-libopencm3/chconf.h
M sw/airborne/boards/apogee/imu_apogee.c
M sw/airborne/boards/ardrone/actuators.c
M sw/airborne/boards/ardrone/baro_board.c
M sw/airborne/boards/ardrone/navdata.c
M sw/airborne/boards/ardrone/navdata.h
M sw/airborne/boards/baro_board_ms5611_i2c.c
M sw/airborne/boards/baro_board_ms5611_spi.c
M sw/airborne/boards/bebop/board.c
M sw/airborne/boards/bebop/video.c
M sw/airborne/boards/hbmini/baro_board.c
M sw/airborne/boards/hbmini/imu_hbmini.c
M sw/airborne/boards/krooz/imu_krooz.c
M sw/airborne/boards/krooz/imu_krooz.h
M sw/airborne/boards/krooz/imu_krooz_memsic.c
M sw/airborne/boards/krooz/imu_krooz_memsic.h
M sw/airborne/boards/lisa_l/baro_board.c
M sw/airborne/boards/lisa_m/baro_board.c
M sw/airborne/boards/lisa_mx/baro_board.c
M sw/airborne/boards/navgo/baro_board.c
M sw/airborne/boards/navgo/imu_navgo.c
M sw/airborne/boards/navstik/baro_board.c
M sw/airborne/boards/umarim/baro_board.c
M sw/airborne/boards/umarim/imu_umarim.c
M sw/airborne/boards/umarim/imu_umarim.h
M sw/airborne/firmwares/fixedwing/autopilot.c
M sw/airborne/firmwares/fixedwing/autopilot.h
M sw/airborne/firmwares/fixedwing/chibios-libopencm3/chibios_init.c
M sw/airborne/firmwares/fixedwing/chibios-libopencm3/chibios_init.h
M sw/airborne/firmwares/fixedwing/fixedwing_datalink.c
M sw/airborne/firmwares/fixedwing/main_ap.c
M sw/airborne/firmwares/fixedwing/main_chibios_libopencm3.c
M sw/airborne/firmwares/fixedwing/main_fbw.c
M sw/airborne/firmwares/fixedwing/main_fbw.h
M sw/airborne/firmwares/fixedwing/nav.c
M sw/airborne/firmwares/fixedwing/nav.h
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_adaptive.h
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.c
M sw/airborne/firmwares/fixedwing/stabilization/stabilization_attitude.h
M sw/airborne/firmwares/motor_bench/main_motor_bench.c
M sw/airborne/firmwares/motor_bench/mb_tacho.c
M sw/airborne/firmwares/motor_bench/mb_tacho.h
M sw/airborne/firmwares/motor_bench/mb_twi_controller.c
M sw/airborne/firmwares/motor_bench/mb_twi_controller_asctech.c
M sw/airborne/firmwares/motor_bench/mb_twi_controller_asctech.h
M sw/airborne/firmwares/motor_bench/mb_twi_controller_mkk.c
M sw/airborne/firmwares/motor_bench/turntable_systime.c
M sw/airborne/firmwares/rotorcraft/autopilot.c
M sw/airborne/firmwares/rotorcraft/autopilot.h
M sw/airborne/firmwares/rotorcraft/autopilot_arming_switch.h
M sw/airborne/firmwares/rotorcraft/autopilot_arming_throttle.h
M sw/airborne/firmwares/rotorcraft/autopilot_arming_yaw.h
M sw/airborne/firmwares/rotorcraft/autopilot_rc_helpers.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_flip.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_indi.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_indi.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_module.h
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.c
M sw/airborne/firmwares/rotorcraft/guidance/guidance_v.h
M sw/airborne/firmwares/rotorcraft/main.c
M sw/airborne/firmwares/rotorcraft/main_fbw.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_indi.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_quat_int.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.c
M
sw/airborne/firmwares/rotorcraft/stabilization/stabilization_attitude_rc_setpoint.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_indi.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_none.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate.h
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.c
M sw/airborne/firmwares/rotorcraft/stabilization/stabilization_rate_indi.h
M sw/airborne/firmwares/tutorial/main_demo5.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_baro.c
M sw/airborne/firmwares/wind_tunnel/wt_baro.h
M sw/airborne/inter_mcu.c
M sw/airborne/inter_mcu.h
M sw/airborne/link_mcu_can.c
M sw/airborne/link_mcu_can.h
M sw/airborne/link_mcu_spi.c
M sw/airborne/link_mcu_spi.h
M sw/airborne/link_mcu_usart.c
M sw/airborne/link_mcu_usart.h
M sw/airborne/math/pprz_orientation_conversion.h
M sw/airborne/mcu_periph/i2c.c
M sw/airborne/mcu_periph/i2c.h
M sw/airborne/mcu_periph/spi.c
M sw/airborne/mcu_periph/spi.h
M sw/airborne/mcu_periph/sys_time.c
M sw/airborne/mcu_periph/sys_time.h
M sw/airborne/mcu_periph/uart.c
M sw/airborne/mcu_periph/uart.h
M sw/airborne/mcu_periph/udp.c
M sw/airborne/mcu_periph/udp.h
M sw/airborne/mcu_periph/usb_serial.h
M sw/airborne/modules/air_data/air_data.c
M sw/airborne/modules/air_data/air_data.h
M sw/airborne/modules/airborne_ant_track/airborne_ant_track.c
M sw/airborne/modules/benchmark/flight_benchmark.c
M sw/airborne/modules/benchmark/flight_benchmark.h
M sw/airborne/modules/cam_control/cam.c
M sw/airborne/modules/cam_control/cam.h
M sw/airborne/modules/cam_control/point.c
M sw/airborne/modules/cartography/cartography.c
M sw/airborne/modules/cartography/cartography.h
M sw/airborne/modules/com/generic_com.c
M sw/airborne/modules/com/usb_serial_stm32_example1.c
M sw/airborne/modules/com/usb_serial_stm32_example2.c
M sw/airborne/modules/computer_vision/bebop_front_camera.c
M sw/airborne/modules/computer_vision/bebop_front_camera.h
M sw/airborne/modules/computer_vision/cv_blob_locator.c
M sw/airborne/modules/computer_vision/cv_blob_locator.h
M sw/airborne/modules/computer_vision/cv_georeference.c
M sw/airborne/modules/computer_vision/cv_georeference.h
M sw/airborne/modules/computer_vision/lib/encoding/jpeg.c
M sw/airborne/modules/computer_vision/lib/encoding/jpeg.h
M sw/airborne/modules/computer_vision/lib/v4l/v4l2.c
M sw/airborne/modules/computer_vision/lib/v4l/v4l2.h
M sw/airborne/modules/computer_vision/lib/vision/bayer.h
M sw/airborne/modules/computer_vision/lib/vision/fast_rosten.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
M sw/airborne/modules/computer_vision/opticflow_module.c
M sw/airborne/modules/computer_vision/qrcode/qr_code.h
M sw/airborne/modules/computer_vision/video_thread.c
M sw/airborne/modules/computer_vision/video_thread.h
M sw/airborne/modules/computer_vision/video_thread_nps.c
M sw/airborne/modules/computer_vision/viewvideo.c
M sw/airborne/modules/computer_vision/viewvideo.h
M sw/airborne/modules/computer_vision/viewvideo_nps.c
M sw/airborne/modules/core/trigger_ext.c
M sw/airborne/modules/core/trigger_ext.h
M sw/airborne/modules/ctrl/ctrl_module_demo.c
M sw/airborne/modules/ctrl/ctrl_module_demo.h
M sw/airborne/modules/ctrl/vertical_ctrl_module_demo.c
M sw/airborne/modules/ctrl/vertical_ctrl_module_demo.h
M sw/airborne/modules/datalink/mavlink_decoder.h
M sw/airborne/modules/datalink/xtend_rssi.c
M sw/airborne/modules/digital_cam/catia/catia.c
M sw/airborne/modules/digital_cam/catia/protocol.c
M sw/airborne/modules/digital_cam/catia/protocol.h
M sw/airborne/modules/digital_cam/catia/serial.h
M sw/airborne/modules/display/max7456.c
M sw/airborne/modules/enose/anemotaxis.c
M sw/airborne/modules/enose/anemotaxis.h
M sw/airborne/modules/enose/chemotaxis.c
M sw/airborne/modules/enose/chemotaxis.h
M sw/airborne/modules/enose/enose.c
M sw/airborne/modules/geo_mag/geo_mag.c
M sw/airborne/modules/geo_mag/geo_mag.h
R sw/airborne/modules/gps/gps_i2c.c
R sw/airborne/modules/gps/gps_i2c.h
A sw/airborne/modules/gps/gps_ubx_i2c.c
A sw/airborne/modules/gps/gps_ubx_i2c.h
M sw/airborne/modules/gps/gps_ubx_ucenter.c
M sw/airborne/modules/gsm/gsm.c
M sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.c
M sw/airborne/modules/guidance_opticflow/guidance_opticflow_hover.h
M sw/airborne/modules/gumstix_interface/qr_code_spi_link.c
M sw/airborne/modules/helicopter/throttle_curve.c
M sw/airborne/modules/helicopter/throttle_curve.h
M sw/airborne/modules/hott/hott.c
M sw/airborne/modules/ins/ahrs_chimu.h
M sw/airborne/modules/ins/ahrs_chimu_spi.c
M sw/airborne/modules/ins/ahrs_chimu_uart.c
M sw/airborne/modules/ins/imu_chimu.c
A sw/airborne/modules/ins/imu_xsens.c
A sw/airborne/modules/ins/imu_xsens.h
M sw/airborne/modules/ins/ins_arduimu.c
M sw/airborne/modules/ins/ins_arduimu_basic.c
M sw/airborne/modules/ins/ins_arduimu_basic.h
M sw/airborne/modules/ins/ins_module.h
M sw/airborne/modules/ins/ins_vn100.c
M sw/airborne/modules/ins/ins_xsens.c
M sw/airborne/modules/ins/ins_xsens.h
M sw/airborne/modules/ins/ins_xsens700.c
A sw/airborne/modules/ins/ins_xsens700.h
A sw/airborne/modules/ins/xsens.c
A sw/airborne/modules/ins/xsens.h
A sw/airborne/modules/ins/xsens700.c
A sw/airborne/modules/ins/xsens700.h
A sw/airborne/modules/ins/xsens_common.c
A sw/airborne/modules/ins/xsens_common.h
M sw/airborne/modules/loggers/high_speed_logger_direct_memory.c
M sw/airborne/modules/loggers/high_speed_logger_spi_link.c
M sw/airborne/modules/loggers/sdlogger_spi_direct.c
M sw/airborne/modules/loggers/sdlogger_spi_direct.h
M sw/airborne/modules/meteo/humid_sht.c
M sw/airborne/modules/meteo/humid_sht.h
M sw/airborne/modules/meteo/meteo_france_DAQ.c
M sw/airborne/modules/meteo/meteo_stick.c
M sw/airborne/modules/meteo/meteo_stick.h
M sw/airborne/modules/meteo/mf_ptu.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/mission/mission_common.c
M sw/airborne/modules/mission/mission_common.h
M sw/airborne/modules/mission/mission_fw_nav.c
M sw/airborne/modules/mission/mission_rotorcraft_nav.c
M sw/airborne/modules/multi/formation.c
M sw/airborne/modules/multi/potential.c
M sw/airborne/modules/nav/nav_bungee_takeoff.c
M sw/airborne/modules/nav/nav_bungee_takeoff.h
M sw/airborne/modules/nav/nav_catapult.c
M sw/airborne/modules/nav/nav_catapult.h
M sw/airborne/modules/nav/nav_cube.c
M sw/airborne/modules/nav/nav_cube.h
M sw/airborne/modules/nav/nav_drop.c
M sw/airborne/modules/nav/nav_drop.h
M sw/airborne/modules/nav/nav_flower.c
M sw/airborne/modules/nav/nav_flower.h
M sw/airborne/modules/nav/nav_gls.c
M sw/airborne/modules/nav/nav_gls.h
M sw/airborne/modules/nav/nav_line.c
M sw/airborne/modules/nav/nav_line.h
M sw/airborne/modules/nav/nav_line_border.c
M sw/airborne/modules/nav/nav_line_border.h
M sw/airborne/modules/nav/nav_line_osam.c
M sw/airborne/modules/nav/nav_line_osam.h
M sw/airborne/modules/nav/nav_smooth.c
M sw/airborne/modules/nav/nav_smooth.h
M sw/airborne/modules/nav/nav_spiral.c
M sw/airborne/modules/nav/nav_spiral.h
M sw/airborne/modules/nav/nav_survey_disc.c
M sw/airborne/modules/nav/nav_survey_disc.h
M sw/airborne/modules/nav/nav_survey_poly_osam.c
M sw/airborne/modules/nav/nav_survey_poly_osam.h
M sw/airborne/modules/nav/nav_survey_poly_rotorcraft.c
M sw/airborne/modules/nav/nav_survey_poly_rotorcraft.h
M sw/airborne/modules/nav/nav_survey_polygon.c
M sw/airborne/modules/nav/nav_survey_polygon.h
M sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.c
M sw/airborne/modules/nav/nav_survey_rectangle_rotorcraft.h
M sw/airborne/modules/nav/nav_survey_zamboni.c
M sw/airborne/modules/nav/nav_survey_zamboni.h
M sw/airborne/modules/nav/nav_vertical_raster.c
M sw/airborne/modules/nav/nav_vertical_raster.h
M sw/airborne/modules/nav/takeoff_detect.c
M sw/airborne/modules/obstacle_avoidance/guidance_OA.c
M sw/airborne/modules/obstacle_avoidance/guidance_OA.h
M sw/airborne/modules/optical_flow/px4flow.c
M sw/airborne/modules/optical_flow/px4flow.h
M sw/airborne/modules/orange_avoider/orange_avoider.c
M sw/airborne/modules/px4_flash/px4_flash.c
M sw/airborne/modules/sensors/airspeed_amsys.c
M sw/airborne/modules/sensors/airspeed_ets.c
M sw/airborne/modules/sensors/airspeed_ets.h
M sw/airborne/modules/sensors/airspeed_ms45xx_i2c.h
M sw/airborne/modules/sensors/alt_srf08.c
M sw/airborne/modules/sensors/alt_srf08.h
M sw/airborne/modules/sensors/aoa_pwm.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
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/imu_aspirin2.c
M sw/airborne/modules/sensors/mag_hmc5843.c
M sw/airborne/modules/sensors/mag_hmc58xx.c
M sw/airborne/modules/sensors/pressure_board_navarro.c
M sw/airborne/modules/sensors/pressure_board_navarro.h
M sw/airborne/modules/sensors/temp_adc.h
M sw/airborne/modules/sensors/trigger_ext.c
M sw/airborne/modules/servo_switch/servo_switch.c
M sw/airborne/modules/servo_switch/servo_switch.h
M sw/airborne/modules/sonar/agl_dist.c
M sw/airborne/modules/stereocam/droplet/stereocam_droplet.c
M sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.c
M sw/airborne/modules/stereocam/nav_line_avoid/avoid_navigation.h
M sw/airborne/modules/vehicle_interface/vi.c
M sw/airborne/modules/vehicle_interface/vi.h
M sw/airborne/modules/vehicle_interface/vi_datalink.c
M sw/airborne/modules/vehicle_interface/vi_test_signal.c
M sw/airborne/peripherals/ads1114.c
M sw/airborne/peripherals/ads1114.h
M sw/airborne/peripherals/ads1220.c
M sw/airborne/peripherals/ads1220.h
M sw/airborne/peripherals/adxl345.h
M sw/airborne/peripherals/adxl345_i2c.c
M sw/airborne/peripherals/adxl345_i2c.h
M sw/airborne/peripherals/adxl345_spi.c
M sw/airborne/peripherals/adxl345_spi.h
M sw/airborne/peripherals/ak8963.c
M sw/airborne/peripherals/ak8963.h
M sw/airborne/peripherals/ak8975.c
M sw/airborne/peripherals/ak8975.h
M sw/airborne/peripherals/bmp085.c
M sw/airborne/peripherals/bmp085.h
M sw/airborne/peripherals/cyrf6936.c
M sw/airborne/peripherals/cyrf6936.h
M sw/airborne/peripherals/eeprom25AA256.c
M sw/airborne/peripherals/eeprom25AA256.h
M sw/airborne/peripherals/hmc5843.c
M sw/airborne/peripherals/hmc58xx.c
M sw/airborne/peripherals/hmc58xx.h
M sw/airborne/peripherals/itg3200.c
M sw/airborne/peripherals/itg3200.h
M sw/airborne/peripherals/l3g4200.c
M sw/airborne/peripherals/l3g4200.h
M sw/airborne/peripherals/l3gd20.h
M sw/airborne/peripherals/l3gd20_spi.c
M sw/airborne/peripherals/l3gd20_spi.h
M sw/airborne/peripherals/lis302dl.h
M sw/airborne/peripherals/lis302dl_spi.c
M sw/airborne/peripherals/lis302dl_spi.h
M sw/airborne/peripherals/lsm303dlhc.c
M sw/airborne/peripherals/lsm303dlhc.h
M sw/airborne/peripherals/mcp355x.c
M sw/airborne/peripherals/mcp355x.h
M sw/airborne/peripherals/mpl3115.c
M sw/airborne/peripherals/mpl3115.h
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_spi.c
M sw/airborne/peripherals/mpu60x0_spi.h
M sw/airborne/peripherals/mpu9250.c
M sw/airborne/peripherals/mpu9250.h
M sw/airborne/peripherals/mpu9250_i2c.c
M sw/airborne/peripherals/mpu9250_i2c.h
M sw/airborne/peripherals/mpu9250_spi.c
M sw/airborne/peripherals/mpu9250_spi.h
M sw/airborne/peripherals/ms5611.c
M sw/airborne/peripherals/ms5611.h
M sw/airborne/peripherals/ms5611_i2c.c
M sw/airborne/peripherals/ms5611_i2c.h
M sw/airborne/peripherals/ms5611_spi.c
M sw/airborne/peripherals/ms5611_spi.h
M sw/airborne/peripherals/vn200_serial.c
M sw/airborne/peripherals/vn200_serial.h
M sw/airborne/rc_settings.c
M sw/airborne/rc_settings.h
M sw/airborne/state.c
M sw/airborne/state.h
M sw/airborne/subsystems/actuators.c
M sw/airborne/subsystems/actuators.h
M sw/airborne/subsystems/actuators/actuators_asctec.c
M sw/airborne/subsystems/actuators/actuators_asctec.h
M sw/airborne/subsystems/actuators/actuators_asctec_v2.c
M sw/airborne/subsystems/actuators/actuators_asctec_v2_new.c
M sw/airborne/subsystems/actuators/actuators_esc32.c
M sw/airborne/subsystems/actuators/actuators_mkk.c
M sw/airborne/subsystems/actuators/actuators_mkk_v2.c
M sw/airborne/subsystems/actuators/actuators_skiron.c
M sw/airborne/subsystems/actuators/motor_mixing.c
M sw/airborne/subsystems/actuators/motor_mixing.h
M sw/airborne/subsystems/ahrs.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_float_cmpl_wrapper.c
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.c
M sw/airborne/subsystems/ahrs/ahrs_float_dcm.h
M sw/airborne/subsystems/ahrs/ahrs_float_dcm_wrapper.c
M sw/airborne/subsystems/ahrs/ahrs_float_invariant.c
M sw/airborne/subsystems/ahrs/ahrs_float_invariant.h
M sw/airborne/subsystems/ahrs/ahrs_float_invariant_wrapper.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.c
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf.h
M sw/airborne/subsystems/ahrs/ahrs_float_mlkf_wrapper.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.h
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler.h
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_euler_wrapper.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.c
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat.h
M sw/airborne/subsystems/ahrs/ahrs_int_cmpl_quat_wrapper.c
M sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.c
M sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.h
M sw/airborne/subsystems/chibios-libopencm3/printf.c
M sw/airborne/subsystems/chibios-libopencm3/sdLog.c
M sw/airborne/subsystems/chibios-libopencm3/sdLog.h
M sw/airborne/subsystems/chibios-libopencm3/sdio.c
M sw/airborne/subsystems/chibios-libopencm3/sdio.h
M sw/airborne/subsystems/chibios-libopencm3/usbStorage.c
M sw/airborne/subsystems/chibios-libopencm3/usbStorage.h
M sw/airborne/subsystems/chibios-libopencm3/usb_msd.c
M sw/airborne/subsystems/chibios-libopencm3/usb_msd.h
M sw/airborne/subsystems/chibios-libopencm3/varLengthMsgQ.c
M sw/airborne/subsystems/chibios-libopencm3/varLengthMsgQ.h
M sw/airborne/subsystems/datalink/bluegiga.c
M sw/airborne/subsystems/datalink/bluegiga.h
M sw/airborne/subsystems/datalink/datalink.c
M sw/airborne/subsystems/datalink/datalink.h
M sw/airborne/subsystems/datalink/superbitrf.c
M sw/airborne/subsystems/datalink/superbitrf.h
M sw/airborne/subsystems/datalink/w5100.c
M sw/airborne/subsystems/datalink/w5100.h
M sw/airborne/subsystems/electrical.c
M sw/airborne/subsystems/electrical.h
M sw/airborne/subsystems/gps.h
M sw/airborne/subsystems/gps/gps_furuno.c
M sw/airborne/subsystems/gps/gps_mtk.c
M sw/airborne/subsystems/gps/gps_mtk.h
M sw/airborne/subsystems/gps/gps_nmea.c
M sw/airborne/subsystems/gps/gps_nmea.h
M sw/airborne/subsystems/gps/gps_sim_hitl.c
M sw/airborne/subsystems/gps/gps_sim_nps.c
M sw/airborne/subsystems/gps/gps_sim_nps.h
M sw/airborne/subsystems/gps/gps_sirf.c
M sw/airborne/subsystems/gps/gps_sirf.h
M sw/airborne/subsystems/gps/gps_skytraq.c
M sw/airborne/subsystems/gps/gps_skytraq.h
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/gps/gps_ubx.h
M sw/airborne/subsystems/imu.c
M sw/airborne/subsystems/imu.h
M sw/airborne/subsystems/imu/imu_aspirin.c
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.c
M sw/airborne/subsystems/imu/imu_aspirin_2_spi.h
M sw/airborne/subsystems/imu/imu_aspirin_i2c.c
M sw/airborne/subsystems/imu/imu_b2.c
M sw/airborne/subsystems/imu/imu_bebop.c
M sw/airborne/subsystems/imu/imu_crista.c
M sw/airborne/subsystems/imu/imu_crista.h
M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.c
M sw/airborne/subsystems/imu/imu_drotek_10dof_v2.h
M sw/airborne/subsystems/imu/imu_gl1.c
M sw/airborne/subsystems/imu/imu_mpu6000.c
M sw/airborne/subsystems/imu/imu_mpu6000_hmc5883.c
M sw/airborne/subsystems/imu/imu_mpu60x0_i2c.c
M sw/airborne/subsystems/imu/imu_mpu9250_i2c.c
M sw/airborne/subsystems/imu/imu_mpu9250_spi.c
M sw/airborne/subsystems/imu/imu_mpu9250_spi.h
M sw/airborne/subsystems/imu/imu_navstik.c
M sw/airborne/subsystems/imu/imu_nps.c
M sw/airborne/subsystems/imu/imu_ppzuav.c
M sw/airborne/subsystems/imu/imu_px4fmu.c
M sw/airborne/subsystems/imu/imu_um6.c
M sw/airborne/subsystems/imu/imu_um6.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_float_invariant.c
M sw/airborne/subsystems/ins/ins_float_invariant.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
M sw/airborne/subsystems/ins/ins_vectornav.c
M sw/airborne/subsystems/ins/ins_vectornav.h
M sw/airborne/subsystems/intermcu/intermcu_ap.c
M sw/airborne/subsystems/intermcu/intermcu_ap.h
M sw/airborne/subsystems/intermcu/intermcu_fbw.c
M sw/airborne/subsystems/navigation/common_nav.c
M sw/airborne/subsystems/navigation/common_nav.h
M sw/airborne/subsystems/navigation/nav_survey_rectangle.c
M sw/airborne/subsystems/navigation/waypoints.c
M sw/airborne/subsystems/navigation/waypoints.h
M sw/airborne/subsystems/radio_control/ppm.c
M sw/airborne/subsystems/radio_control/ppm.h
M sw/airborne/subsystems/radio_control/rc_datalink.c
M sw/airborne/subsystems/radio_control/rc_datalink.h
M sw/airborne/subsystems/radio_control/sbus.c
M sw/airborne/subsystems/radio_control/sbus_common.c
M sw/airborne/subsystems/radio_control/sbus_common.h
M sw/airborne/subsystems/radio_control/sbus_dual.c
M sw/airborne/subsystems/radio_control/superbitrf_rc.c
M sw/airborne/subsystems/sensors/infrared_i2c.c
M sw/airborne/subsystems/sensors/infrared_i2c.h
M sw/airborne/subsystems/settings.c
M sw/airborne/subsystems/settings.h
M sw/airborne/test/ahrs/ahrs_on_synth.c
M sw/airborne/test/ahrs/run_ahrs_on_synth.c
M sw/airborne/test/ahrs/run_ahrs_on_synth_ivy.c
M sw/airborne/test/peripherals/test_lis302dl_spi.c
M sw/airborne/test/test_algebra.c
M sw/airborne/test/test_manual.c
M sw/ext/pprzlink
M sw/ground_segment/misc/natnet2ivy.c
M sw/ground_segment/misc/sbp2ivy.c
M sw/ground_segment/misc/sbs2ivy.c
M sw/include/std.h
M sw/lib/ocaml/gen_common.ml
M sw/misc/rctx/main_rctx.c
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
M sw/simulator/nps/nps_fdm_crrcsim.c
M sw/simulator/nps/nps_fdm_jsbsim.cpp
M sw/simulator/nps/nps_main.c
M sw/simulator/nps/nps_radio_control.c
M sw/simulator/nps/nps_radio_control.h
M sw/simulator/nps/nps_sensor_accel.h
M sw/simulator/nps/nps_sensor_airspeed.h
M sw/simulator/nps/nps_sensor_baro.h
M sw/simulator/nps/nps_sensor_gps.h
M sw/simulator/nps/nps_sensor_gyro.h
M sw/simulator/nps/nps_sensor_mag.h
M sw/simulator/nps/nps_sensor_sonar.h
M sw/simulator/nps/nps_sensor_temperature.h
M sw/simulator/nps/nps_sensors.c
M sw/simulator/nps/nps_sensors.h
M sw/tools/generators/gen_aircraft.ml
M sw/tools/generators/gen_flight_plan.ml
M sw/tools/parrot/bebop.py
M sw/tools/parrot/parrot_utils.py
Log Message:
-----------
Included pull request advices.
Commit: 58382a7748dc4234eb20546381c7c3f6f1238091
https://github.com/paparazzi/paparazzi/commit/58382a7748dc4234eb20546381c7c3f6f1238091
Author: hrvoje <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M conf/modules/extra_dl.xml
M sw/airborne/arch/linux/mcu_periph/uart_arch.c
M sw/airborne/arch/linux/mcu_periph/udp_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/usb_ser_hw.c
M sw/airborne/arch/stm32/mcu_periph/uart_arch.c
M sw/airborne/arch/stm32/usb_ser_hw.c
M sw/airborne/firmwares/fixedwing/fbw_datalink.c
M sw/airborne/firmwares/setup/usb_tunnel.c
M sw/airborne/link_mcu_usart.c
M sw/airborne/mcu_periph/uart.c
M sw/airborne/mcu_periph/uart.h
M sw/airborne/mcu_periph/udp.c
M sw/airborne/mcu_periph/udp.h
M sw/airborne/mcu_periph/usb_serial.h
M sw/airborne/modules/com/uart_drop.c
M sw/airborne/modules/datalink/mavlink.h
M sw/airborne/modules/digital_cam/uart_cam_ctrl.c
M sw/airborne/modules/gps/gps_ubx_i2c.c
M sw/airborne/modules/gps/gps_ubx_i2c.h
M sw/airborne/modules/gsm/gsm.c
M sw/airborne/modules/hott/hott.c
M sw/airborne/modules/ins/ins_module.h
M sw/airborne/modules/loggers/direct_memory_logger.c
M sw/airborne/modules/loggers/high_speed_logger_direct_memory.c
M sw/airborne/modules/loggers/sdlogger_spi_direct.c
M sw/airborne/modules/loggers/sdlogger_spi_direct.h
M sw/airborne/modules/sensors/met_module.h
M sw/airborne/modules/stereocam/droplet/stereocam_droplet.c
M sw/airborne/modules/stereocam/stereoprotocol.c
M sw/airborne/subsystems/actuators/actuators_spektrum.c
M sw/airborne/subsystems/ahrs/ahrs_gx3.c
M sw/airborne/subsystems/chibios-libopencm3/chibios_sdlog.c
M sw/airborne/subsystems/datalink/bluegiga.c
M sw/airborne/subsystems/datalink/superbitrf.c
M sw/airborne/subsystems/datalink/uart_print.h
M sw/airborne/subsystems/datalink/w5100.c
M sw/airborne/subsystems/datalink/w5100.h
M sw/airborne/subsystems/gps/gps_furuno.c
M sw/airborne/subsystems/gps/gps_mtk.c
M sw/airborne/subsystems/gps/gps_piksi.c
M sw/airborne/subsystems/gps/gps_ubx.c
M sw/airborne/subsystems/imu/imu_um6.c
M sw/airborne/subsystems/intermcu/intermcu_fbw.c
M sw/airborne/test/generic_uart_tunnel.c
M sw/airborne/test/mcu_periph/test_uart.c
M sw/airborne/test/mcu_periph/test_uart_echo.c
M sw/airborne/test/mcu_periph/test_uart_send.c
M sw/ext/pprzlink
Log Message:
-----------
Merge branch 'master' of https://github.com/paparazzi/paparazzi
Commit: 138e370dd20cc1ba5bdf5e9350fa43edfb50f4af
https://github.com/paparazzi/paparazzi/commit/138e370dd20cc1ba5bdf5e9350fa43edfb50f4af
Author: OpenUAS <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M conf/modules/cv_opticflow.xml
M sw/airborne/modules/computer_vision/lib/vision/image.c
M sw/airborne/modules/computer_vision/lib/vision/image.h
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.c
M sw/airborne/modules/computer_vision/lib/vision/lucas_kanade.h
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.c
M sw/airborne/modules/computer_vision/opticflow/opticflow_calculator.h
Log Message:
-----------
Merge pull request #1586 from hbrezak/master
Upgraded lucas kanade optic flow module
Compare:
https://github.com/paparazzi/paparazzi/compare/174bc4404e33...138e370dd20c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [paparazzi/paparazzi] 3aaefb: Merged with master,
GitHub <=