Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-02 13:27:32 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

[ubuntu22] Silent warnings and fix compile errors

Browse Source
This commit is contained in:
Christophe De Wagter
2023-02-11 00:02:26 +01:00
parent c614a5c6be
commit 3002893a01
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/userconf/tudelft/course_conf.xml
-2
View File
@@ -9,7 +9,6 @@
settings="settings/rotorcraft_basic.xml" settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_basic_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml" settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_basic_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
gui_color="white" gui_color="white"
release="951019e34be0464cee1171a083947981c4b8c55d"
/> />
<aircraft <aircraft
name="bebop_orange_avoid_guided" name="bebop_orange_avoid_guided"
@@ -21,6 +20,5 @@
settings="settings/rotorcraft_basic.xml" settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_basic_rotorcraft.xml modules/orange_avoider_guided.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml" settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_basic_rotorcraft.xml modules/orange_avoider_guided.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
gui_color="white" gui_color="white"
release="951019e34be0464cee1171a083947981c4b8c55d"
/> />
</conf> </conf>
sw/airborne/boards/bebop/mt9f002.c
+6
View File
@@ -900,6 +900,12 @@ static uint16_t mt9f002_calc_gain(float gain)
return (analog_gain2 & 0x7F) | ((analog_gain3 & 0x7) << 7) | ((colamp_gain & 0x3) << 10) | ((digital_gain & 0xF) << 12); return (analog_gain2 & 0x7F) | ((analog_gain3 & 0x7) << 7) | ((colamp_gain & 0x3) << 10) | ((digital_gain & 0xF) << 12);
} }
// settings to update resolution, color and exposure
float mt9f002_send_resolution;
float mt9f002_send_color;
float mt9f002_send_exposure;
/** /**
* Sets the GreenR, Blue, Red and GreenB gains * Sets the GreenR, Blue, Red and GreenB gains
*/ */
sw/airborne/boards/bebop/mt9f002.h
+3 -3
View File
@@ -189,9 +189,9 @@ extern void mt9f002_reset_color(struct mt9f002_t *mt);
extern void mt9f002_set_gains(struct mt9f002_t *mt); extern void mt9f002_set_gains(struct mt9f002_t *mt);
// settings to update resolution, color and exposure // settings to update resolution, color and exposure
float mt9f002_send_resolution; extern float mt9f002_send_resolution;
float mt9f002_send_color; extern float mt9f002_send_color;
float mt9f002_send_exposure; extern float mt9f002_send_exposure;
// handlers for propagating settings // handlers for propagating settings
extern void mt9f002_setting_update_resolution(float in); extern void mt9f002_setting_update_resolution(float in);
sw/airborne/modules/computer_vision/lib/encoding/jpeg.c
+4
View File
@@ -594,6 +594,8 @@ static void jpeg_DCT(int16_t *data)
} }
} }
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#define PUTBITS \ #define PUTBITS \
{ \ { \
bits_in_next_word = (int16_t) (jpeg_encoder_structure->bitindex + numbits - 32); \ bits_in_next_word = (int16_t) (jpeg_encoder_structure->bitindex + numbits - 32); \
@@ -714,6 +716,8 @@ static uint8_t *jpeg_huffman(JPEG_ENCODER_STRUCTURE *jpeg_encoder_structure, uin
return output_ptr; return output_ptr;
} }
#pragma GCC diagnostic pop
/* For bit Stuffing and EOI marker */ /* For bit Stuffing and EOI marker */
static uint8_t *jpeg_close_bitstream(JPEG_ENCODER_STRUCTURE *jpeg_encoder_structure, uint8_t *output_ptr) static uint8_t *jpeg_close_bitstream(JPEG_ENCODER_STRUCTURE *jpeg_encoder_structure, uint8_t *output_ptr)
{ {
sw/airborne/modules/computer_vision/video_capture.c
+1 -1
View File
@@ -115,7 +115,7 @@ void video_capture_save(struct image_t *img)
{ {
// Create output folder if necessary // Create output folder if necessary
if (access(save_dir, F_OK)) { if (access(save_dir, F_OK)) {
char save_dir_cmd[256]; char save_dir_cmd[264];
sprintf(save_dir_cmd, "mkdir -p %s", save_dir); sprintf(save_dir_cmd, "mkdir -p %s", save_dir);
if (system(save_dir_cmd) != 0) { if (system(save_dir_cmd) != 0) {
printf("[video_capture] Could not create images directory %s.\n", save_dir); printf("[video_capture] Could not create images directory %s.\n", save_dir);