mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-09 22:49:53 +08:00
[fix] third batch of CI fix (#2680)
This commit is contained in:
committed by
GitHub
parent
61261aa19c
commit
7d18d0c8a9
@@ -2,7 +2,7 @@
|
||||
<aircraft
|
||||
name="Vivify"
|
||||
ac_id="217"
|
||||
airframe="airframes/OPENUAS/openuas_vivify.xml"
|
||||
airframe="airframes/OPENUAS/openuas_own_vivify.xml"
|
||||
radio="radios/dummy.xml"
|
||||
telemetry="telemetry/default_fixedwing_imu_9k6.xml"
|
||||
flight_plan="flight_plans/OPENUAS/openuas_obc2014_kingaroy.xml"
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
<conf>
|
||||
|
||||
<aircraft
|
||||
name="bebop_stereo"
|
||||
ac_id="44"
|
||||
airframe="airframes/tudelft/bebop_ralphthesis2020_stereo.xml"
|
||||
radio="radios/dummy.xml"
|
||||
telemetry="telemetry/default_rotorcraft.xml"
|
||||
flight_plan="flight_plans/tudelft/ralphthesis2020_stereo_cyberzoo.xml"
|
||||
settings="settings/rotorcraft_basic.xml"
|
||||
settings_modules="modules/video_rtp_stream.xml modules/video_capture.xml modules/bebop_cam.xml modules/wedgebug.xml modules/ins_extended.xml modules/ahrs_int_cmpl_quat.xml modules/stabilization_indi_simple.xml [modules/nav_basic_rotorcraft.xml] modules/guidance_rotorcraft.xml [modules/gps.xml] modules/imu_common.xml"
|
||||
gui_color="white"
|
||||
release="c3090b6692780d8b3ad4b32cb9cef06f4186360c"
|
||||
/>
|
||||
</conf>
|
||||
@@ -216,8 +216,8 @@ uint8_t hover_method;
|
||||
|
||||
/// Function definitions
|
||||
// Callback function of the optical flow estimate:
|
||||
void ofh_optical_flow_cb(uint8_t sender_id __attribute__((unused)), uint32_t stamp, int16_t flow_x, int16_t flow_y,
|
||||
int16_t flow_der_x, int16_t flow_der_y, float quality, float size_div);
|
||||
void ofh_optical_flow_cb(uint8_t sender_id __attribute__((unused)), uint32_t stamp, int32_t flow_x, int32_t flow_y,
|
||||
int32_t flow_der_x, int32_t flow_der_y, float quality, float size_div);
|
||||
|
||||
// resetting all variables to be called for instance when starting up / re-entering module
|
||||
static void reset_horizontal_vars(void);
|
||||
|
||||
Reference in New Issue
Block a user