Skip to content

Commit

Permalink
[fix] some extra warning, error and failing conf fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Oct 5, 2018
1 parent 9e1077d commit 77e0759
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 28 deletions.
12 changes: 0 additions & 12 deletions conf/userconf/OPENUAS/openuas_conf.xml
Expand Up @@ -22,18 +22,6 @@
settings_modules="modules/nav_smooth.xml modules/nav_survey_poly_osam.xml modules/geo_mag.xml modules/air_data.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/ahrs_float_cmpl_quat.xml [modules/ahrs_int_cmpl_quat.xml] modules/imu_common.xml"
gui_color="#ffffffffffff"
/>
<aircraft
name="EFlite-UMX_Sbach_342"
ac_id="231"
airframe="airframes/OPENUAS/openuas_eflite_umx_sbach_342.xml"
radio="radios/OPENUAS/openuas_mx22_cppm_7.xml"
telemetry="telemetry/OPENUAS/openuas_fixedwing_imu_rc.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml [settings/estimation/ac_char.xml] [settings/control/ctl_energy.xml] settings/rc_settings_ins.xml settings/control/tune_agr_climb.xml [settings/control/ctl_energyadaptive.xml] [settings/OPENUAS/openuas_tuning_rc.xml]"
settings_modules="modules/nav_smooth.xml modules/nav_survey_poly_osam.xml modules/gps_ubx_ucenter.xml modules/geo_mag.xml modules/air_data.xml modules/gps.xml modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/ahrs_int_cmpl_quat.xml modules/imu_common.xml"
gui_color="#ffffffffffff"
release="0f08b3acd3b4c08c91d3597e357735682d70cb47"
/>
<aircraft
name="Itsy-Bitsy"
ac_id="229"
Expand Down
11 changes: 0 additions & 11 deletions conf/userconf/tudelft/conf.xml
Expand Up @@ -452,17 +452,6 @@
settings_modules="modules/gps_ubx_ucenter.xml modules/air_data.xml modules/geo_mag.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="#f6d5baaaffff"
/>
<aircraft
name="bebop2_detect_gate_front"
ac_id="218"
airframe="airframes/tudelft/bebop2_detect_gate_front.xml"
radio="radios/dummy.xml"
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/rotorcraft_guido_optitrack.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/video_rtp_stream.xml modules/cv_detect_gate.xml modules/video_capture.xml modules/air_data.xml modules/geo_mag.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="#ffffbf17bf17"
/>
<aircraft
name="bebop2_no_dampers"
ac_id="26"
Expand Down
8 changes: 4 additions & 4 deletions sw/airborne/modules/computer_vision/detect_contour.c
Expand Up @@ -23,15 +23,15 @@
*
*/

#include "modules/computer_vision/cv.h"
#include "modules/computer_vision/detect_contour.h"
#include "modules/computer_vision/opencv_contour.h"

#ifndef DETECT_CONTOUR_FPS
#define DETECT_CONTOUR_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(DETECT_CONTOUR_FPS)

#include "modules/computer_vision/cv.h"
#include "modules/computer_vision/detect_contour.h"
#include "modules/computer_vision/opencv_contour.h"

// Function
struct image_t *contour_func(struct image_t *img);
struct image_t *contour_func(struct image_t *img)
Expand Down
1 change: 1 addition & 0 deletions sw/airborne/subsystems/actuators/actuators_asctec_v2_new.c
Expand Up @@ -151,6 +151,7 @@ void actuators_asctec_v2_set(void)

i2c_transmit(&ACTUATORS_ASCTEC_V2_I2C_DEV, &actuators_asctec_v2.i2c_trans, ACTUATORS_ASCTEC_V2_SLAVE_ADDR, 4);
set_addr++;
/* Falls through. */
default:
set_addr = 0;
actuators_asctec_v2.cmd = NONE;
Expand Down
2 changes: 1 addition & 1 deletion sw/airborne/subsystems/radio_control/spektrum.c
Expand Up @@ -336,7 +336,7 @@ void spektrum_event(void (*frame_handler)(void))
/** This function puts the satellite in binding mode.
* The requirement of this are that this needs to be done while powering up.
*/
static void spektrum_bind(void)
static void UNUSED spektrum_bind(void)
{

/* Master receiver Rx push-pull */
Expand Down

0 comments on commit 77e0759

Please sign in to comment.